From: Holger Freyther Date: Sun, 6 Mar 2005 16:32:42 +0000 (+0000) Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~14739 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a2e6c445e603732bbeaa20be89c33400e90ac80;p=openembedded.git Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/03/06 17:32:12+01:00 handhelds.org!zecke xine for Opie: -Do not try to build caca video output plugins 2005/03/05 16:45:28+01:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/03/05 16:44:50+01:00 handhelds.org!zecke Qt Plot: On request of Rene Wagner add qtplot bb to oe BKrev: 422b30aav7PznehYtlvNIYlUtLtj6Q --- diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libxine/libxine-opie-1.0/no-caca.patch b/packages/libxine/libxine-opie-1.0/no-caca.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libxine/libxine-opie_1.0.bb b/packages/libxine/libxine-opie_1.0.bb index 2f9a1530d6..a66ac08806 100644 --- a/packages/libxine/libxine-opie_1.0.bb +++ b/packages/libxine/libxine-opie_1.0.bb @@ -23,7 +23,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://libxine-libvorbis.patch;patch=1 \ file://libxine-tremor-autoconf.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ - file://libxine-arm-configure.patch;patch=1 " + file://libxine-arm-configure.patch;patch=1 \ + file://no-caca.patch;patch=1 " @@ -46,9 +47,8 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --disable-aalib \ --without-v4l --without-arts --without-sdl \ --disable-dxr3 --without-xv --without-xvmc \ - --without-xxmc --without-Xshm --without-x \ - --disable-cacatest --without-caca " - + --without-xxmc --without-Xshm --without-x " + do_compile() { oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool }