Add inttypes patch for Solaris, added Prefix keywords, bug #413591

(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)

3 files changed, 50 insertions, 4 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index ef8265e828a1..7fad60ff32d5 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/faac
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.86 2012/03/21 09:03:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.87 2012/04/29 10:44:59 grobian Exp $
+
+  29 Apr 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/faac-1.28-inttypes.patch, faac-1.28-r3.ebuild:
+  Add inttypes patch for Solaris, added Prefix keywords, bug #413591
 
   21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> faac-1.28-r1.ebuild:
   Change libmp4v2 depend to more strict variant because this is not compatible
diff --git a/media-libs/faac/faac-1.28-r3.ebuild b/media-libs/faac/faac-1.28-r3.ebuild
index 4de3774111c6..e37c2d36cb12 100644
--- a/media-libs/faac/faac-1.28-r3.ebuild
+++ b/media-libs/faac/faac-1.28-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r3.ebuild,v 1.1 2012/02/23 13:42:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r3.ebuild,v 1.2 2012/04/29 10:44:59 grobian Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libmp4v2"
@@ -21,7 +21,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-external-libmp4v2.patch \
 		"${FILESDIR}"/${P}-altivec.patch \
-		"${FILESDIR}"/${P}-libmp4v2_r479_compat.patch
+		"${FILESDIR}"/${P}-libmp4v2_r479_compat.patch \
+		"${FILESDIR}"/${P}-inttypes.patch
 
 	eautoreconf
 	epunt_cxx
diff --git a/media-libs/faac/files/faac-1.28-inttypes.patch b/media-libs/faac/files/faac-1.28-inttypes.patch
new file mode 100644
index 000000000000..09304fb60172
--- /dev/null
+++ b/media-libs/faac/files/faac-1.28-inttypes.patch
@@ -0,0 +1,41 @@
+use standard integer types, not linux ones
+
+--- frontend/main.c
++++ frontend/main.c
+@@ -440,13 +440,13 @@
+     MP4TrackId MP4track = 0;
+     unsigned int ntracks = 0, trackno = 0;
+     unsigned int ndiscs = 0, discno = 0;
+-    u_int8_t compilation = 0;
++    uint8_t compilation = 0;
+     const char *artist = NULL, *title = NULL, *album = NULL, *year = NULL,
+       *genre = NULL, *comment = NULL, *writer = NULL;
+-    u_int8_t *art = NULL;
+-    u_int64_t artSize = 0;
+-    u_int64_t total_samples = 0;
+-    u_int64_t encoded_samples = 0;
++    uint8_t *art = NULL;
++    uint64_t artSize = 0;
++    uint64_t total_samples = 0;
++    uint64_t encoded_samples = 0;
+     unsigned int delay_samples;
+     unsigned int frameSize;
+ #endif
+@@ -647,7 +647,7 @@
+         FILE *artFile = fopen(optarg, "rb");
+ 
+         if(artFile) {
+-            u_int64_t r;
++            uint64_t r;
+ 
+             fseek(artFile, 0, SEEK_END);
+         artSize = ftell(artFile);
+@@ -1112,7 +1112,7 @@
+             if (bytesWritten > 0)
+             {
+ #ifdef HAVE_LIBMP4V2
+-                u_int64_t samples_left = total_samples - encoded_samples + delay_samples;
++                uint64_t samples_left = total_samples - encoded_samples + delay_samples;
+                 MP4Duration dur = samples_left > frameSize ? frameSize : samples_left;
+                 MP4Duration ofs = encoded_samples > 0 ? 0 : delay_samples;
+