Merge oe-devel@oe-devel.bkbits.net:packages.bb

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw

8 files changed, 0 insertions, 366 deletions

diff --git a/libxine/libxine-opie_1.0.0-rc7.bb b/libxine/libxine-opie_1.0.0-rc7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine-opie_1.0.0-rc7.bb
diff --git a/libxine/libxine-opie_1.0.0-rc7.oe b/libxine/libxine-opie_1.0.0-rc7.oe
deleted file mode 100644
index b1254ef297..0000000000
--- a/libxine/libxine-opie_1.0.0-rc7.oe
+++ /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 = 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/libxine/libxine_1.0.0-beta12.bb b/libxine/libxine_1.0.0-beta12.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine_1.0.0-beta12.bb
diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe
deleted file mode 100644
index 9a2a6fe1db..0000000000
--- a/libxine/libxine_1.0.0-beta12.oe
+++ /dev/null
@@ -1,90 +0,0 @@
-LICENSE = GPL
-DESCRIPTION = "libxine is a library for multimedia players. \
-It plays back CDs, DVDs, and VCDs. It also decodes multimedia \
-files like AVI, MOV, WMV, and MP3 from local disk drives, \
-and displays multimedia streamed over the Internet. It interprets \
-many of the most common multimedia formats available - \
-and some of the most uncommon formats, too."
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib libogg tremor libmad"
-PR = "r4"
-
-inherit autotools pkgconfig binconfig gettext
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-1-beta12.tar.gz \
-	   file://full.patch;patch=1 \
-	   file://libvorbis.patch;patch=1 \
-	   file://demux_ogg.patch;patch=1 \
-	   file://configure.ac.patch;patch=1 \
-	   file://vo_scale.patch;patch=1 \
-	   file://oss.patch;patch=1;pnum=0 \
-	   file://fix-oss-plugin.patch;patch=1 \
-	   file://mpegvideo-static-inlining.patch;patch=1 \
-	   file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \
-	   file://fftscope-static-inlining.patch;patch=1"
-S = "${WORKDIR}/xine-lib-1-beta12"
-
-SOV = "1.0.6"
-
-do_configure() {
-	./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \
-	      --enable-shared --disable-static --prefix=${prefix} \
-	      --with-zlib-path=${STAGING_DIR}/${HOST_SYS} --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
-	      --disable-oggtest --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} --without-x \
-	--disable-iconv --without-arts --without-sdl \
-	--disable-aalib
-}
-
-do_compile() {
-	oe_runmake LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool OGG_LIBS=${STAGING_LIBDIR}/libogg.so
-}
-
-do_stage() {
-	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
-	  -C src install-data \
-	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
-	  'libdir=${STAGING_LIBDIR}' \
-	  'includedir=${STAGING_INCDIR}'
-
-	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
-	  -C include install-data \
-	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
-	  'libdir=${STAGING_LIBDIR}' \
-	  'includedir=${STAGING_INCDIR}'
-
-	for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
-	  dir=`dirname $plugin`
-	  libname=`basename $plugin|sed -e's,\.la,,'` 
-	  oe_libinstall -so -C $dir $libname ${STAGING_LIBDIR}/xine/plugins/1.0.0
-	done
-
-	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
-}
-
-do_install() {
-        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
-          -C src install-data \
-          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-          'includedir=${D}/${includedir}' 
-
-        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
-          -C include install-data \
-          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-          'includedir=${D}/${includedir}'
-
-        for plugin in `find ${S}/src -type f -name xineplug*.la`; do
-          dir=`dirname $plugin`
-          libname=`basename $plugin|sed -e's,\.la,,'`
-          oe_libinstall -so -C $dir $libname ${D}/${libdir}/xine/plugins/1.0.0
-        done
-
-        oe_libinstall -so -C src/xine-engine libxine ${D}/${libdir}
-}
-
-python populate_packages_prepend () {
-	plugins_dir = oe.data.expand('/usr/lib/xine/plugins/1.0.0/', d)
-	
-	do_split_packages(d, plugins_dir, file_regex='^xineplug_(.*).so$', output_pattern='libxine-plugin-%s', description='Xine plugin - %s')
-}
-
diff --git a/libxine/libxine_1.0.0-rc5.bb b/libxine/libxine_1.0.0-rc5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine_1.0.0-rc5.bb
diff --git a/libxine/libxine_1.0.0-rc5.oe b/libxine/libxine_1.0.0-rc5.oe
deleted file mode 100644
index a74b80ff09..0000000000
--- a/libxine/libxine_1.0.0-rc5.oe
+++ /dev/null
@@ -1,70 +0,0 @@
-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"
-
-inherit autotools pkgconfig gettext
-
-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"
-
-SOV = "1.0.6"
-
-# 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 \
-	--disable-fb --disable-alsa --disable-vcd \
-	--disable-asf --disable-faad --disable-iconv \
-	--disable-aalib \
-	--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"
-
-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')
-
-	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')
-
-	fontdir = oe.data.expand('${datadir}/xine/libxine1/fonts', d)
-	do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s')
-}
diff --git a/libxine/libxine_1.0.0-rc7.bb b/libxine/libxine_1.0.0-rc7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxine/libxine_1.0.0-rc7.bb
diff --git a/libxine/libxine_1.0.0-rc7.oe b/libxine/libxine_1.0.0-rc7.oe
deleted file mode 100644
index 7ac974c14d..0000000000
--- a/libxine/libxine_1.0.0-rc7.oe
+++ /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 = 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='' )
-}