Added patch, to let compile work with linux-headers not providing asm/bitopts.h.

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 46 insertions, 16 deletions

diff --git a/media-plugins/vdr-bitstreamout/ChangeLog b/media-plugins/vdr-bitstreamout/ChangeLog
index 4f915108c4a9..bde278830787 100644
--- a/media-plugins/vdr-bitstreamout/ChangeLog
+++ b/media-plugins/vdr-bitstreamout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-bitstreamout
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/ChangeLog,v 1.11 2006/11/18 09:17:06 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/ChangeLog,v 1.12 2007/01/05 14:14:50 zzam Exp $
+
+  05 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-bitstreamout-0.85-bitopts.diff,
+  vdr-bitstreamout-0.85-r2.ebuild:
+  Added patch, to let compile work with linux-headers not providing
+  asm/bitopts.h.
 
   18 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-bitstreamout-0.85-r2.ebuild:
diff --git a/media-plugins/vdr-bitstreamout/Manifest b/media-plugins/vdr-bitstreamout/Manifest
index 180de0050a4f..89de0c3828f0 100644
--- a/media-plugins/vdr-bitstreamout/Manifest
+++ b/media-plugins/vdr-bitstreamout/Manifest
@@ -9,15 +9,19 @@ AUX rc-addon.sh 500 RMD160 6ba2adba5fe1d163d140fdb370e574303dd6d7f8 SHA1 5073459
 MD5 3b388c7a7206e6a7e8ee87d2be49c4b7 files/rc-addon.sh 500
 RMD160 6ba2adba5fe1d163d140fdb370e574303dd6d7f8 files/rc-addon.sh 500
 SHA256 8f71f16bea6cb27650a0907f57af7b7092b03022f9668b3b19478538b993aa11 files/rc-addon.sh 500
+AUX vdr-bitstreamout-0.85-bitopts.diff 545 RMD160 4d577378ae0541dd11c4f0903488e2a92f67a0fa SHA1 10a9ca2e8755352b77a40c6d3a26f74e78406afb SHA256 5c8d74b56952a6ddefb17c09b61da76bf7cd2266241c6f2e574cc384226ed72c
+MD5 99a93987934bab5d6d09c6bd02a2cc80 files/vdr-bitstreamout-0.85-bitopts.diff 545
+RMD160 4d577378ae0541dd11c4f0903488e2a92f67a0fa files/vdr-bitstreamout-0.85-bitopts.diff 545
+SHA256 5c8d74b56952a6ddefb17c09b61da76bf7cd2266241c6f2e574cc384226ed72c files/vdr-bitstreamout-0.85-bitopts.diff 545
 DIST vdr-bitstreamout-0.85.tar.bz2 168603 RMD160 053cbb7434df36639117c15185fd40b055e89d16 SHA1 c0354e1a268bc57b2995dc41376a305a73e82fea SHA256 8c7084defdce262f57adb37b5dc053675689c340813d10783cf26a4eb781d3e8
-EBUILD vdr-bitstreamout-0.85-r2.ebuild 902 RMD160 53346960e731b9e069c7dfd8ebab4bb9ce84361c SHA1 b4abff7ebfa6361861e408bb5c5f748ca117c6cf SHA256 74f780d24f91c9ad443773ac2f0d4a4b3ed1d3eb77f3e457c2e3a32c1438135b
-MD5 4f79f99deb5ccd4a3b6e64a20576392b vdr-bitstreamout-0.85-r2.ebuild 902
-RMD160 53346960e731b9e069c7dfd8ebab4bb9ce84361c vdr-bitstreamout-0.85-r2.ebuild 902
-SHA256 74f780d24f91c9ad443773ac2f0d4a4b3ed1d3eb77f3e457c2e3a32c1438135b vdr-bitstreamout-0.85-r2.ebuild 902
-MISC ChangeLog 2033 RMD160 411ca6378ecfe00715f648754e7d1b4d3076309c SHA1 0df2008ae96ba25c06d7829b7e35099198ea8dfe SHA256 eebb32ec5de5bec28ffbb5470abec36d5019b9a0c38948c1b2facb335198dfef
-MD5 8358fd728257803ffecde6b87b72c7f6 ChangeLog 2033
-RMD160 411ca6378ecfe00715f648754e7d1b4d3076309c ChangeLog 2033
-SHA256 eebb32ec5de5bec28ffbb5470abec36d5019b9a0c38948c1b2facb335198dfef ChangeLog 2033
+EBUILD vdr-bitstreamout-0.85-r2.ebuild 943 RMD160 8d9674ce85538e5ccb426e7158e2a711692ae594 SHA1 c70164e26bca511e21c5bc0a53f5ba99f58eea25 SHA256 da9bfd96261683a83d513ae8695acc982f54cae566e3761c25cc098337e3a0d9
+MD5 0ab261f00a826e756215bcf188acf211 vdr-bitstreamout-0.85-r2.ebuild 943
+RMD160 8d9674ce85538e5ccb426e7158e2a711692ae594 vdr-bitstreamout-0.85-r2.ebuild 943
+SHA256 da9bfd96261683a83d513ae8695acc982f54cae566e3761c25cc098337e3a0d9 vdr-bitstreamout-0.85-r2.ebuild 943
+MISC ChangeLog 2252 RMD160 58d0813dc0649b971ea1cbbbe0856716b58285ed SHA1 240ec876d6c9d4301e083c842f6ff226f0928aa3 SHA256 23a79c006dc8cafb8a06f7c38d4f4d61320d652dcce1f0e1a21cd29e95ef188b
+MD5 41057dde764c68a090d00f9fdb929714 ChangeLog 2252
+RMD160 58d0813dc0649b971ea1cbbbe0856716b58285ed ChangeLog 2252
+SHA256 23a79c006dc8cafb8a06f7c38d4f4d61320d652dcce1f0e1a21cd29e95ef188b ChangeLog 2252
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -26,9 +30,9 @@ MD5 45356cb364a75152c6956337531ca995 files/digest-vdr-bitstreamout-0.85-r2 268
 RMD160 aaf230f688156fa222c3f07b27679ae48c2a242a files/digest-vdr-bitstreamout-0.85-r2 268
 SHA256 e82621518ce03a686965181e6f8bfc4e263d4ed949b3b2ba5cb71ebefcdf08e1 files/digest-vdr-bitstreamout-0.85-r2 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFXs+Zt2vP6XvVdOcRAjxGAKDmMJ0sB7qGfKuO7zttXyEAaCByKwCfd5Te
-4/1euACXy0ocBS+83sxlWdA=
-=ifqM
+iD8DBQFFnl1zt2vP6XvVdOcRAoFgAJ9KOyCNnnXWEy/9xcZcl64muD9wVACeNBqU
+K+3bZ913cvPOqCmDpY7qeRA=
+=zB00
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-bitstreamout/files/vdr-bitstreamout-0.85-bitopts.diff b/media-plugins/vdr-bitstreamout/files/vdr-bitstreamout-0.85-bitopts.diff
new file mode 100644
index 000000000000..3800f7d43c8d
--- /dev/null
+++ b/media-plugins/vdr-bitstreamout/files/vdr-bitstreamout-0.85-bitopts.diff
@@ -0,0 +1,18 @@
+diff -ru bitstreamout-0.85-orig/types.h bitstreamout-0.85/types.h
+--- bitstreamout-0.85-orig/types.h	2007-01-05 15:10:51.063602883 +0100
++++ bitstreamout-0.85/types.h	2007-01-05 15:11:55.619413470 +0100
+@@ -26,7 +26,13 @@
+ #include <sys/mman.h>
+ #include <asm/types.h>
+ #include <sys/types.h>
+-#if defined(__i386__) || defined(__x86_64__)
++/*
++ * #if defined(__i386__) || defined(__x86_64__)
++ * #define HAVE_BITOPTS 1
++ * #endif
++ */
++
++#ifdef HAVE_BITOPTS
+ # include <asm/bitops.h>
+ #else
+ # define clear_bit(n,addr)  (*(addr) &= ~(1 << (n)))
diff --git a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild
index 2de7f01b3f0f..3dd9e5701cc1 100644
--- a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild
+++ b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild,v 1.2 2006/11/18 09:17:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild,v 1.3 2007/01/05 14:14:50 zzam Exp $
 
 IUSE=""
 
@@ -19,6 +19,8 @@ DEPEND=">=media-video/vdr-1.2.6
 	>=media-libs/libmad-0.14.2b-r2
 	"
 
+PATCHES="${FILESDIR}/${P}-bitopts.diff"
+
 src_install() {
 	vdr-plugin_src_install