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

into handhelds.org:/home/ich/programming/oe/oe-packages-exported

BKrev: 4199162dc3qysgqjO1F1M5tDHWpdJw

3 files changed, 0 insertions, 355 deletions

diff --git a/libxine/libxine-1.0.0-rc6a/configure.patch b/libxine/libxine-1.0.0-rc6a/configure.patch
deleted file mode 100644
index c25d41988d..0000000000
--- a/libxine/libxine-1.0.0-rc6a/configure.patch
+++ /dev/null
@@ -1,177 +0,0 @@
---- xine-lib-1-rc6a/configure.ac.orig	2004-09-16 22:28:33.762843408 -0400
-+++ xine-lib-1-rc6a/configure.ac	2004-09-16 22:29:00.969707336 -0400
-@@ -622,7 +622,7 @@
- dnl ---------------------------------------------
- 
- AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
-+AM_CONDITIONAL(HAVE_AA,  [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"])
- 
- 
- dnl ---------------------------------------------
-@@ -735,10 +735,7 @@
- dnl check for SDL
- dnl ---------------------------------------------
- 
--AM_PATH_SDL(1.1.5, 
--	AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
--	[])
--AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
-+AM_CONDITIONAL(HAVE_SDL, 0)
- 
- 
- dnl ---------------------------------------------
-@@ -868,61 +865,29 @@
- dnl Ogg/Theora libs.
- dnl ---------------------------------------------
- 
--AM_PATH_OGG(
--           [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
--                           AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
--          ],
--           AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
-+AM_CONDITIONAL(HAVE_THEORA, 0)
- 
- 
- dnl ---------------------------------------------
- dnl Ogg/Speex libs.
- dnl ---------------------------------------------
- 
--PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes")
--
--if test "x$no_speex" = "xyes" ; then
--  AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")])
--fi
--
--if test "x$no_speex" = "xyes" ; then
--  AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
--else
--  AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
--
--  dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
--  dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
--  AC_CHECK_HEADER([speex/speex.h],
--                  AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
--  )
--
--  AC_SUBST(SPEEX_CFLAGS)
--  AC_SUBST(SPEEX_LIBS)
--fi
--AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
-+AM_CONDITIONAL(HAVE_SPEEX, 0)
- 
- 
- dnl ---------------------------------------------
- dnl check for libFLAC
- dnl ---------------------------------------------
- 
--AM_PATH_LIBFLAC([],
--	AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
-+AM_CONDITIONAL(HAVE_FLAC, 0)
- 
- 
- dnl ---------------------------------------------
- dnl MNG libs.
- dnl ---------------------------------------------
- 
--AC_CHECK_LIB(mng, mng_initialize,
--	[ AC_CHECK_HEADER(libmng.h,
--		[ have_libmng=yes
--		  MNG_LIBS="-lmng" ], 
--		AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
--	AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
-+MNG_LIBS=""
-+AM_CONDITIONAL(HAVE_LIBMNG, 0)
- AC_SUBST(MNG_LIBS)
- 
- 
-@@ -952,7 +917,7 @@
- dnl freetype2 lib.
- dnl ---------------------------------------------
- 
--AM_PATH_FREETYPE2()
-+AM_CONDITIONAL(HAVE_FT2, 0)
- 
- 
- dnl ---------------------------------------------
-@@ -995,37 +960,21 @@
- dnl ESD support
- dnl ---------------------------------------------
- 
--AM_PATH_ESD(0.2.8,
--        AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
--        AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
--AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
-+AM_CONDITIONAL(HAVE_ESD, 0)
- 
- 
- dnl ---------------------------------------------
- dnl ARTS support
- dnl ---------------------------------------------
- 
--AM_PATH_ARTS(0.9.5,
--        AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
--        AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
--AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
-+AM_CONDITIONAL(HAVE_ARTS, 0)
- 
- 
- dnl ---------------------------------------------
- dnl gnome-vfs support
- dnl ---------------------------------------------
- 
--PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
--                no_gnome_vfs=no,
--		no_gnome_vfs=yes)
--AC_SUBST(GNOME_VFS_CFLAGS)
--AC_SUBST(GNOME_VFS_LIBS)
--if test x"$no_gnome_vfs" != "xyes"; then
--AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
--else
--AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
--fi
--AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
-+AM_CONDITIONAL(HAVE_GNOME_VFS, 0)
- 
- 
- dnl ---------------------------------------------
-@@ -1188,35 +1137,7 @@
-     ],ISOC99_PRAGMA=no)
-     AC_MSG_RESULT($ISOC99_PRAGMA)
- 
--    dnl bitfield order
--    AC_MSG_CHECKING(bitfield ordering in structs)
--    AC_TRY_RUN([
--int
-- main() {
--  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--  __attribute__((packed))
--#endif
--  bf = { 1,1,1,1 };
--  if (sizeof (bf) != 1) return 1;
--  return *((unsigned char*) &bf) != 0x4b; }
--], bf_lsbf=1, AC_TRY_RUN([ 
--int
--main() {
--  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--  __attribute__((packed))
--#endif
--  bf = { 1,1,1,1 };
--  if (sizeof (bf) != 1) return 1;
--  return *((unsigned char*) &bf) != 0xa5; }
--], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])))
--    if test "x$bf_lsbf" = "x1"; then
--     AC_MSG_RESULT(LSBF)
--     AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
--    else
--     AC_MSG_RESULT(MSBF)
--    fi
-+    AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
- 
-     AC_HAVE_HEADERS( errno.h fcntl.h \
- 		     stdbool.h  stdlib.h stdint.h stdio.h string.h \
diff --git a/libxine/libxine-1.0.0-rc6a/cpu.patch b/libxine/libxine-1.0.0-rc6a/cpu.patch
deleted file mode 100644
index 2d866d178b..0000000000
--- a/libxine/libxine-1.0.0-rc6a/cpu.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- xine-lib-1-rc6a/src/post/goom/xmmx.c.orig	2004-09-16 21:53:34.040049792 -0400
-+++ xine-lib-1-rc6a/src/post/goom/xmmx.c	2004-09-16 21:59:24.407785800 -0400
-@@ -112,23 +112,23 @@
- 		 * post : mm3 & mm4 : coefs for this position
- 		 *              mm1 : X vector [0|X]
- 		 *
--		 * modif : eax,ebx
-+		 * modif : eax,ecx
- 		 */
- 		__asm__ __volatile__ (
--			"movd %%mm0,%%ebx\n"
-+			"movd %%mm0,%%ecx\n"
- 			"movq %%mm0,%%mm1\n"
- 
--			"andl $15,%%ebx\n"
-+			"andl $15,%%ecx\n"
- 			"psrlq $32,%%mm1\n"
- 
--			"shll $6,%%ebx\n"
-+			"shll $6,%%ecx\n"
- 			"movd %%mm1,%%eax\n"
- 
--			"addl %0,%%ebx\n"
-+			"addl %0,%%ecx\n"
- 			"andl $15,%%eax\n"
- 
--			"movd (%%ebx,%%eax,4),%%mm3\n"
--			::"g"(precalCoef):"eax","ebx");
-+			"movd (%%ecx,%%eax,4),%%mm3\n"
-+			::"g"(precalCoef):"eax","ecx");
- 
- 		/*
- 		 * extraction des coefficients...
-@@ -158,7 +158,7 @@
- 		 * post : mm0 : expix1[position]
- 		 *        mm2 : expix1[position+largeur]
- 		 *
--		 * modif : eax,ebx
-+		 * modif : eax,ecx
- 		 */
- 		psrld_i2r (PERTEDEC,mm0);
- 		psrld_i2r (PERTEDEC,mm1);
-@@ -167,23 +167,23 @@
- 			/*^*/ "movq %%mm3,%%mm5\n"       /*^*/
- 
- 			"mull %1\n"
--			"movd %%mm0,%%ebx\n"
-+			"movd %%mm0,%%ecx\n"
- 			/*^*/ "punpcklbw %%mm5, %%mm3\n" /*^*/
- 
--			"addl %%ebx,%%eax\n"
-+			"addl %%ecx,%%eax\n"
- 			/*^*/ "movq %%mm3,%%mm4\n"       /*^*/
- 			/*^*/ "movq %%mm3,%%mm5\n"       /*^*/
- 
--			"movl %0,%%ebx\n"
-+			"movl %0,%%ecx\n"
- 			/*^*/ "punpcklbw %%mm5,%%mm3\n"  /*^*/
- 
--			"movq (%%ebx,%%eax,4),%%mm0\n"
-+			"movq (%%ecx,%%eax,4),%%mm0\n"
- 			/*^*/ "punpckhbw %%mm5,%%mm4\n"  /*^*/
- 
- 			"addl %1,%%eax\n"
--			"movq (%%ebx,%%eax,4),%%mm2\n"
-+			"movq (%%ecx,%%eax,4),%%mm2\n"
- 
--			: : "X"(expix1), "X"(prevX):"eax","ebx"
-+			: : "X"(expix1), "X"(prevX):"eax","ecx"
- 		);
- 
- 		/*
diff --git a/libxine/libxine_1.0.0-rc6a.oe b/libxine/libxine_1.0.0-rc6a.oe
deleted file mode 100644
index 754f76872d..0000000000
--- a/libxine/libxine_1.0.0-rc6a.oe
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/xine-lib-1-rc6a"
-
-SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc6a.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 \
-	--enable-shared --disable-static \ 
-	--disable-fb --disable-alsa --disable-vcd \
-	--disable-asf --disable-faad --disable-iconv \
-	--disable-nls --disable-aalib --without-x \
-	--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"
-	
-
-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='' )
-}