media-libs/xine-lib: versions bump

svn path=/testing/; revision=288

10 files changed, 113 insertions, 316 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 74864a9..50e3dc0 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -xine-lib-1.1.3.ebuild, -xine-lib-1.1.4.ebuild,
+  +files/xine-lib-1.1.6-fbsd.patch, +xine-lib-1.1.8.ebuild,
+  +files/xine-lib-1.1.8-dxr3.patch, -files/xine-lib-cdda-fix.patch:
+  versions bump
+
   14 Jun 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   -xine-lib-1.1.4-r1.ebuild, +xine-lib-1.1.7.ebuild:
   versions bump; xine-lib-1.1.4-r1 removed
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index b354ee1..f033ac7 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,12 +2,14 @@ AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83
 MD5 30a23851923288df6d34e7791b2dfc2f files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 RMD160 56394c48df401162c225f956a9b83fc8c3970668 files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
-AUX xine-lib-cdda-fix.patch 1303 RMD160 4eb13d6112d60c5cda6244ae6c1e696a86654ffb SHA1 1cab891c9c533468ac0b6ffbb193f5a07c51a0af SHA256 85ec3f62d43745005f54ae3c2dfb4b2af72d2d02b656aad6bc3237479115c886
-MD5 447c61bea8e82ab50977620fa122d99d files/xine-lib-cdda-fix.patch 1303
-RMD160 4eb13d6112d60c5cda6244ae6c1e696a86654ffb files/xine-lib-cdda-fix.patch 1303
-SHA256 85ec3f62d43745005f54ae3c2dfb4b2af72d2d02b656aad6bc3237479115c886 files/xine-lib-cdda-fix.patch 1303
-DIST xine-lib-1.1.3-gentoo-vdr-20070103.tar.bz2 27829 RMD160 9952ca16a0f7485052b3f5fa2083c87d884e1e71 SHA1 d76017f4e82e3d935d011fd414a177eeafdbe9f2 SHA256 566c187ddee2a63e285076c471424d9d63ae5249d06a59b79cc8239efc1feace
-DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0
+AUX xine-lib-1.1.6-fbsd.patch 1308 RMD160 da5504c5d49e0d80a5afe66eeed3f3b17609b7e2 SHA1 95cf14d4d35d11cd16df229de78a66b8d6b3c327 SHA256 dc87be5e854af5f208c928506b9c6c0f63f391231aed383b0e633664964141dd
+MD5 dd00b1090da5edc0773bdeb85a3885a0 files/xine-lib-1.1.6-fbsd.patch 1308
+RMD160 da5504c5d49e0d80a5afe66eeed3f3b17609b7e2 files/xine-lib-1.1.6-fbsd.patch 1308
+SHA256 dc87be5e854af5f208c928506b9c6c0f63f391231aed383b0e633664964141dd files/xine-lib-1.1.6-fbsd.patch 1308
+AUX xine-lib-1.1.8-dxr3.patch 543 RMD160 4fc1c9ae238c416f097e85b47a8ba4e04fb1c14f SHA1 d5d1ad4ad4a88dda30207d67f3e5e2b6b174fabd SHA256 d6cd3a848de564ccaa82f92e32983ce3a444db357c56b9312be226eac7a81aff
+MD5 95b23572473ab495374a90e57dd70f1d files/xine-lib-1.1.8-dxr3.patch 543
+RMD160 4fc1c9ae238c416f097e85b47a8ba4e04fb1c14f files/xine-lib-1.1.8-dxr3.patch 543
+SHA256 d6cd3a848de564ccaa82f92e32983ce3a444db357c56b9312be226eac7a81aff files/xine-lib-1.1.8-dxr3.patch 543
 DIST xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697 RMD160 709bd9cdcbb289b6f211d6dd32043cffe404771a SHA1 2795b6059f906b2b94cd04f848a4b34eff7bedab SHA256 97306a31b76175e72edc578e74636deda88a1752bb6a70457f72c2fc16a5aba9
 DIST xine-lib-1.1.4-xcb.patch.bz2 22346 RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 SHA1 51fb50edec0b3d66ef4b18667d332a885c5a8983 SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb
 DIST xine-lib-1.1.4.tar.bz2 6997816 RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 SHA1 ee3496a3de8d9935ca23ff1fae3677a61ce1cb21 SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23
@@ -15,19 +17,12 @@ DIST xine-lib-1.1.5-gentoo-vdr-20070414.tar.bz2 24163 RMD160 782c4da560f94ecf6bc
 DIST xine-lib-1.1.6.tar.bz2 7293043 RMD160 938be4d24a41439428162dde0f1d0dd59a4b376a SHA1 f7c865d08991be875eb986dab2640e788946e426 SHA256 ead4cd9b9db554e0a7473670dd666df7a43f87945ee701419a2ca258cbc31a3a
 DIST xine-lib-1.1.7-gentoo-vdr-20070614.tar.bz2 24036 RMD160 ee66a3044a5b595103db46384b802399e0dd5916 SHA1 1bf66c7a9b0709da124b159d2e37331c8c644652 SHA256 8d53ca9038d51d02d592209783070ce0065543820079dfa2bf170a12499406b2
 DIST xine-lib-1.1.7.tar.bz2 7295585 RMD160 7cb3f7d1c2eca6dd7a52197305a1ffd74dc4acae SHA1 acbd545b818f0eb120be60e1116152000544020f SHA256 6f6fce2f75df97892d653e08fc272ed012eb3b7b53178e6b59eb958437acccab
-DIST xine-lib-patches-61.tar.bz2 9701 RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac SHA1 0d749e3c46ea58e961d48f86aca997b16e72803b SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2
-EBUILD xine-lib-1.1.3.ebuild 6224 RMD160 bc7d8454bf072dd29d771a3514fc8dd605b768eb SHA1 16ba57309f8b7ef6a90cb3510c1aff9c51f95dc3 SHA256 a487dbcada4fe7ffdfcd20214af9a4634e73a04b8c6fdeca9177f87fd31a05e7
-MD5 15dd65da15af11d990f8fd0cd03eefc4 xine-lib-1.1.3.ebuild 6224
-RMD160 bc7d8454bf072dd29d771a3514fc8dd605b768eb xine-lib-1.1.3.ebuild 6224
-SHA256 a487dbcada4fe7ffdfcd20214af9a4634e73a04b8c6fdeca9177f87fd31a05e7 xine-lib-1.1.3.ebuild 6224
+DIST xine-lib-1.1.8-gentoo-vdr-20070904.tar.bz2 28836 RMD160 648273f7365691538d006e1f56ba608d13d798b9 SHA1 eb0d1f37f86c5b7fbea93ac2cd8d9fa7b99434ce SHA256 83fee623dae5909faaa3e4bec83d6fab33c1071fd9e164e185ffb6577794940f
+DIST xine-lib-1.1.8.tar.bz2 7284933 RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 SHA1 48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e
 EBUILD xine-lib-1.1.4-r2.ebuild 6289 RMD160 aa2e809b0ca054e137922e90b097600c7faaebf3 SHA1 43ae34db4be6be7e57d14a14bf57f5303341370c SHA256 57b8a843b0b3b632c2e6ce156e9b500a7fe2057bcf4210944fd4ba6f2b630d13
 MD5 e24267b42cdd921474365071ea77cf6a xine-lib-1.1.4-r2.ebuild 6289
 RMD160 aa2e809b0ca054e137922e90b097600c7faaebf3 xine-lib-1.1.4-r2.ebuild 6289
 SHA256 57b8a843b0b3b632c2e6ce156e9b500a7fe2057bcf4210944fd4ba6f2b630d13 xine-lib-1.1.4-r2.ebuild 6289
-EBUILD xine-lib-1.1.4.ebuild 6178 RMD160 b90f047d731f8f7fcb5d6d6bda2d423840fba3d7 SHA1 bf920125b362d88bee3964a6067e626d28c78782 SHA256 89ec895d318ce5962a821edc4e38b286ce300ac1317883079f9b08821caad587
-MD5 3001233514a03b5d4e43d8b0f3f510c3 xine-lib-1.1.4.ebuild 6178
-RMD160 b90f047d731f8f7fcb5d6d6bda2d423840fba3d7 xine-lib-1.1.4.ebuild 6178
-SHA256 89ec895d318ce5962a821edc4e38b286ce300ac1317883079f9b08821caad587 xine-lib-1.1.4.ebuild 6178
 EBUILD xine-lib-1.1.6.ebuild 6266 RMD160 65aef7642b804cf4f3aa4462cbe5e13d029c9874 SHA1 ab7713e2c46dac6cd35179d51f361ea45a31b72c SHA256 924ea4386779badd40227184a58374a1e8bd9716298baaccbdfc2c2a6b584df7
 MD5 35c73680988c1f3e03a75a9487778261 xine-lib-1.1.6.ebuild 6266
 RMD160 65aef7642b804cf4f3aa4462cbe5e13d029c9874 xine-lib-1.1.6.ebuild 6266
@@ -36,20 +31,18 @@ EBUILD xine-lib-1.1.7.ebuild 6245 RMD160 7db5f044288bdf4965887cee10878f5e728a323
 MD5 79b6addae611d559c7b08ff8d3e159bc xine-lib-1.1.7.ebuild 6245
 RMD160 7db5f044288bdf4965887cee10878f5e728a323b xine-lib-1.1.7.ebuild 6245
 SHA256 86e21dd13a5c4e6a21cf3c25083d6c05dee8cf82e99464c85d890bdfeeefd832 xine-lib-1.1.7.ebuild 6245
-MISC ChangeLog 1485 RMD160 d58337f338e4ebafc5188a2abb65ab0ea523ff02 SHA1 a195830e29116f7dc4b36116746d15f64fded13d SHA256 411897178635ba2c15d3aafdd72ef052b40b2d484b63b8a0fd0190fda737fdda
-MD5 6af58f442b1c5c30fffd61e70b8ffdb0 ChangeLog 1485
-RMD160 d58337f338e4ebafc5188a2abb65ab0ea523ff02 ChangeLog 1485
-SHA256 411897178635ba2c15d3aafdd72ef052b40b2d484b63b8a0fd0190fda737fdda ChangeLog 1485
+EBUILD xine-lib-1.1.8.ebuild 6163 RMD160 f3ea7945695ee51e52e60e7f96c9003a1d5bf096 SHA1 cdc37203b183ae875efc17be27d1701da4f1cf30 SHA256 2b05c38ca112311259faeab0a3e4fe2461a8f6d597dd64d00457508176030e6b
+MD5 e610e37086eb3be0e477d08c6d93a88a xine-lib-1.1.8.ebuild 6163
+RMD160 f3ea7945695ee51e52e60e7f96c9003a1d5bf096 xine-lib-1.1.8.ebuild 6163
+SHA256 2b05c38ca112311259faeab0a3e4fe2461a8f6d597dd64d00457508176030e6b xine-lib-1.1.8.ebuild 6163
+MISC ChangeLog 1735 RMD160 50f1adb44971351e29dee402269fa99f000aac95 SHA1 df24f7977c9931a996ccc424320ba0a48a9a6d5d SHA256 f24a9bead98f48075685dc96ce182b20737d2682be97bb91129f7cdaf2bb002d
+MD5 da9ef0e3fd2629eb980a091505adff3e ChangeLog 1735
+RMD160 50f1adb44971351e29dee402269fa99f000aac95 ChangeLog 1735
+SHA256 f24a9bead98f48075685dc96ce182b20737d2682be97bb91129f7cdaf2bb002d ChangeLog 1735
 MISC metadata.xml 482 RMD160 4ad7da31113020d5de3a47ea5b367b186e93c7cb SHA1 8d99078eabffe305b5d8f8e5af9e27a2f6339890 SHA256 02042c581c6cb0316663d998281da538fdd14f8d4c0466edb0b6022b0ea9b7a3
 MD5 1cb0015845f0962f0d982c02b7377ae5 metadata.xml 482
 RMD160 4ad7da31113020d5de3a47ea5b367b186e93c7cb metadata.xml 482
 SHA256 02042c581c6cb0316663d998281da538fdd14f8d4c0466edb0b6022b0ea9b7a3 metadata.xml 482
-MD5 900802c4a85200bd2a736a11a8149e15 files/digest-xine-lib-1.1.3 807
-RMD160 9581d7116e4ec09ebc45af4e1238ce2dfc5810bc files/digest-xine-lib-1.1.3 807
-SHA256 b6fba6b936b56ff1cc45477996de0f852cdd0c8d3d1e6220e4dc2d940c0fe0a2 files/digest-xine-lib-1.1.3 807
-MD5 cb63a7f12e60981eb7e46b6760158aaf files/digest-xine-lib-1.1.4 554
-RMD160 cf1ec3ea3be1bce3063aa7289c858c74f62d052e files/digest-xine-lib-1.1.4 554
-SHA256 e819f31c8273ef357f99946d0c39423b204886f6d29dc36edf88d738517d94a0 files/digest-xine-lib-1.1.4 554
 MD5 ea7379a6484695225b0ed2e3289e1495 files/digest-xine-lib-1.1.4-r2 816
 RMD160 5f48dde0eb1a285436dd7049d94da28ff7ae4f61 files/digest-xine-lib-1.1.4-r2 816
 SHA256 4b8804e9598a5463ad0f0fbcdb959219ae1537dbcdc3fe49ed139e858407f1fb files/digest-xine-lib-1.1.4-r2 816
@@ -59,3 +52,6 @@ SHA256 2c70a16c8a8ccb987b0b2a1e5f8b0fbca650ce4c02fcb6ab4732c7b5fce6894f files/di
 MD5 d01ef7c062fc54c9a3251da52eabfd75 files/digest-xine-lib-1.1.7 554
 RMD160 db598f859c0cbfb0ca55f8b374680643347a6f8d files/digest-xine-lib-1.1.7 554
 SHA256 05f091e84b72731f8ddd3db7df6dc71315cbf887d4bcdeb1de021cca27421c27 files/digest-xine-lib-1.1.7 554
+MD5 fea7dc35f2eae5e66b7438d12d5defd5 files/digest-xine-lib-1.1.8 554
+RMD160 a2949a5f38f1fcb8517905207a6c5245fcaf2394 files/digest-xine-lib-1.1.8 554
+SHA256 41a57672abbb25cdbdbd83e8edd501323894aa5950c6087b8805cabe54301b8a files/digest-xine-lib-1.1.8 554
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3
deleted file mode 100644
index 18d7fcb..0000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 b89e17cd5e01644724d0fc2b30797d41 xine-lib-1.1.3-gentoo-vdr-20070103.tar.bz2 27829
-RMD160 9952ca16a0f7485052b3f5fa2083c87d884e1e71 xine-lib-1.1.3-gentoo-vdr-20070103.tar.bz2 27829
-SHA256 566c187ddee2a63e285076c471424d9d63ae5249d06a59b79cc8239efc1feace xine-lib-1.1.3-gentoo-vdr-20070103.tar.bz2 27829
-MD5 161dc882a9e7352c63b3fd1b6ff2e55f xine-lib-1.1.3.tar.gz 8508884
-RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 xine-lib-1.1.3.tar.gz 8508884
-SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0 xine-lib-1.1.3.tar.gz 8508884
-MD5 ae3f09d77faf7e31ca78e9ebc79463ce xine-lib-patches-61.tar.bz2 9701
-RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac xine-lib-patches-61.tar.bz2 9701
-SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2 xine-lib-patches-61.tar.bz2 9701
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.4 b/media-libs/xine-lib/files/digest-xine-lib-1.1.4
deleted file mode 100644
index dc07c82..0000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1979e3b9fa7a4eddb18972c81bd64f00 xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697
-RMD160 709bd9cdcbb289b6f211d6dd32043cffe404771a xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697
-SHA256 97306a31b76175e72edc578e74636deda88a1752bb6a70457f72c2fc16a5aba9 xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697
-MD5 e8ecc022457d8ffc9fec91681c5fff2b xine-lib-1.1.4.tar.bz2 6997816
-RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 xine-lib-1.1.4.tar.bz2 6997816
-SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23 xine-lib-1.1.4.tar.bz2 6997816
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.8 b/media-libs/xine-lib/files/digest-xine-lib-1.1.8
new file mode 100644
index 0000000..95e4a19
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.8
@@ -0,0 +1,6 @@
+MD5 1940b7346aef3599abda173204ab4267 xine-lib-1.1.8-gentoo-vdr-20070904.tar.bz2 28836
+RMD160 648273f7365691538d006e1f56ba608d13d798b9 xine-lib-1.1.8-gentoo-vdr-20070904.tar.bz2 28836
+SHA256 83fee623dae5909faaa3e4bec83d6fab33c1071fd9e164e185ffb6577794940f xine-lib-1.1.8-gentoo-vdr-20070904.tar.bz2 28836
+MD5 607386c8f5d5a5a896aa651b4f367561 xine-lib-1.1.8.tar.bz2 7284933
+RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 xine-lib-1.1.8.tar.bz2 7284933
+SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e xine-lib-1.1.8.tar.bz2 7284933
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch b/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch
new file mode 100644
index 0000000..6f508c0
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.6-fbsd.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+# Date 1178289959 -7200
+# Node ID ee3cb7841d1490bb5dfb760df2f49642da9f6837
+# Parent  ce82ad163b0e36d3edefd90bfe3f2ba05ab3ace3
+Fix building of CDDA input on FreeBSD, the NetBSD patch broke it as sys/scsiio.h is not present on FreeBSD.
+
+diff -r ce82ad163b0e -r ee3cb7841d14 configure.ac
+--- a/configure.ac	Wed May 02 21:51:16 2007 +0200
++++ b/configure.ac	Fri May 04 16:45:59 2007 +0200
+@@ -1656,7 +1656,7 @@ dnl ------------------------------------
+ dnl ---------------------------------------------
+ 
+ AC_CHECK_HEADERS([linux/cdrom.h sys/dvdio.h], [break])
+-AC_CHECK_HEADERS([sys/cdio.h])
++AC_CHECK_HEADERS([sys/cdio.h sys/scsiio.h])
+ AM_CHECK_CDROM_IOCTLS(
+ 	[AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])],
+ 	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
+diff -r ce82ad163b0e -r ee3cb7841d14 src/input/input_cdda.c
+--- a/src/input/input_cdda.c	Wed May 02 21:51:16 2007 +0200
++++ b/src/input/input_cdda.c	Fri May 04 16:45:59 2007 +0200
+@@ -617,7 +617,10 @@ static int read_cdrom_frames(cdda_input_
+ #elif defined(__FreeBSD__) || defined(__NetBSD__)
+ 
+ #include <sys/cdio.h>
++
++#ifdef HAVE_SYS_SCSIIO_H
+ #include <sys/scsiio.h>
++#endif
+ 
+ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
+ 
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch b/media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch
new file mode 100644
index 0000000..dbe6573
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.8-dxr3.patch
@@ -0,0 +1,12 @@
+diff -ur xine-lib-1.1.8.orig/src/libffmpeg/ffmpeg_encoder.c xine-lib-1.1.8/src/libffmpeg/ffmpeg_encoder.c
+--- xine-lib-1.1.8.orig/src/libffmpeg/ffmpeg_encoder.c	2007-08-19 02:36:50.000000000 +0300
++++ xine-lib-1.1.8/src/libffmpeg/ffmpeg_encoder.c	2007-09-04 15:04:41.000000000 +0300
+@@ -76,7 +76,7 @@
+   lavc_data_t* this;
+   avcodec_init();
+ 
+-  register_avcodec(&mpeg1video_encoder);  
++  avcodec_register_all();
+   lprintf("lavc init , version %x\n", avcodec_version());
+   this = xine_xmalloc(sizeof(lavc_data_t));
+   if (!this) return 0;
diff --git a/media-libs/xine-lib/files/xine-lib-cdda-fix.patch b/media-libs/xine-lib/files/xine-lib-cdda-fix.patch
deleted file mode 100644
index a289da0..0000000
--- a/media-libs/xine-lib/files/xine-lib-cdda-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
-# Date 1176501310 -7200
-# Node ID 16e2e0741d34d2b8b47a835076aa1c15637d4964
-# Parent 7d3dcb71e309c19196e2027ba418fdb17f1d6c8d
-Use the stream's audio_fifo as it hasn't been reported on the demuxer's instance yet.
-
---- a/src/demuxers/demux_ac3.c	Thu Apr 12 18:02:38 2007 +0200
-+++ b/src/demuxers/demux_ac3.c	Fri Apr 13 23:55:10 2007 +0200
-@@ -138,7 +138,7 @@ static int open_ac3_file(demux_ac3_t *th
-   if (blocksize) {
-     this->input->seek(this->input, 0, SEEK_SET);
-     buf_element_t *buf = this->input->read_block(this->input,
--						 this->audio_fifo,
-+						 this->stream->audio_fifo,
- 						 blocksize);
-     this->input->seek(this->input, 0, SEEK_SET);
- 
---- a/src/demuxers/demux_dts.c	Thu Apr 12 18:02:38 2007 +0200
-+++ b/src/demuxers/demux_dts.c	Fri Apr 13 23:55:10 2007 +0200
-@@ -86,9 +86,9 @@ static int open_dts_file(demux_dts_t *th
- 
-   blocksize = this->input->get_blocksize(this->input);
-   if (blocksize) {
--    this->input->seek(this->input, 0, SEEK_SET);
-+    //    this->input->seek(this->input, 0, SEEK_SET);
-     buf_element_t *buf = this->input->read_block(this->input,
--						 this->audio_fifo,
-+						 this->stream->audio_fifo,
- 						 blocksize);
-     this->input->seek(this->input, 0, SEEK_SET);
- 
-
diff --git a/media-libs/xine-lib/xine-lib-1.1.3.ebuild b/media-libs/xine-lib/xine-lib-1.1.3.ebuild
deleted file mode 100644
index 18e4869..0000000
--- a/media-libs/xine-lib/xine-lib-1.1.3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.3.ebuild,v 1.1 2006/12/16 21:02:09 hd_brummy Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit eutils flag-o-matic toolchain-funcs libtool autotools
-
-# This should normally be empty string, unless a release has a suffix.
-if [[ "${P/_pre/}" != "${P}" ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
-fi
-
-PATCHLEVEL="61"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-	mirror://vdrfiles/${PN}/${P}-gentoo-vdr-20070103.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
-gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
-dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
-debug modplug gtk pulseaudio mmap truetype vdr vdr-net"
-
-RDEPEND="
-	X? ( x11-libs/libXext
-		 x11-libs/libX11 )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-	xinerama? ( x11-libs/libXinerama )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( ~media-libs/flac-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 )
-	speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
-	libcaca? ( >=media-libs/libcaca-0.99_beta1 )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
-	>=media-video/ffmpeg-0.4.9_p20060816
-	modplug? ( media-libs/libmodplug )
-	nls? ( virtual/libintl )
-	gtk? ( =x11-libs/gtk+-2* )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? ( =media-libs/freetype-2* media-libs/fontconfig )
-	virtual/libiconv
-	!=media-libs/xine-lib-0.9.13*"
-
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt
-		 x11-proto/xproto
-		 x11-proto/videoproto
-		 x11-proto/xf86vidmodeproto
-		 xinerama? ( x11-proto/xineramaproto ) )
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${WORKDIR}/patches/120"*
-
-	# add some vdr relevated patches
-	if use vdr; then
-		echo
-		einfo "Add VDR patches"
-
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/010-add-key.patch
-		# 020 030 really needed ?
-#		epatch ${WORKDIR}/${PN}-gentoo-vdr/020-dprintf-changes.patch
-#		epatch ${WORKDIR}/${PN}-gentoo-vdr/030-cflags-ffmpeg-mmx.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/040-centre_crop_out.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/050-libmpeg2.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/070-export-functions.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
-
-		if use vdr-net; then
-			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
-		fi
-	fi
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		is-flag -O? || append-flags -O2
-	fi
-
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	# Too many file names are the same (xine_decoder.c), change the builddir
-	# So that the relative path is used to identify them.
-	mkdir "${WORKDIR}/build"
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		\
-		$(use_enable mng) \
-		$(use_with imagemagick) \
-		$(use_enable gtk gdkpixbuf) \
-		\
-		$(use_enable aac faad) \
-		$(use_enable flac) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with theora) \
-		$(use_enable a52) --with-external-a52dec \
-		$(use_enable mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		\
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_with libcaca caca) \
-		$(use_with sdl) \
-		$(use_enable xvmc) \
-		\
-		$(use_enable oss) \
-		$(use_with alsa) \
-		$(use_with arts) \
-		$(use_with esd esound) \
-		$(use_with pulseaudio) \
-		$(use_enable vcd) --without-internal-vcdlibs \
-		\
-		$(use_enable win32codecs w32dll) \
-		$(use_enable modplug) \
-		\
-		$(use_enable mmap) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig ) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--disable-optimizations \
-		--disable-syncfb \
-		--disable-samba \
-		${myconf} \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/lib/win32 \
-		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
-	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
-
-	rm -rf "${D}/usr/share/doc/xine"
-}
diff --git a/media-libs/xine-lib/xine-lib-1.1.4.ebuild b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
index fdf812d..559bc3a 100644
--- a/media-libs/xine-lib/xine-lib-1.1.4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.8.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.4.ebuild,v 1.3 2007/01/29 18:50:01 flameeyes Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.8.ebuild,v 1.2 2007/09/04 12:22:40 drac Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -17,26 +14,24 @@ else
 
 	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
 fi
-
 SRC_URI="${SRC_URI}
-	mirror://vdrfiles/${PN}/${P}-gentoo-vdr-20070130.tar.bz2"
+		mirror://vdrfiles/${PN}/${P}-gentoo-vdr-20070904.tar.bz2"
 
 DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="http://xine.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
 gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
 samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
-debug modplug gtk pulseaudio mmap truetype wavpack musepack
-vdr vdr-net"
+debug modplug gtk pulseaudio mmap truetype wavpack musepack xcb jack
+real vdr vdr-net"
 
-RDEPEND="
-	X? ( x11-libs/libXext
-		 x11-libs/libX11 )
+RDEPEND="X? ( x11-libs/libXext
+	x11-libs/libX11 )
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )
 	xinerama? ( x11-libs/libXinerama )
@@ -61,7 +56,7 @@ RDEPEND="
 	a52? ( >=media-libs/a52dec-0.7.4-r5 )
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
+	dts? ( || ( media-libs/libdca media-libs/libdts ) )
 	>=media-video/ffmpeg-0.4.9_p20070129
 	modplug? ( media-libs/libmodplug )
 	nls? ( virtual/libintl )
@@ -71,7 +66,12 @@ RDEPEND="
 	virtual/libiconv
 	wavpack? ( >=media-sound/wavpack-4.31 )
 	musepack? ( media-libs/libmpcdec )
-	!=media-libs/xine-lib-0.9.13*"
+	xcb? ( >=x11-libs/libxcb-1.0 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	real? (
+		x86? ( media-libs/win32codecs )
+		x86-fbsd? ( media-libs/win32codecs )
+		amd64? ( media-libs/amd64codecs ) )"
 
 DEPEND="${RDEPEND}
 	X? ( x11-libs/libXt
@@ -86,30 +86,26 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
+	cd "${S}"
 
 	# add some vdr relevated patches
 	if use vdr; then
 		echo
 		einfo "Add VDR patches"
 
-		# 020 030 really needed ?
-##		epatch ${WORKDIR}/${PN}-gentoo-vdr/020-dprintf-changes.patch
-##		epatch ${WORKDIR}/${PN}-gentoo-vdr/030-cflags-ffmpeg-mmx.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/040-centre_crop_out.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/050-libmpeg2.patch
 		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
-		epatch ${WORKDIR}/${PN}-gentoo-vdr/070-export-functions.patch
 		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
 		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
 
 		if use vdr-net; then
 			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
 		fi
-
-		AT_M4DIR="m4" eautoreconf
 	fi
+
+	AT_M4DIR="m4" eautoreconf
+
+	# Bug 183692.
+	epatch "${FILESDIR}"/${P}-dxr3.patch
 }
 
 src_compile() {
@@ -120,13 +116,10 @@ src_compile() {
 	if [[ $(tc-arch) == "x86" ]]; then
 		filter-flags -fforce-addr
 		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
+		filter-flags -fno-omit-frame-pointer #breaks per bug #149704
 		is-flag -O? || append-flags -O2
 	fi
 
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
 	local myconf
 
 	# enable/disable appropiate optimizations on sparc
@@ -140,6 +133,7 @@ src_compile() {
 	# So that the relative path is used to identify them.
 	mkdir "${WORKDIR}/build"
 
+	elibtoolize
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable gnome gnomevfs) \
 		$(use_enable nls) \
@@ -159,7 +153,7 @@ src_compile() {
 		$(use_with theora) \
 		$(use_with wavpack) \
 		$(use_enable modplug) \
-		$(use_enable a52) --with-external-a52dec \
+		$(use_enable a52 a52dec) --with-external-a52dec \
 		$(use_enable mad) --with-external-libmad \
 		$(use_enable dts) --with-external-libdts \
 		$(use_enable musepack) --with-external-libmpcdec \
@@ -175,18 +169,24 @@ src_compile() {
 		$(use_with libcaca caca) \
 		$(use_with sdl) \
 		$(use_enable xvmc) \
+		$(use_with xcb) \
 		\
 		$(use_enable oss) \
 		$(use_with alsa) \
 		$(use_with arts) \
 		$(use_with esd esound) \
 		$(use_with pulseaudio) \
+		$(use_with jack) \
+		\
 		$(use_enable vcd) --without-internal-vcdlibs \
 		\
 		$(use_enable win32codecs w32dll) \
+		$(use_enable real real-codecs) \
 		\
 		$(use_enable mmap) \
 		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		\
+		$(use_enable debug) \
 		--enable-asf \
 		--with-external-ffmpeg \
 		--disable-optimizations \
@@ -194,14 +194,15 @@ src_compile() {
 		${myconf} \
 		--with-xv-path=/usr/$(get_libdir) \
 		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
 		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed"
+		--disable-dependency-tracking || die "econf failed."
 
-	emake || die "emake failed"
+	emake || die "emake failed."
 }
 
 src_install() {
 	emake -j1 DESTDIR="${D}" \
 		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
-		install || die "Install failed"
-}
\ No newline at end of file
+		install || die "emake install failed."
+}