Added a patch to redefine some macros which were dropped in the new 2.6. kernel headers.

4 files changed, 32 insertions, 10 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 6f154b5fb31c..94fddccbc562 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.79 2003/12/19 00:03:53 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.80 2003/12/27 14:50:58 plasmaroo Exp $
+
+  27 Dec 2003; <plasmaroo@gentoo.org> xine-lib-1_rc3.ebuild,
+  files/xine-lib-2.6.patch:
+  Added a patch to make xine-lib work with 2.6 kernel includes - closes bug
+  #36564.
 
   18 Dec 2003; Brandon Hale <tseng@gentoo.org> xine-lib-1_rc2.ebuild,
   xine-lib-1_rc3.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 66ff117bd170..6f44a9adeffc 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,17 +1,18 @@
-MD5 595ff9fae06866b20b164ba33b879101 ChangeLog 15028
+MD5 422e8171b4461a793f983bccb44f8427 ChangeLog 15208
+MD5 07de83460a1cfb484b3e3470cb34fc8e xine-lib-1_rc2.ebuild 4387
 MD5 ae4bc626a0e60a274f0edcd798d9ad7f metadata.xml 252
 MD5 e5f3c44f7623ca8935cfb036f659d60c xine-lib-0.9.13-r3.ebuild 3656
+MD5 e72b69fea244fc43058ebdc964a3f46c xine-lib-1_rc3.ebuild 4303
 MD5 512b8ccb65630b7d1401a20066d9b25d xine-lib-1_beta12-r1.ebuild 4168
-MD5 9da5b7e723e0ecdb33bbdf3c0b6dd823 xine-lib-1_rc3.ebuild 4214
-MD5 07de83460a1cfb484b3e3470cb34fc8e xine-lib-1_rc2.ebuild 4387
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
+MD5 839a99235ab0a1614ee36d0fc1161bf0 files/protect-CFLAGS.patch-1_rc3 627
 MD5 8eb4910b4744e8b723e3ebf22c292efc files/digest-xine-lib-1_rc3 67
 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12-r1 70
-MD5 839a99235ab0a1614ee36d0fc1161bf0 files/protect-CFLAGS.patch-1_rc3 627
 MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 31ab44d87982996031a1074d289fb9f6 files/protect-CFLAGS.patch-1_rc2 691
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 31ab44d87982996031a1074d289fb9f6 files/protect-CFLAGS.patch-1_rc2 691
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 b61054fcf19f682dd1af36c977b103e1 files/xine-lib-2.6.patch 624
diff --git a/media-libs/xine-lib/files/xine-lib-2.6.patch b/media-libs/xine-lib/files/xine-lib-2.6.patch
new file mode 100644
index 000000000000..4d6dc0acb8b6
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-2.6.patch
@@ -0,0 +1,14 @@
+--- xine-lib-1-rc3/src/xine-utils/xine_check.c	2003-12-08 10:36:27.000000000 +0000
++++ xine-lib-1-rc3/src/xine-utils/xine_check.c.plasmaroo	2003-12-27 14:20:36.000000000 +0000
+@@ -276,6 +276,11 @@
+     return hc;
+   }
+ 
++  #define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
++    ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
++
++  #define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR)
++
+   if (SCSI_BLK_MAJOR(major(st.st_rdev))) {
+     is_scsi_dev = 1;
+     set_hc_result(hc, XINE_HEALTH_CHECK_OK, "SKIPPED - Operation not supported on SCSI drives or drives that use the ide-scsi module.");
diff --git a/media-libs/xine-lib/xine-lib-1_rc3.ebuild b/media-libs/xine-lib/xine-lib-1_rc3.ebuild
index d02ff93c68db..40cf071c3f86 100644
--- a/media-libs/xine-lib/xine-lib-1_rc3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3.ebuild,v 1.2 2003/12/19 00:03:53 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3.ebuild,v 1.3 2003/12/27 14:50:58 plasmaroo Exp $
 
 inherit eutils flag-o-matic
 
@@ -71,6 +71,8 @@ src_unpack() {
 	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
 	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
 	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV} || die
+	# plasmaroo: Kernel 2.6 headers patch
+	epatch ${FILESDIR}/xine-lib-2.6.patch || die
 }
 
 src_compile() {