Better fix for fpic

5 files changed, 41 insertions, 23 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index a036cf9bfcfa..8ac8c900af7e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.39 2003/12/13 20:11:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.40 2004/01/07 09:35:59 aliz Exp $
+
+  07 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> vlc-0.6.2-r1.ebuild,
+  files/mpeg2dec-20030612-configure.in-fpic.patch:
+  Patch configure.in instead of configure
 
 *vlc-0.6.2-r1 (13 Dec 2003)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index ea1dea320303..7236ddef752e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,15 +1,15 @@
 MD5 d6395ceab5c2fb31fb9e536179a7f9ef vlc-0.6.0-r1.ebuild 5638
 MD5 abe46c2122fa9684f681e695f25b9225 vlc-0.6.2.ebuild 5524
-MD5 0b375cc9ef24f6297780ea59a0bda0b6 vlc-0.6.2-r1.ebuild 6514
+MD5 f7bca4358fe6364c0baabcd2a3a78e2c vlc-0.6.2-r1.ebuild 6511
 MD5 a28c65345cf74b646ed398cdff1b54a0 vlc-0.6.1.ebuild 6093
-MD5 5da2f46f3f07c9f3f5366806325ad08a ChangeLog 8124
+MD5 047a48db3f03b05449fc806a217ac91a ChangeLog 8284
 MD5 06579cc387999571bc69fadac7f077fa metadata.xml 263
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
 MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
-MD5 e88807b2271a54b1d98d958c8b34abfb files/mpeg2dec-20030612-configure-fpic.patch 558
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2 202
 MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
+MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065
 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
diff --git a/media-video/vlc/files/mpeg2dec-20030612-configure-fpic.patch b/media-video/vlc/files/mpeg2dec-20030612-configure-fpic.patch
deleted file mode 100644
index 136d11c19b3a..000000000000
--- a/media-video/vlc/files/mpeg2dec-20030612-configure-fpic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure	2004-01-06 20:09:39.126501031 +0000
-+++ configure	2004-01-06 20:09:30.122975487 +0000
-@@ -10571,7 +10571,9 @@
- 	ac_cv_libtool_non_pic=yes
-     cd ..; rm -fr ac_test_libtool; echo "$as_me:$LINENO: result: $ac_cv_libtool_non_pic" >&5
- echo "${ECHO_T}$ac_cv_libtool_non_pic" >&6
--    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
-+    if test "$host_cpu" = "x86_64"; then
-+	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-pic"
-+    elif test x"$ac_cv_libtool_non_pic" = x"yes"; then
- 	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"
-     else
- 	:
diff --git a/media-video/vlc/files/mpeg2dec-20030612-configure.in-fpic.patch b/media-video/vlc/files/mpeg2dec-20030612-configure.in-fpic.patch
new file mode 100644
index 000000000000..f488c666296d
--- /dev/null
+++ b/media-video/vlc/files/mpeg2dec-20030612-configure.in-fpic.patch
@@ -0,0 +1,28 @@
+--- aclocal.m4	2003-07-26 15:37:34.000000000 +0000
++++ aclocal.m4	2004-01-07 09:04:13.505605717 +0000
+@@ -121,10 +121,12 @@
+ 		-rpath / f.lo g.lo >/dev/null 2>&1 &&
+ 	ac_cv_libtool_non_pic=yes
+     cd ..; rm -fr ac_test_libtool; AC_MSG_RESULT([$ac_cv_libtool_non_pic])
+-    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
++    if test "$host_cpu" = "x86_64"; then
++	ifelse([$2],[],[:],[$2])
++    elif test x"$ac_cv_libtool_non_pic" = x"yes"; then
+ 	ifelse([$1],[],[:],[$1])
+     else
+-	ifelse([$2],[],[:],[$2])
++	ifelse([$3],[],[:],[$3])
+     fi])
+ 
+ dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
+--- libmpeg2/configure.incl	2003-01-19 01:24:03.000000000 +0000
++++ libmpeg2/configure.incl	2004-01-07 09:02:13.733060531 +0000
+@@ -2,7 +2,7 @@
+ AC_SUBST([LIBMPEG2_LIBS])
+ 
+ dnl avoid -fPIC when possible
+-AC_LIBTOOL_NON_PIC([LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"])
++AC_LIBTOOL_NON_PIC([LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"], [LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-pic"])
+ 
+ dnl check for cpudetect
+ AC_ARG_ENABLE([accel-detect],
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
index 9c47f9512399..7bee0db52d63 100644
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.4 2004/01/06 20:31:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.5 2004/01/07 09:35:59 aliz Exp $
 
 inherit libtool
 
@@ -119,8 +119,7 @@ src_unpack() {
 
 	# Patch libmpeg2
 	cd ${SMPG}
-	sed -i 's:OPT_CFLAGS=.*:OPT_CFLAGS=\"$CFLAGS\":g' configure
-	epatch ${FILESDIR}/${PMPG}-configure-fpic.patch
+	epatch ${FILESDIR}/${PMPG}-configure.in-fpic.patch
 
 	cd ${S}
 	touch configure.ac
@@ -134,13 +133,13 @@ src_compile() {
 	# first build the deps
 	# LibMPEG2:
 	cd ${SMPG}
-
+	autoconf
 	econf \
 		--disable-sdl \
 		--without-x \
 		`use_enable mmx` || die "libmpeg2 failed to configure"
 
-	emake || make || die
+	emake OPT_CFLAGS="${CFLAGS}" || make OPT_CFLAGS="${CFLAGS}" || die
 
 	# ffMPEG
 	cd ${SFFM}