summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-01-09 12:38:37 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-01-09 12:38:37 +0000
commit918a2bbbbf83719a9a0694e9788d53f102f52733 (patch)
treeb0bb9ebd720e8d559f0dc59315ecf0771bbfc2b0 /media-video
parentApache herd package refresh (Manifest recommit) (diff)
downloadgentoo-2-918a2bbbbf83719a9a0694e9788d53f102f52733.tar.gz
gentoo-2-918a2bbbbf83719a9a0694e9788d53f102f52733.tar.bz2
gentoo-2-918a2bbbbf83719a9a0694e9788d53f102f52733.zip
added a configure patch to let codeine compile again xine-1.0. fixes bug #76252.
Diffstat (limited to 'media-video')
-rw-r--r--media-video/codeine/ChangeLog9
-rw-r--r--media-video/codeine/codeine-1.0_beta1.ebuild17
-rw-r--r--media-video/codeine/files/codeine-1.0_beta1-xine-lib-1.0.patch17
3 files changed, 36 insertions, 7 deletions
diff --git a/media-video/codeine/ChangeLog b/media-video/codeine/ChangeLog
index 08f4bbb895e0..bb5e5c7d503f 100644
--- a/media-video/codeine/ChangeLog
+++ b/media-video/codeine/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/codeine
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.2 2004/11/30 16:33:29 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.3 2005/01/09 12:38:37 luckyduck Exp $
+
+ 09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ +files/codeine-1.0_beta1-xine-lib-1.0.patch, codeine-1.0_beta1.ebuild:
+ added a configure patch to let codeine compile again xine-1.0. fixes bug
+ #76252.
30 Nov 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
Fixed herd in metadata.xml.
diff --git a/media-video/codeine/codeine-1.0_beta1.ebuild b/media-video/codeine/codeine-1.0_beta1.ebuild
index c323d5172f9c..89447e1dc8b5 100644
--- a/media-video/codeine/codeine-1.0_beta1.ebuild
+++ b/media-video/codeine/codeine-1.0_beta1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_beta1.ebuild,v 1.1 2004/10/24 05:40:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_beta1.ebuild,v 1.2 2005/01/09 12:38:37 luckyduck Exp $
-inherit kde
+inherit eutils kde
MY_P=${P/_/-}
S=${WORKDIR}/${MY_P}
@@ -13,18 +13,25 @@ SRC_URI="http://www.methylblue.com/codeine/${MY_P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
IUSE="debug"
DEPEND="media-libs/xine-lib"
need-kde 3.1
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ epatch ${FILESDIR}/${P}-xine-lib-1.0.patch
+}
+
src_compile(){
local myconf=""
use debug && myconf="${myconf} --debug"
- ./configure $myconf
+ ./configure $myconf || die "bla"
emake
}
src_install() {
diff --git a/media-video/codeine/files/codeine-1.0_beta1-xine-lib-1.0.patch b/media-video/codeine/files/codeine-1.0_beta1-xine-lib-1.0.patch
new file mode 100644
index 000000000000..43665b339c20
--- /dev/null
+++ b/media-video/codeine/files/codeine-1.0_beta1-xine-lib-1.0.patch
@@ -0,0 +1,17 @@
+--- configure.orig 2004-10-20 15:58:49.000000000 +0200
++++ configure 2005-01-09 13:35:36.772649408 +0100
+@@ -194,10 +194,12 @@
+
+ const QString version = XINE_VERSION;
+
+- if( version.startsWith( "1-rc" ) )
++ if( version.startsWith( "1-rc" ) ) {
+ if( QString(version[4]).toInt() > 3 )
+ return true;
+-
++ } else if ( version.startsWith( "1.0" ) ) {
++ return true;
++ }
+ return false;
+ }
+ };