Fixed and marked stable for hppa.

Package-Manager: portage-2.0.51.19

4 files changed, 36 insertions, 32 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 4a67ef8d3f12..88a334b9c2d5 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.103 2005/05/17 22:29:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.104 2005/06/19 15:59:58 gmsoft Exp $
+
+  18 Jun 2005; Guy Martin <gmsoft@gentoo.org> files/avifile-mad.patch,
+  avifile-0.7.43.20050224-r1.ebuild:
+  Fixed and marked stable for hppa.
 
   17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   avifile-0.7.43.20050224-r1.ebuild:
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 6ac1d6426bfd..1582acfd27dd 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 79e52c091a2e1e8f0c5ce72e5942b0a9 ChangeLog 19689
-MD5 91ba4be5c1f3e52edd8db3b311a37718 avifile-0.7.43.20050224-r1.ebuild 4849
+MD5 9ab35b4951adc50e37dd047ff5db3683 ChangeLog 19832
+MD5 8189fed5f2b9cff0684bcbb12eb3b290 avifile-0.7.43.20050224-r1.ebuild 4853
 MD5 ead70f1fd6fc60afbc07ad1ea49576a7 avifile-0.7.38.20030710-r1.ebuild 4005
 MD5 87aed7721dcd888c80b219218c704004 avifile-0.7.41.20041001-r1.ebuild 4620
-MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
 MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601
+MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
 MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
 MD5 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
-MD5 7eacd7dae7ab4a551b208173ec54215e files/avifile-mad.patch 1582
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
 MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
 MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
-MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
 MD5 6cab3d2acc1d30f101f100f9549613d8 files/avifile-0.7.43.20050224-sdllibs.patch 569
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
 MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
+MD5 1c397a5be4ce93dd90fde2b9ab3aa937 files/avifile-mad.patch 1846
 MD5 6eb792de0d30abfb680655dcdec8b15c files/avifile-0.7.43.20050224-sysffmpeg.patch 14435
 MD5 7404620a2904bb27683df4a0ed2f412d files/avifile-0.7.43.20050224-fixlabels.patch 559
 MD5 d004578ed49e07cac372c21c044775fe files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch 5878
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCinBRKRy60XGEcJIRAiqnAJ9tJsRoWofm/L3D1xCF3bNVKJhWhQCggWOe
-REbSA57/ARCCpN5Ie+yDn3o=
-=/qUh
------END PGP SIGNATURE-----
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
index 7067b5d804b0..0d63acfe505f 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r1.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-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.6 2005/05/17 22:29:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.7 2005/06/19 15:59:58 gmsoft Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0.7"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips sparc ~x86 hppa"
 IUSE="3dnow X alsa debug divx4linux dmalloc dpms a52 encode esd mad matrox
 mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
 zlib"
@@ -57,8 +57,6 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# fixes mad FPM detection
-	epatch ${FILESDIR}/${PN}-mad.patch
 
 	epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
 	# removes sed-out of -L/usr/lib(64?) on sdl libs flags
@@ -94,6 +92,9 @@ src_unpack() {
 	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
 	autoconf || die "autoconf failed"
 
+	# fixes mad FPM detection
+	epatch ${FILESDIR}/${PN}-mad.patch
+
 	# make sure pkgconfig file is correct #53183
 	rm -f avifile.pc
 }
diff --git a/media-video/avifile/files/avifile-mad.patch b/media-video/avifile/files/avifile-mad.patch
index 2376e15e674f..25e80a6a05d4 100644
--- a/media-video/avifile/files/avifile-mad.patch
+++ b/media-video/avifile/files/avifile-mad.patch
@@ -1,6 +1,7 @@
---- avifile-0.7-0.7.43-old/configure	2005-02-24 23:25:46.000000000 +0900
-+++ avifile-0.7-0.7.43/configure	2005-03-22 15:18:44.000000000 +0900
-@@ -3769,7 +3769,7 @@
+diff -uNr avifile-0.7-0.7.43.orig/configure avifile-0.7-0.7.43/configure
+--- avifile-0.7-0.7.43.orig/configure	2005-06-18 09:23:56.000000000 +0200
++++ avifile-0.7-0.7.43/configure	2005-06-18 09:26:34.000000000 +0200
+@@ -19998,7 +19998,7 @@
  case "$target" in
    i?86*)
      test x$ac_cv_c_compiler_gnu = xyes && DEFAULT_FLAGS="-mcpu=$DEFAULT_FLAGS -march=$DEFAULT_FLAGS -ffast-math -fomit-frame-pointer"
@@ -9,7 +10,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_X86 1
  _ACEOF
-@@ -3781,21 +3781,21 @@
+@@ -20010,29 +20010,37 @@
  
      ;;
    ia64*)
@@ -34,16 +35,24 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_ALPHA 1
  _ACEOF
-@@ -3803,7 +3803,7 @@
+ 
      enable_alphaopt=yes
      ;;
-   arm*)
--
+-  arm*)
++  hppa*)
++MAD_FLAGS="-DFPM_DEFAULT"
++cat >>confdefs.h <<\_ACEOF
++#define ARCH_HPPA 1
++_ACEOF
+ 
++    enable_hppaopt=yes
++    ;;
++  arm*)
 +MAD_FLAGS="-DFPM_ARM"
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_ARM 1
  _ACEOF
-@@ -3811,14 +3811,14 @@
+@@ -20040,14 +20048,14 @@
      enable_armopt=yes
      ;;
    sparc*)
@@ -60,7 +69,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_MIPS 1
  _ACEOF
-@@ -3826,7 +3826,7 @@
+@@ -20055,7 +20063,7 @@
      enable_mipsopt=yes
      ;;
    ppc*|powerpc*)
@@ -69,12 +78,12 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_POWERPC 1
  _ACEOF
-@@ -3836,7 +3836,7 @@
+@@ -20065,7 +20073,7 @@
  esac
  
  
 -DEFAULT_DEFINES="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $PTHREAD_CFLAGS"
 +DEFAULT_DEFINES="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $PTHREAD_CFLAGS $MAD_FLAGS"
  
- 
      echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
+ echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6