exscalibar amd64 fix

(Portage version: 2.1_pre4-r1)

3 files changed, 66 insertions, 4 deletions

diff --git a/media-libs/exscalibar/ChangeLog b/media-libs/exscalibar/ChangeLog
index 2365618affac..ec8470e523a9 100644
--- a/media-libs/exscalibar/ChangeLog
+++ b/media-libs/exscalibar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/exscalibar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/ChangeLog,v 1.2 2006/02/14 01:04:38 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/ChangeLog,v 1.3 2006/02/20 00:15:18 hanno Exp $
+
+  20 Feb 2006; Hanno Boeck <hanno@gentoo.org>
+  +files/exscalibar-1.0.4-gcc4-amd64.diff, exscalibar-1.0.4.ebuild:
+  Patch to compile/run on amd64, thanks to flameeyes, bug #80142.
 
   14 Feb 2006; Stefan Briesenick <sbriesen@gentoo.org>
   files/exscalibar-configure-disable-features.diff, exscalibar-1.0.4.ebuild:
diff --git a/media-libs/exscalibar/exscalibar-1.0.4.ebuild b/media-libs/exscalibar/exscalibar-1.0.4.ebuild
index 3783e589c2ee..cceb1012135c 100644
--- a/media-libs/exscalibar/exscalibar-1.0.4.ebuild
+++ b/media-libs/exscalibar/exscalibar-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/exscalibar-1.0.4.ebuild,v 1.3 2006/02/14 01:04:38 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exscalibar/exscalibar-1.0.4.ebuild,v 1.4 2006/02/20 00:15:18 hanno Exp $
 
 inherit eutils qt3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="sndfile mp3 vorbis fftw jack alsa doc"
 DEPEND="$(qt_min_version 3.2)
 	sndfile? ( >=media-libs/libsndfile-1.0.0 )
@@ -24,7 +24,8 @@ DEPEND="$(qt_min_version 3.2)
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/exscalibar-configure-disable-features.diff"
+	epatch ${FILESDIR}/exscalibar-configure-disable-features.diff
+	epatch ${FILESDIR}/exscalibar-1.0.4-gcc4-amd64.diff
 }
 
 src_compile () {
diff --git a/media-libs/exscalibar/files/exscalibar-1.0.4-gcc4-amd64.diff b/media-libs/exscalibar/files/exscalibar-1.0.4-gcc4-amd64.diff
new file mode 100644
index 000000000000..85ec05dfa50b
--- /dev/null
+++ b/media-libs/exscalibar/files/exscalibar-1.0.4-gcc4-amd64.diff
@@ -0,0 +1,57 @@
+Index: exscalibar-1.0.4/src/exinfo/exinfo.pro
+===================================================================
+--- exscalibar-1.0.4.orig/src/exinfo/exinfo.pro
++++ exscalibar-1.0.4/src/exinfo/exinfo.pro
+@@ -8,8 +8,7 @@ include( ../../global.pro )
+ INSTALLS += target
+ target.path = $$PREFIX/bin
+ TARGETDEPS += ../../src/geddei/libgeddei.so ../../src/qtextra/libqtextra.so
+-LIBS +=	-lqtextra \
+-	-lgeddei
++LIBS += -lgeddei -lqtextra
+ QMAKE_LIBDIR = ../../src/qtextra \
+                ../../src/geddei
+ INCLUDEPATH += ../../src/geddei \
+Index: exscalibar-1.0.4/src/geddei/processorforwarder.cpp
+===================================================================
+--- exscalibar-1.0.4.orig/src/geddei/processorforwarder.cpp
++++ exscalibar-1.0.4/src/geddei/processorforwarder.cpp
+@@ -118,7 +118,7 @@ void ProcessorForwarder::newConnection(i
+ 			SubProcessor *sub = SubProcessorFactory::create(type);
+ 			if(MESSAGES) qDebug("Created SubProcessor at %p", sub);
+ 			// Return the subProc's pointer for decoupling later...
+-			header << ((uint)sub) << endl;
++			header << ((ptrdiff_t)sub) << endl;
+ 			new RSCoupling(link, sub);
+ 			// return here to make sure that link isn't deleted.
+ 			return;
+Index: exscalibar-1.0.4/src/tests/testall/testall.pro
+===================================================================
+--- exscalibar-1.0.4.orig/src/tests/testall/testall.pro
++++ exscalibar-1.0.4/src/tests/testall/testall.pro
+@@ -9,8 +9,8 @@ TARGETDEPS += ../../../src/processors/to
+               ../../../src/qtextra/libqtextra.so \
+               ../../../src/geddei/libgeddei.so
+ LIBS += -ltoolkit \
+-        -lqtextra \
+-        -lgeddei
++        -lgeddei \
++	-lqtextra
+ INCLUDEPATH = ../../../src/processors/toolkit \
+               ../../../src/geddei \
+               ../../../src/qtextra 
+Index: exscalibar-1.0.4/src/tests/testdemux/testdemux.pro
+===================================================================
+--- exscalibar-1.0.4.orig/src/tests/testdemux/testdemux.pro
++++ exscalibar-1.0.4/src/tests/testdemux/testdemux.pro
+@@ -10,8 +10,8 @@ TARGETDEPS += ../../../src/processors/to
+               ../../../src/qtextra/libqtextra.so \
+               ../../../src/geddei/libgeddei.so
+ LIBS += -ltoolkit \
+-        -lqtextra \
+-        -lgeddei
++        -lgeddei \
++	-lqtextra
+ INCLUDEPATH = ../../../src/processors/toolkit \
+               ../../../src/geddei \
+               ../../../src/qtextra