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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/12 12:43:07+02:00 utwente.nl!koen
abiword_2.2.7.bb:
  add libglade to DEPENDS

2005/04/12 12:41:48+02:00 utwente.nl!koen
abiword_2.2.7.bb:
  use the correct patch to copy cdump to

2005/04/12 12:15:47+02:00 utwente.nl!koen
familiar-0.9.0.conf:  first shot at familiar 0.9.0

2005/04/12 12:08:53+02:00 utwente.nl!koen
preferred-gpe-versions.inc:
  unset almost all preferred versions, except for x

2005/04/11 23:26:07+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/11 23:25:43+01:00 (none)!cwiiis
Add enhancement patch for gxine, along with new bb - make it the default.
See the Changelog inside the patch for details.

2005/04/11 23:48:38+02:00 utwente.nl!koen
Add ipkg 0.99.148, courtesy Pierluigi Frullani

2005/04/11 16:54:20+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/11 16:53:54+01:00 (none)!cwiiis
New matchbox releases:
-libmatchbox (1.6->1.7)
-matchbox-panel (0.9.1->0.9.2)
-matchbox-wm (0.9.3->0.9.4)

2005/04/11 13:39:04+02:00 mn-solutions.de!schurig
teleport: added missing linefeed between DESCRIPTION and DEPENDS
xpm_cvs: no need for autofoo

2005/04/11 13:37:54+02:00 mn-solutions.de!schurig
MNCI "Rqmses":
one more patch to tslib
support for devfs to kdrive


2005/04/11 13:35:40+02:00 mn-solutions.de!schurig
added Asterisk

2005/04/11 13:35:00+02:00 mn-solutions.de!schurig
keylaunch needs xpm

2005/04/10 18:30:33+01:00 (none)!XorA
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded

2005/04/10 18:29:05+01:00 (none)!XorA
Kismet updated to 2005-04-R1 release

2005/04/10 19:11:39+02:00 dyndns.org!reenoo
copy preferred-gpe-versions.inc to preferred-gpe-versions-2.6.inc as requested by Koen

2005/04/09 05:23:20+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/09 05:15:47+01:00 (none)!cwiiis
Remove now unnecessary patch in gxine, add two more required vo/ao plugins ('none' plugins).

2005/04/09 05:14:13+01:00 (none)!cwiiis
Fix up libxine 1.0, make it the default.
    Fixes:
    - Don't disable esd
    - Use tremor instead of libvorbis
    - Apply some patches from libxine-opie
    - Fix finding of libcaca/aalib on host system by manually disabling
    - Make package name 'libxine' instead of 'libxine1' so as not to break package splitting
- Disable tremor 20041119 as it breaks libxine 1.0 (including libxine-opie)

2005/04/09 00:52:25+02:00 utwente.nl!koen
  cleanup roadster

2005/04/09 00:36:03+02:00 utwente.nl!koen
gpsd_2.20.bb:
  add gpsutils.h to staging

2005/04/09 00:20:43+02:00 utwente.nl!koen
Add roadster, which has active cvs at the moment, so don't be surprised when it breaks

2005/04/08 22:42:22+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/08 22:41:50+01:00 (none)!cwiiis
- Make libxine 1.0.0-rc5 default until 1.0 is fixed
- Add PROVIDES = "virtual/libxine" to libxine 1.0.0-rc5

2005/04/08 22:13:11+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/08 22:12:57+02:00 dyndns.org!reenoo
lcdproc: fix do_install.

2005/04/08 22:10:06+02:00 utwente.nl!koen
gst-plugins_0.8.7.bb:
  bye bye jack

2005/04/08 22:00:18+02:00 utwente.nl!koen
  disable directfb in gst-plugins

2005/04/08 21:51:59+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/08 21:51:41+02:00 dyndns.org!reenoo
kaffe: revert dependency change. gmp is listed in DEPENDS for kaffe-gtk and disabled in kaffe-qt.

2005/04/08 21:50:25+02:00 dyndns.org!reenoo
file: fix dependency loop between file and file-native

2005/04/08 20:09:36+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/08 20:08:40+01:00 (none)!cwiiis
Add section/license for gxine.
Fix libxine:
- Manually remove libcaca/aalib support
- Use tremor for decoding vorbis
- Fix package naming

2005/04/08 10:12:11-07:00 amd.com!jcrouse
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into forsteri.amd.com:/users/jcrouse/bk/openembedded

2005/04/08 10:11:51-07:00 amd.com!jcrouse
add patch for 2.4.24 to coexist peacefully with gcc 3.4

2005/04/08 19:01:50+02:00 utwente.nl!koen
abiword_2.2.7.bb:  hopefully fix abiword build

2005/04/08 16:36:38+01:00 (none)!cwiiis
Add working gxine 0.4.1, remove gxine 0.3.3 from nonworking.

2005/04/07 20:14:02+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/06 21:20:45+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/06 21:20:22+02:00 dyndns.org!reenoo
kaffe: add gmp to DEPENDS.

BKrev: 425bb68eCua4S6ecsEtNJjjHuY5Xhw

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='' )