ppc fixes

(Portage version: 2.0.51.16)

4 files changed, 55 insertions, 5 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index e0b965bea853..becd9a5ae217 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.45 2005/02/18 22:49:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.46 2005/02/19 15:10:05 lu_zero Exp $
+
+  19 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/flac-1.1.2-gas.patch, +files/flac-1.1.2-makefile.patch,
+  flac-1.1.2.ebuild:
+  ppc related fixes
 
 *flac-1.1.2 (18 Feb 2005)
 
diff --git a/media-libs/flac/files/flac-1.1.2-gas.patch b/media-libs/flac/files/flac-1.1.2-gas.patch
new file mode 100644
index 000000000000..8e5d2ebf6492
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.2-gas.patch
@@ -0,0 +1,26 @@
+--- configure.in	2005-02-03 06:03:25.000000000 +0100
++++ /tmp/configure.in	2005-02-19 14:11:56.714378040 +0100
+@@ -184,14 +184,17 @@
+ fi
+ 
+ # only matters for PowerPC
+-AC_CHECK_PROGS(AS, as)
+-AC_CHECK_PROGS(GAS, gas)
+-AM_CONDITIONAL(FLaC__HAS_AS, test -n "$AS")
+-AM_CONDITIONAL(FLaC__HAS_GAS, test -n "$GAS")
+-if test -n "$AS" ; then
++AC_CHECK_PROGS(AS, as, as)
++AC_CHECK_PROGS(AS, gas, gas)
++
++test "$AS" = "as" && as --version | grep GNU >/dev/null && AS=gas
++
++AM_CONDITIONAL(FLaC__HAS_AS, test "$AS" = "as" )
++AM_CONDITIONAL(FLaC__HAS_GAS, test "$AS" = "gas" )
++if test "$AS" = "as" ; then
+ AC_DEFINE(FLAC__HAS_AS)
+ fi
+-if test -n "$GAS" ; then
++if test "$AS" = "gas" ; then
+ # funniest. macro. ever.
+ AC_DEFINE(FLAC__HAS_GAS)
+ fi
diff --git a/media-libs/flac/files/flac-1.1.2-makefile.patch b/media-libs/flac/files/flac-1.1.2-makefile.patch
new file mode 100644
index 000000000000..d5476ba97b4d
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.2-makefile.patch
@@ -0,0 +1,17 @@
+--- src.orig/libFLAC/Makefile.am	2005-02-03 05:58:13.000000000 +0100
++++ src/libFLAC/Makefile.am	2005-02-19 14:35:39.397097392 +0100
+@@ -59,12 +59,13 @@
+ ARCH_SUBDIRS = ppc
+ if FLaC__HAS_AS__TEMPORARILY_DISABLED
+ libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
++LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+ else
+ if FLaC__HAS_GAS__TEMPORARILY_DISABLED
+ libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
++LOCAL_EXTRA_LDFLAGS = ""
+ endif
+ endif
+-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+ endif
+ endif
+ 
diff --git a/media-libs/flac/flac-1.1.2.ebuild b/media-libs/flac/flac-1.1.2.ebuild
index bf812b963848..4daa050432c3 100644
--- a/media-libs/flac/flac-1.1.2.ebuild
+++ b/media-libs/flac/flac-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.1 2005/02/18 22:49:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.2 2005/02/19 15:10:05 lu_zero Exp $
 
 inherit libtool eutils flag-o-matic gcc
 
@@ -10,7 +10,8 @@ SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc-macos ~sparc ~x86 ~ppc
+~ppc64"
 IUSE="sse xmms"
 
 RDEPEND=">=media-libs/libogg-1.0_rc2
@@ -29,8 +30,9 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-m4.patch
 	epatch ${FILESDIR}/${P}-libtool.patch
-	#epatch ${FILESDIR}/${P}-altivec.patch.gz (non-Darwin PPC AltiVec patch needs to be ported)
-
+	epatch ${FILESDIR}/${P}-gas.patch
+	epatch ${FILESDIR}/${P}-makefile.patch
+	./autogen.sh || die "autogen failed"
 	elibtoolize --reverse-deps
 }