Install mp4ff_int_types.h since we are building unsupported libmp4ff library anyway wrt #275008.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 30 insertions, 16 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 8ee258c34499..1e9ad924b688 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/faad2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.130 2010/01/15 09:27:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.131 2010/04/29 15:13:58 ssuominen Exp $
+
+*faad2-2.7-r2 (29 Apr 2010)
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +faad2-2.7-r2.ebuild,
+  +files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch:
+  Install mp4ff_int_types.h since we are building unsupported libmp4ff
+  library anyway wrt #275008.
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org> faad2-2.7-r1.ebuild:
   Transfer Prefix keywords
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 8da0fc9ac171..a1a66801a111 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch 305 RMD160 dae87cebd8a216b481b6ba308bfc0f8f7ceeb465 SHA1 1cf28cfd32dbae6cc484b149fd6adfea33506544 SHA256 c554313121f935aaabbe5b05addfc065bdf782bc0634ee9a91ceabde001ea823
 AUX faad2-2.7-libmp4ff-shared-lib.patch 867 RMD160 d0721533c875ef4e4510c56272953b0db1dfc4c2 SHA1 247658aa795cd6d44a153fae8c5cb62e427f3ecf SHA256 e0aaefeb20ebfec2f09e88a190f78e5744d9f1c71fe41977db8e4f29b5b88022
 AUX faad2-2.7-man1_MANS.patch 405 RMD160 a640012be5357bfc152e7ba7e045e61bdf9ab51a SHA1 4b548a08f7611a5f4f395c7c1d4cef5e37368af2 SHA256 e3e745cca309443d0149a09cc9988fec09c51e242b0e564afcb0af787dbb9031
 DIST faad2-2.7.tar.gz 1137407 RMD160 3f0ca461e2953014d5b17edccb3337767d478b8d SHA1 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
-EBUILD faad2-2.7-r1.ebuild 1023 RMD160 651b00255d9676ed53edfdf4d3ffd66bd7ae779d SHA1 709f93cb734610f89bdffdedfc417db187016556 SHA256 df704288c1b932f5b94dae655675b2ca9ce838843c342018dfa5701e22cb89e1
+EBUILD faad2-2.7-r2.ebuild 1057 RMD160 9a59ffcb0bf035df46368fde583fa29aef4a0a76 SHA1 40a545cdbc31dbcd24e668e8118efefdd6ff61f8 SHA256 937028675d9f24d024329f9f76912511da42787b8c36b81e8fd5a654fa981038
 EBUILD faad2-2.7.ebuild 823 RMD160 33db1e8348dbb0ba52a7d2c61a316ac8c3f0b0df SHA1 da68d34fa1c18272452d4e544763696ec41b84fd SHA256 d23175ae3cb63894387e12f87d21be33b0cb06a72166963b058fa3a7ad10ce42
-MISC ChangeLog 17832 RMD160 ef6cd20ebcb0f8f03ccc9f3710c3acf14c11e930 SHA1 a1b38c1502f43c57a3809e64c2ba7424634023ac SHA256 4189d58a5cb51694bab388eb08c9df6e41ac36666ed59f5856119c02b767da05
+MISC ChangeLog 18104 RMD160 90c3f022e39620433985958df0d4df66a3283cd7 SHA1 0c1f7dc65490928bfeafdf4329d806842caf870c SHA256 501cd973b989e0e99ab3456ddebd9a43b638fa547c3681918cbc68c1defa9f7d
 MISC metadata.xml 509 RMD160 eccae902db760c56d55258ef0013946723a2399b SHA1 a12df0b8f27cf44403cbfb6a62547575e0d96a6c SHA256 401e3bd91028ddba4278b165e7ae400f181fb439beb09d0c96e4067778e0f52f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktQNPAACgkQNQqtfCuFneOJfgCfQaL+TJu51u4owy1sie5N6oCY
-xgMAn0GUdgvfG0b+VQ+qYJPJjqD//DXx
-=cRDl
------END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.7-r1.ebuild b/media-libs/faad2/faad2-2.7-r2.ebuild
index 751df9432a78..6d26c2e08414 100644
--- a/media-libs/faad2/faad2-2.7-r1.ebuild
+++ b/media-libs/faad2/faad2-2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7-r1.ebuild,v 1.6 2010/01/15 09:27:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7-r2.ebuild,v 1.1 2010/04/29 15:13:58 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -16,8 +16,11 @@ IUSE="digitalradio"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libmp4ff-shared-lib.patch \
+		"${FILESDIR}"/${P}-libmp4ff-install-mp4ff_int_types_h.patch \
 		"${FILESDIR}"/${P}-man1_MANS.patch
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die "sed failed"
+
+	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
+
 	eautoreconf
 }
 
@@ -28,6 +31,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
 }
diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
new file mode 100644
index 000000000000..5d39cad95d7e
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
@@ -0,0 +1,13 @@
+Install mp4ff_int_types.h for mythmusic.
+
+http://bugs.gentoo.org/275008
+
+--- common/mp4ff/Makefile.am
++++ common/mp4ff/Makefile.am
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libmp4ff.la
+-include_HEADERS = mp4ff.h mp4ffint.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
+ 
+ AM_CFLAGS = -DUSE_TAGGING=1
+