summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2004-11-16 00:18:33 +0000
committerHolger Freyther <zecke@selfish.org>2004-11-16 00:18:33 +0000
commit8c3493e9d1bd57e174128085a345a82084e7f96c (patch)
tree61c10d0c01e181356408034ac6c5d57354481983
parentc16679533eb151c872de4fe185491a25f530ee9f (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into handhelds.org:/home/ich/programming/oe/oe-packages-exported 2004/11/16 01:17:59+01:00 handhelds.org!zecke XINE: -Add libxine-opie with 3/4 of dilbs patches merged to reduce buffer sizes and memory usage. Build against tremor and not libvorbis -Readd extra_depend -Make both libxine and libxine-opie provide virtual/libxine -OpieMediaPlayer2 depend on libxine-opie -Move cpu and configure patch to a common directory shared by libxine and libxine-opie. The patches names contain the ${PV} BKrev: 41994759MvU-gd74HUw0R9Dc-U9bHw
-rw-r--r--libxine/files/configure-1.0.0-rc7.patch (renamed from libxine/libxine-1.0.0-rc7/configure.patch)0
-rw-r--r--libxine/files/cpu-1.0.0-rc7.patch (renamed from libxine/libxine-1.0.0-rc7/cpu.patch)0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/demuxogg.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/fix-syntax.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/libxine-arm-configure.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/libxine-cut-memusage.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/libxine-ffmpeg-enable-arm.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/libxine-libavcodec.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/libxine-libvorbis.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/libxine-tremor-autoconf.patch0
-rw-r--r--libxine/libxine-opie-1.0.0-rc7/mpegvideo-static-inlinine.patch0
-rw-r--r--libxine/libxine-opie_1.0.0-rc7.oe0
-rw-r--r--libxine/libxine_1.0.0-rc7.oe107
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe2
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_cvs.oe2
15 files changed, 109 insertions, 2 deletions
diff --git a/libxine/libxine-1.0.0-rc7/configure.patch b/libxine/files/configure-1.0.0-rc7.patch
index e69de29bb2..e69de29bb2 100644
--- a/libxine/libxine-1.0.0-rc7/configure.patch
+++ b/libxine/files/configure-1.0.0-rc7.patch
diff --git a/libxine/libxine-1.0.0-rc7/cpu.patch b/libxine/files/cpu-1.0.0-rc7.patch
index e69de29bb2..e69de29bb2 100644
--- a/libxine/libxine-1.0.0-rc7/cpu.patch
+++ b/libxine/files/cpu-1.0.0-rc7.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/demuxogg.patch b/libxine/libxine-opie-1.0.0-rc7/demuxogg.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/demuxogg.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/fix-syntax.patch b/libxine/libxine-opie-1.0.0-rc7/fix-syntax.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/fix-syntax.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/libxine-arm-configure.patch b/libxine/libxine-opie-1.0.0-rc7/libxine-arm-configure.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/libxine-arm-configure.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/libxine-cut-memusage.patch b/libxine/libxine-opie-1.0.0-rc7/libxine-cut-memusage.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/libxine-cut-memusage.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/libxine-ffmpeg-enable-arm.patch b/libxine/libxine-opie-1.0.0-rc7/libxine-ffmpeg-enable-arm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/libxine-ffmpeg-enable-arm.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/libxine-libavcodec.patch b/libxine/libxine-opie-1.0.0-rc7/libxine-libavcodec.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/libxine-libavcodec.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/libxine-libvorbis.patch b/libxine/libxine-opie-1.0.0-rc7/libxine-libvorbis.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/libxine-libvorbis.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/libxine-tremor-autoconf.patch b/libxine/libxine-opie-1.0.0-rc7/libxine-tremor-autoconf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/libxine-tremor-autoconf.patch
diff --git a/libxine/libxine-opie-1.0.0-rc7/mpegvideo-static-inlinine.patch b/libxine/libxine-opie-1.0.0-rc7/mpegvideo-static-inlinine.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie-1.0.0-rc7/mpegvideo-static-inlinine.patch
diff --git a/libxine/libxine-opie_1.0.0-rc7.oe b/libxine/libxine-opie_1.0.0-rc7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie_1.0.0-rc7.oe
diff --git a/libxine/libxine_1.0.0-rc7.oe b/libxine/libxine_1.0.0-rc7.oe
index e69de29bb2..15c8184470 100644
--- a/libxine/libxine_1.0.0-rc7.oe
+++ b/libxine/libxine_1.0.0-rc7.oe
@@ -0,0 +1,107 @@
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+#FIXME: libxine doesn't build when X11 has been built before:
+#| In file included from video_out_dxr3.c:55:
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:16: error: parse error before "Bool"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:17: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: type defaults to `int' in declaration of
+#`XineramaQueryExtension'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:22: error: parse error before "XineramaQueryVersion"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:23: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: type defaults to `int' in declaration of
+#`XineramaQueryVersion'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before "XineramaIsActive"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: type defaults to `int' in declaration of
+#`XineramaIsActive'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:41: error: parse error before '*' token
+#| In file included from /local/pkg/oe/collie/tmp/staging/arm-linux/include/inttypes.h:28,
+#| from ../../src/xine-engine/xine_internal.h:31,
+#| from video_out_dxr3.c:65:
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/stdint.h:49: error: syntax error before "typedef"
+
+DESCRIPTION = "libxine"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg libvorbis libmad"
+PROVIDES = "virtual/libxine"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/xine-lib-1-rc7"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz \
+ file://cpu-${PV}.patch;patch=1 \
+ file://configure-${PV}.patch;patch=1"
+
+SOV = "1.0.7"
+
+# Omit the annoying xine-config in /usr/bin
+FILES_${PN}="/usr/lib/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " /usr/bin"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+ --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-oggtest \
+ --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --disable-altivec --disable-vis --disable-mlib \
+ --enable-shared --disable-static \
+ --disable-fb --disable-alsa --disable-vcd \
+ --disable-asf --disable-faad --disable-iconv \
+ --disable-nls --disable-aalib --with-xv-path=${STAGING_LIBDIR} \
+ --without-v4l --without-arts --without-sdl"
+
+do_compile() {
+ oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+ oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \
+ src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \
+ src/xine-utils/xine_buffer.h src/xine-engine/video_out.h \
+ src/xine-engine/buffer.h src/xine-engine/vo_scale.h \
+ src/xine-engine/configfile.h src/xine-utils/attributes.h \
+ src/xine-engine/info_helper.h src/xine-engine/scratch.h \
+ src/xine-engine/audio_decoder.h src/input/input_plugin.h \
+ src/xine-engine/spu_decoder.h src/xine-engine/audio_out.h \
+ src/xine-engine/io_helper.h src/xine-engine/video_decoder.h \
+ src/xine-engine/broadcaster.h src/xine-engine/metronom.h \
+ src/xine-utils/xmllexer.h src/xine-engine/osd.h \
+ src/xine-engine/video_overlay.h src/xine-utils/xmlparser.h \
+ src/xine-utils/compat.h src/xine-engine/plugin_catalog.h \
+ src/xine-engine/post.h src/demuxers/demux.h \
+ src/xine-engine/resample.h lib/os_types.h \
+ src/xine-engine/refcounter.h"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xine
+
+ install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+ for file in ${HEADERS}; do
+ cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+ done
+
+ oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+ plugindir = oe.data.expand('${libdir}/xine/plugins/1.0.0', d)
+ do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+ postdir = oe.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+ do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+ fontdir = oe.data.expand('${datadir}/xine/libxine1/fonts', d)
+ do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
+}
diff --git a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
index 868c2adadd..be1a6881a2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>
-DEPENDS = "libxine-1.0.0-rc6a"
+DEPENDS = "libxine-opie"
RDEPENDS = "opie-mediaplayer2-skin"
APPNAME = "opieplayer2"
PR = "r1"
diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index ddf8f2e6c3..474c592549 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -5,7 +5,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
PV = "1.1.6+cvs-${CVSDATE}"
-DEPENDS = "libxine-1.0.0-rc6a"
+DEPENDS = "libxine-opie"
RDEPENDS = "opie-mediaplayer2-skin"
APPNAME = "opieplayer2"
PR = "r2"