diff options
Diffstat (limited to 'packages/libxine')
11 files changed, 24 insertions, 35 deletions
diff --git a/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch b/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch diff --git a/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch b/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch diff --git a/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch b/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch diff --git a/packages/libxine/libxine-1.0/dont-have-xv.patch b/packages/libxine/libxine-1.0/dont-have-xv.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0/dont-have-xv.patch diff --git a/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch b/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch diff --git a/packages/libxine/libxine-1.0/libxine-libvorbis.patch b/packages/libxine/libxine-1.0/libxine-libvorbis.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0/libxine-libvorbis.patch diff --git a/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch b/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch diff --git a/packages/libxine/libxine-1.0/no-caca-no-aalib.patch b/packages/libxine/libxine-1.0/no-caca-no-aalib.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0/no-caca-no-aalib.patch diff --git a/packages/libxine/libxine-1.0/restore-esd.patch b/packages/libxine/libxine-1.0/restore-esd.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxine/libxine-1.0/restore-esd.patch diff --git a/packages/libxine/libxine_1.0.0-rc5.bb b/packages/libxine/libxine_1.0.0-rc5.bb index ee85eb12a3..f4666c72e6 100644 --- a/packages/libxine/libxine_1.0.0-rc5.bb +++ b/packages/libxine/libxine_1.0.0-rc5.bb @@ -1,12 +1,13 @@ LICENSE = GPL -# libxine OE build file -# Modified by Advanced Micro Devices, Inc. - DESCRIPTION = "libxine" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" -DEPENDS = "zlib libogg libvorbis libmad" +DEPENDS = "zlib libogg tremor libmad esound-gpe" +PROVIDES = "virtual/libxine" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" inherit autotools pkgconfig gettext @@ -14,7 +15,10 @@ S = "${WORKDIR}/xine-lib-1-rc5" SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc5.tar.gz \ file://cpu.patch;patch=1 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://no-caca-no-aalib.patch;patch=1 \ + file://libxine-tremor-autoconf.patch;patch=1 \ + file://libxine-libvorbis.patch;patch=1" SOV = "1.0.6" @@ -31,7 +35,6 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ --disable-altivec --disable-vis --disable-mlib \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ - --disable-aalib \ --without-v4l --without-arts --without-sdl" do_compile() { @@ -55,10 +58,14 @@ do_stage() { cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file` done + install -m 0644 ${S}/m4/xine.m4 ${STAGING_DATADIR}/aclocal/ + oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR} } python populate_packages_prepend () { + bb.data.setVar('PKG_libxine', 'libxine', d) + plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d) do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s') diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb index 0d77d48b38..c8fa4aedbe 100644 --- a/packages/libxine/libxine_1.0.bb +++ b/packages/libxine/libxine_1.0.bb @@ -1,36 +1,12 @@ LICENSE = GPL -# 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" +DEPENDS = "zlib libogg tremor libmad esound-gpe" PROVIDES = "virtual/libxine" +PR = "r1" inherit autotools pkgconfig gettext @@ -38,7 +14,13 @@ S = "${WORKDIR}/xine-lib-${PV}" SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \ file://cpu-${PV}.patch;patch=1 \ - file://configure-${PV}.patch;patch=1" + file://configure-${PV}.patch;patch=1 \ + file://libxine-tremor-autoconf.patch;patch=1 \ + file://libxine-libvorbis.patch;patch=1 \ + file://libxine-ffmpeg-enable-arm.patch;patch=1 \ + file://no-caca-no-aalib.patch;patch=1 \ + file://dont-have-xv.patch;patch=1 \ + file://restore-esd.patch;patch=1" SOV = "1.0.7" @@ -53,10 +35,8 @@ EXTRA_OECONF="-with-zlib-path=${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-aalib --with-xv-path=${STAGING_LIBDIR} \ --without-v4l --without-arts --without-sdl" do_compile() { @@ -97,6 +77,8 @@ do_stage() { } python populate_packages_prepend () { + bb.data.setVar('PKG_libxine', 'libxine', d) + plugindir = bb.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='' ) |