summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2005-03-06 16:32:42 +0000
committerHolger Freyther <zecke@selfish.org>2005-03-06 16:32:42 +0000
commit1a2e6c445e603732bbeaa20be89c33400e90ac80 (patch)
tree6632fba8708949115a0d1ec2ae7b0181ed7bb022
parent48be33917f3806875ec3e7e2dd35fb7c6238fa5a (diff)
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
-rw-r--r--packages/gnuplot/qtplot_0.2.bb0
-rw-r--r--packages/libxine/libxine-opie-1.0/no-caca.patch0
-rw-r--r--packages/libxine/libxine-opie_1.0.bb8
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnuplot/qtplot_0.2.bb
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
--- /dev/null
+++ b/packages/libxine/libxine-opie-1.0/no-caca.patch
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
}