Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into handhelds.org:/home/ich/programming/oe/openembedded

2005/02/16 23:31:49+01:00 handhelds.org!zecke
Xine:
	Update to 1.0, rename a lot of files and upgrade patches

BKrev: 4213ca00wavLI9GnxuC7fx-B1IJ_bA

diff --git a/packages/libxine/files/configure-1.0.0-rc7.patch b/packages/libxine/files/configure-1.0.patch
similarity index 100%
rename from packages/libxine/files/configure-1.0.0-rc7.patch
rename to packages/libxine/files/configure-1.0.patch

diff --git a/packages/libxine/files/cpu-1.0.0-rc7.patch b/packages/libxine/files/cpu-1.0.patch
similarity index 100%
rename from packages/libxine/files/cpu-1.0.0-rc7.patch
rename to packages/libxine/files/cpu-1.0.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/demuxogg.patch b/packages/libxine/libxine-opie-1.0/demuxogg.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/demuxogg.patch
rename to packages/libxine/libxine-opie-1.0/demuxogg.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/fix-syntax.patch b/packages/libxine/libxine-opie-1.0/fix-syntax.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/fix-syntax.patch
rename to packages/libxine/libxine-opie-1.0/fix-syntax.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/libxine-arm-configure.patch b/packages/libxine/libxine-opie-1.0/libxine-arm-configure.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/libxine-arm-configure.patch
rename to packages/libxine/libxine-opie-1.0/libxine-arm-configure.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/libxine-cut-memusage.patch b/packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/libxine-cut-memusage.patch
rename to packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/libxine-ffmpeg-enable-arm.patch b/packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/libxine-ffmpeg-enable-arm.patch
rename to packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/libxine-libavcodec.patch b/packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/libxine-libavcodec.patch
rename to packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/libxine-libvorbis.patch b/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/libxine-libvorbis.patch
rename to packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/libxine-tremor-autoconf.patch b/packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/libxine-tremor-autoconf.patch
rename to packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch

diff --git a/packages/libxine/libxine-opie-1.0.0-rc7/mpegvideo-static-inlinine.patch b/packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/mpegvideo-static-inlinine.patch
rename to packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch

diff --git a/packages/libxine/libxine-opie_1.0.0-rc7.bb b/packages/libxine/libxine-opie_1.0.0-rc7.bb
deleted file mode 100644 (file)
index df3ca8e..0000000
--- a/packages/libxine/libxine-opie_1.0.0-rc7.bb
+++ /dev/null
@@ -1,98 +0,0 @@
-LICENSE = GPL
-# libxine OE build file
-# Modified by Advanced Micro Devices, Inc.
-
-DESCRIPTION = "libxine compiled for Opie"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
-DEPENDS = "zlib libogg tremor libmad"
-PROVIDES = "virtual/libxine"
-
-inherit autotools pkgconfig gettext
-
-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 \
-       file://demuxogg.patch;patch=1 \
-       file://fix-syntax.patch;patch=1 \
-       file://libxine-cut-memusage.patch;patch=1 \
-       file://libxine-ffmpeg-enable-arm.patch;patch=1 \
-       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://fix-x.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-aalib --with-xv-path=${STAGING_LIBDIR} \
-       --without-v4l --without-arts --without-sdl \
-       --disable-dxr3 --without-xv --without-xvmc \
-       --without-xxmc --without-Xshm --without-x "
-                             
-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 = 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='' )
-
-       postdir = bb.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 = bb.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/packages/libxine/libxine-opie-1.0.0-rc7/fix-x.patch b/packages/libxine/libxine-opie_1.0.bb
similarity index 100%
rename from packages/libxine/libxine-opie-1.0.0-rc7/fix-x.patch
rename to packages/libxine/libxine-opie_1.0.bb

diff --git a/packages/libxine/libxine_1.0.0-rc7.bb b/packages/libxine/libxine_1.0.0-rc7.bb
deleted file mode 100644 (file)
index 6b17b31..0000000
--- a/packages/libxine/libxine_1.0.0-rc7.bb
+++ /dev/null
@@ -1,108 +0,0 @@
-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"
-PROVIDES = "virtual/libxine"
-
-inherit autotools pkgconfig gettext
-
-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-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 = 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='' )
-
-       postdir = bb.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 = bb.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/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb
new file mode 100644 (file)
index 0000000..e69de29