Adding compile time fixes from -r1

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 39c2652718941a37dad2b6a4359b16b2b8d80154..1564443d1840c0f198790737f7fa5172ba55646c 100644 (file)
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.82 2004/11/12 10:57:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.83 2004/11/16 08:51:01 phosphan Exp $
+
+  16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  avifile-0.7.41.20041001.ebuild:
+  Adding compile bug fixes from -r1
 
 *avifile-0.7.41.20041001-r1 (12 Nov 2004)
 

diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 4a79fb5ad1fdf506d637a3394b284490f212d86c..b1f895e39cb6817c5283344d4c91bc34e4e24558 100644 (file)
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 925a9acf94fe61343cb655dfafe994c8 ChangeLog 14472
-MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062
-MD5 f003a1fc700f9a79cf12c06d2ac3bedd avifile-0.7.37.20030522-r2.ebuild 4432
-MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008
 MD5 6d85afc659f23bb2adcebd144400833d avifile-0.7.38.20030710.ebuild 4488
-MD5 75f6f10626604e37b67c15f5fa92b6af avifile-0.7.41.20041001.ebuild 3951
-MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
+MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008
+MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062
+MD5 1baa65ea96f3b2ab8559450b2fbde876 avifile-0.7.41.20041001.ebuild 4284
 MD5 d38cb0de9fcf83328770f19f45aa8cd3 avifile-0.7.41.20041001-r1.ebuild 4325
+MD5 e4659abac09fc6d39eea9a3130442dff ChangeLog 14596
+MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
+MD5 f003a1fc700f9a79cf12c06d2ac3bedd avifile-0.7.37.20030522-r2.ebuild 4432
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
-MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
-MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
 MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
-MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
-MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
-MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
-MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
-MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
+MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
+MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
+MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
 MD5 d0f665d4394d9d9a59c9a5dadeb09882 files/avifile-0.7.41.20041001-sparc.patch 1262
+MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001 71
-MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
 MD5 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
+MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBmC5VHTu7gpaalycRAhY8AJ9ZwMRMdIU5WieoowbqyOXIsn0PpgCfWTM3
-fuE9QibFa9B/LQnaE5fWKPA=
-=yNJb
------END PGP SIGNATURE-----

diff --git a/media-video/avifile/avifile-0.7.41.20041001.ebuild b/media-video/avifile/avifile-0.7.41.20041001.ebuild
index ab3eee3f209ba0dc21563293438abc61a3eeb48c..fceff815f87fa27266133c70cce95bf623371e64 100644 (file)
--- a/media-video/avifile/avifile-0.7.41.20041001.ebuild
+++ b/media-video/avifile/avifile-0.7.41.20041001.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001.ebuild,v 1.9 2004/10/23 14:35:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001.ebuild,v 1.10 2004/11/16 08:51:01 phosphan Exp $
 
 inherit eutils flag-o-matic
 
@@ -48,9 +48,22 @@ src_unpack() {
        # make sure pkgconfig file is correct #53183
        cd ${S}
        epatch ${FILESDIR}/throw.patch
+       epatch ${FILESDIR}/${PN}-${PV}-gcc2.patch
        use sparc && epatch ${FILESDIR}/${P}-sparc.patch
        rm -f avifile.pc
-       sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in
+       sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in \
+               || die "sed failed (avifile.pc.in)"
+       sed -e "s:| sed s/-g//::" -i configure || die "sed failed (-g)"
+       # Fix qt detection
+       sed -i \
+               -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
+               configure || die "sed failed (qt detection)"
+       # Fix hardcoded Xrender linking, bug #68899
+       if ! use X; then
+               sed -e 's/-lXrender//g' -i lib/video/Makefile.* \
+               || die "sed failed (Xrender)"
+       fi
+
 }
 
 src_compile() {
@@ -100,11 +113,6 @@ src_compile() {
        export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
        export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
 
-       # Fix qt detection
-       sed -i \
-               -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
-               configure
-
        filter-flags "-momit-leaf-frame-pointer"
 
        econf \