summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-01-05 14:14:50 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-01-05 14:14:50 +0000
commit7082048f281bffd72d8476f3bf0ce0097608ca06 (patch)
treed3b1053017387d0453e7a12ae98bb7e981655b86 /media-plugins
parentAdd comment about the build.xml change of libdir property to prevent another ... (diff)
downloadgentoo-2-7082048f281bffd72d8476f3bf0ce0097608ca06.tar.gz
gentoo-2-7082048f281bffd72d8476f3bf0ce0097608ca06.tar.bz2
gentoo-2-7082048f281bffd72d8476f3bf0ce0097608ca06.zip
Added patch, to let compile work with linux-headers not providing asm/bitopts.h.
(Portage version: 2.1.2_rc4-r6)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-bitstreamout/ChangeLog10
-rw-r--r--media-plugins/vdr-bitstreamout/files/vdr-bitstreamout-0.85-bitopts.diff18
-rw-r--r--media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r2.ebuild6
3 files changed, 30 insertions, 4 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/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