Add patch to fix building the inline function from OKUMURA N. Shn-ya. Bug #111323.

(Portage version: 2.1_pre7-r5)

5 files changed, 35 insertions, 19 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index ad1c3597da79..c4b2a700ed57 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.50 2006/03/28 07:02:17 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.51 2006/04/17 14:59:09 flameeyes Exp $
+
+  17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libdv-0.104-inline.patch, libdv-0.104-r1.ebuild:
+  Add patch to fix building the inline function from OKUMURA N. Shn-ya. Bug
+  #111323.
 
   28 Mar 2006; Daniel Goller <morfic@gentoo.org> libdv-0.104-r1.ebuild:
   Added ~ppc keyword
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 8ec7f643d533..0d10a7f2c19a 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d1aa6a804000a2f5e4c783f737f17f3b ChangeLog 6990
 RMD160 2e465fb63767c28bcef36b72fabdc79f95f09012 ChangeLog 6990
 SHA256 f5792e77a70d2dc3e1b19a90a78acb1f98649e937ce3fb73b802b3879f37c23e ChangeLog 6990
@@ -13,9 +10,9 @@ SHA256 41916f10e5b8333e4e920ea648444634a9f3ea384144913f6a5b2a71ebf21516 files/di
 MD5 2524a27d2f6e849452d1d5d1f97580ec files/digest-libdv-0.104 63
 RMD160 ca2d05aee8df66121ecba5ad1f88c98483c22b41 files/digest-libdv-0.104 63
 SHA256 59e557dbd0afeeb8ddb795f54ee496b72ae902a1e109e6462d681b13ea7e82d7 files/digest-libdv-0.104 63
-MD5 eb5a28a360cc8abef3b68c49d666758e files/digest-libdv-0.104-r1 135
-RMD160 30ff6b15da731894a71db1579c3f1aaee251f33f files/digest-libdv-0.104-r1 135
-SHA256 c16796e3ac7d6d27aa03b90f90952d3e3e2234ef7132ecc8c0a4711d5f1ad651 files/digest-libdv-0.104-r1 135
+MD5 fa5df55d82685057029fd795159017ad files/digest-libdv-0.104-r1 497
+RMD160 ae201f32dc2503434fd4bb8f7d7b400d2fdc9409 files/digest-libdv-0.104-r1 497
+SHA256 8db2da8c4437b67b846dcd3a50862b32ac306065be7970e0c2a8404d78b9d51f files/digest-libdv-0.104-r1 497
 MD5 3d3bbf2ecd039329fe6b73dc9ada38bf files/digest-libdv-0.99-r1 62
 RMD160 5ff13b02a01518faf9c931d11f3a74619794ee72 files/digest-libdv-0.99-r1 62
 SHA256 8fcd2519bb397f8d1bbd1fb22c9b8c1fbf39c2941c1f576a91ae3f7eb9401e3b files/digest-libdv-0.99-r1 62
@@ -28,6 +25,9 @@ SHA256 02d44df887e461b23e2bffae2d5f024a3cc9af8fd01abc7fc42ff7be2c8b2ba0 files/li
 MD5 9c164b3ac9ace66bb2fcefc9ca939d28 files/libdv-0.104-gcc4.patch 1445
 RMD160 bd150c6b3ae4082fef0bd4347240af9764b47cfc files/libdv-0.104-gcc4.patch 1445
 SHA256 32c301e574c598328c2b72e54cec93431820b823b56aba55969350d46d936977 files/libdv-0.104-gcc4.patch 1445
+MD5 d37b5565316dd34a5eba98749a734d3c files/libdv-0.104-inline.patch 507
+RMD160 dd0ea1fc8707d7728e10e0514235029d6ad5abc2 files/libdv-0.104-inline.patch 507
+SHA256 48f3c9db161bec3df679d80949fa0df03f45c573d3884a5928027c316ad2ba0e files/libdv-0.104-inline.patch 507
 MD5 aa87e4d4bdd76b94e1f9536680c9fdda files/libdv-0.104-no-exec-stack.patch 2678
 RMD160 740c2a50357985bc660e6fde1ecabfc707bea20e files/libdv-0.104-no-exec-stack.patch 2678
 SHA256 e635e83fd242f2bc17f15c8141527fedbcbb3043d92a98ba92164480b02fd3d4 files/libdv-0.104-no-exec-stack.patch 2678
@@ -43,9 +43,9 @@ SHA256 02e7d004fc639b4db55582b3a395db3ddbe694f2ad087529fd00284dbeace638 libdv-0.
 MD5 c26a71dccb152be11ab822dc61fc4ae8 libdv-0.102.ebuild 1242
 RMD160 14f8761d90e57e3904c3e03d95e1d2b39a51dc5f libdv-0.102.ebuild 1242
 SHA256 4e5a6e28146796ea00e51d80c7bef0171bf5435ea9daf9a4c573e75871b5c853 libdv-0.102.ebuild 1242
-MD5 802949d93ff5f483dbbfee0702f510d9 libdv-0.104-r1.ebuild 1553
-RMD160 fcdee40279b6ebd0a115eee05d42782a1c1d02b0 libdv-0.104-r1.ebuild 1553
-SHA256 6e6565cd038667f2cfbcce0ae726ceba327c50983d91f70cb81cf3679da6e6c9 libdv-0.104-r1.ebuild 1553
+MD5 a7bd4c391f58815efc7a83ee7ba99c66 libdv-0.104-r1.ebuild 1615
+RMD160 92d0497d31329ed78524b4ff866cea5230a30859 libdv-0.104-r1.ebuild 1615
+SHA256 a4938c80942fd5a8181b8083606aa64262f54106220295cbc8cf696521855cb9 libdv-0.104-r1.ebuild 1615
 MD5 9af0184f9281e6dbf633dec4dd9173ec libdv-0.104.ebuild 1315
 RMD160 2724f17fc8fb46ad9db1455e80f34e007aaca971 libdv-0.104.ebuild 1315
 SHA256 4e9570cbef32f705b7d4f2ae222a55bae9d21870733fb37d6334d1f02b3eb801 libdv-0.104.ebuild 1315
@@ -55,10 +55,3 @@ SHA256 f84918b65f6e0dc4b6baf146cc46d3d33a271874a3876f947fd5079ffc758751 libdv-0.
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEKN9+/aM9DdBw91cRAvqSAJ9Lgdp+RgZpOXU8rwALmPsG4yE/4gCgwGmK
-9yUKBj2mK1pnjfccyfUGl1o=
-=MjAc
------END PGP SIGNATURE-----
diff --git a/media-libs/libdv/files/digest-libdv-0.104-r1 b/media-libs/libdv/files/digest-libdv-0.104-r1
index 9bd2f31b5c6c..2aaa835604ca 100644
--- a/media-libs/libdv/files/digest-libdv-0.104-r1
+++ b/media-libs/libdv/files/digest-libdv-0.104-r1
@@ -1,2 +1,6 @@
 MD5 cb8f342ef1362051f1289b86bb2ba051 libdv-0.104-pic-fix.patch.bz2 9343
+RMD160 b72775a37841f2820f89bec029ec18e9c09453d9 libdv-0.104-pic-fix.patch.bz2 9343
+SHA256 1142c69169d0915b36efe97173744cb751e9ef1d2df319f9cb7924c228c672dd libdv-0.104-pic-fix.patch.bz2 9343
 MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
+RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
+SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/libdv-0.104-inline.patch b/media-libs/libdv/files/libdv-0.104-inline.patch
new file mode 100644
index 000000000000..8f6fbeeefdd6
--- /dev/null
+++ b/media-libs/libdv/files/libdv-0.104-inline.patch
@@ -0,0 +1,11 @@
+--- libdv/vlc.h~	2005-11-03 16:30:28.000000000 +0900
++++ libdv/vlc.h	2005-11-03 16:29:38.000000000 +0900
+@@ -69,7 +69,7 @@
+ extern void dv_decode_vlc(int bits,int maxbits, dv_vlc_t *result);
+ extern void __dv_decode_vlc(int bits, dv_vlc_t *result);
+ 
+-extern __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
++static __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
+   if(maxbits < 16)
+     dv_decode_vlc(bitstream_show(bs,16),maxbits,result);
+   else
diff --git a/media-libs/libdv/libdv-0.104-r1.ebuild b/media-libs/libdv/libdv-0.104-r1.ebuild
index 7d411e926ac0..536fabaa77fe 100644
--- a/media-libs/libdv/libdv-0.104-r1.ebuild
+++ b/media-libs/libdv/libdv-0.104-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.8 2006/03/28 07:02:17 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r1.ebuild,v 1.9 2006/04/17 14:59:09 flameeyes Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic libtool
 
 DESCRIPTION="Software codec for dv-format video (camcorders etc)"
 HOMEPAGE="http://libdv.sourceforge.net/"
@@ -35,6 +35,9 @@ src_unpack() {
 	# fix from fedora
 	epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
 
+	epatch "${FILESDIR}/${P}-inline.patch"
+
+	elibtoolize
 	epunt_cxx #74497
 }