Fix to build and work with libmpeg3 1.7

Package-Manager: portage-2.1.2.2

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index f5c98fef8a9c125c7ff8e502689278eb2f2a2af6..9ee8a6630e969d8e2c693a4788cd57ec967489fe 100644 (file)
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.168 2007/03/24 14:55:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.169 2007/03/25 11:27:44 aballier Exp $
+
+  25 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch,
+  transcode-1.0.3_rc2_p20070310-r1.ebuild:
+  Fix to build and work with libmpeg3 1.7
 
 *transcode-1.1.0_pre20070315-r1 (24 Mar 2007)
 

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 0095a968b63a1afebb7cd20496c777a37a7070ed..9a4eb36859c2883cb2b1537909e8f44cdb3a0f36 100644 (file)
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX transcode-1.0.2-autoconf259d.patch 521 RMD160 e5387a540269bd2c10e67415b57b351c329d8521 SHA1 34a0d1b5394d6414cb9d46a672a993b107bbc1bd SHA256 b3e2d78d28cd4e90d9b1de8f249b73ab943f63d749fd8296ae780b72417ffdb5
 MD5 c9bb89a41ef717f36c8cf3f44df77aef files/transcode-1.0.2-autoconf259d.patch 521
 RMD160 e5387a540269bd2c10e67415b57b351c329d8521 files/transcode-1.0.2-autoconf259d.patch 521
@@ -22,6 +25,10 @@ AUX transcode-1.0.2-new-ffmpeg 622 RMD160 70efafc9b2b4a39c75b9aed1c0bd4369bfb033
 MD5 41d5455e08044d60ff1d07be42f0dff0 files/transcode-1.0.2-new-ffmpeg 622
 RMD160 70efafc9b2b4a39c75b9aed1c0bd4369bfb0332f files/transcode-1.0.2-new-ffmpeg 622
 SHA256 7b0b59c766e173bb4754c37b52193063a0a84f40ae18c03dc557b4f8aa4133d5 files/transcode-1.0.2-new-ffmpeg 622
+AUX transcode-1.0.3_rc2_p20070310-libmpeg3.patch 2010 RMD160 47b9f49e04a99aac5a3d70a294b2540b9a9c736a SHA1 8dd256b392e45f93a3c7301a32779da32f322938 SHA256 84993dbfb0e1cf958074531cccd6c17b1f343017b07ec354e5a8135df7fee091
+MD5 37cd008b2d361cf6a5ffa1f2cd590df6 files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch 2010
+RMD160 47b9f49e04a99aac5a3d70a294b2540b9a9c736a files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch 2010
+SHA256 84993dbfb0e1cf958074531cccd6c17b1f343017b07ec354e5a8135df7fee091 files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch 2010
 DIST transcode-1.0.2.tar.gz 2347861 RMD160 5a07777093b3d395180396a662dc765c179cd687 SHA1 831a55a0218913e43261eb614ccca34a0d1b3d0d SHA256 765936b908fb32ea2149f76246fb22c931549485959cea76ac40f10924c0c0da
 DIST transcode-1.1.0_pre20070315.tar.bz2 1595454 RMD160 71c34011e8408fd56a7bdf0de8a9c0b6a8ee2374 SHA1 87c33cd973eceb5a6fe4cc85e105607e04f5235b SHA256 ea7732bd92f92e1fbd47788f91ca22ecbd0873fc0b271021e75b1f0ccaca35ce
 DIST transcode-20070310.tar.bz2 1608431 RMD160 0bd5d44cfe0e113f14617589465edc7f8adfa9ed SHA1 3e899c6daaeb32090adf899e883dbdd7e80168de SHA256 0db56bc4e2ab1aa8b85e9e8c4fe47dc1fb00cd86650cea4d30b67fc3f2c8cbab
@@ -38,18 +45,18 @@ EBUILD transcode-1.0.2-r4.ebuild 4292 RMD160 4624186cae52363f8096be83b7e284206ae
 MD5 81f9934e983e65eaacadb579d8cc5f29 transcode-1.0.2-r4.ebuild 4292
 RMD160 4624186cae52363f8096be83b7e284206ae3e8b1 transcode-1.0.2-r4.ebuild 4292
 SHA256 b3393a19ab3cf38d2576668edb787515d6fb89a8319c1f6a8b34b0c61312ec0f transcode-1.0.2-r4.ebuild 4292
-EBUILD transcode-1.0.3_rc2_p20070310-r1.ebuild 3795 RMD160 ecd38f967467065ac525240d17580509fb59762d SHA1 9b2aafa8d4fbb8f9c6363912ed5fd6e195eb8944 SHA256 35c02cf5360055c269ed2ee374af13856833816bc8e3aad0980238cdbca42a3b
-MD5 6c17715f191fa5a1877864efe6d54aa4 transcode-1.0.3_rc2_p20070310-r1.ebuild 3795
-RMD160 ecd38f967467065ac525240d17580509fb59762d transcode-1.0.3_rc2_p20070310-r1.ebuild 3795
-SHA256 35c02cf5360055c269ed2ee374af13856833816bc8e3aad0980238cdbca42a3b transcode-1.0.3_rc2_p20070310-r1.ebuild 3795
+EBUILD transcode-1.0.3_rc2_p20070310-r1.ebuild 3838 RMD160 c3e2a16123527182a3358de5cdf391d5a48e680a SHA1 5f1a4aa26347c731eca3f2532cfe2ba27463b94d SHA256 18cbad48edb60a15e186b3c8feada97c32ca8d39ff7e0f41f9486751be890f91
+MD5 8bcd45a72e093c7899c5632e7ac3fa0a transcode-1.0.3_rc2_p20070310-r1.ebuild 3838
+RMD160 c3e2a16123527182a3358de5cdf391d5a48e680a transcode-1.0.3_rc2_p20070310-r1.ebuild 3838
+SHA256 18cbad48edb60a15e186b3c8feada97c32ca8d39ff7e0f41f9486751be890f91 transcode-1.0.3_rc2_p20070310-r1.ebuild 3838
 EBUILD transcode-1.1.0_pre20070315-r1.ebuild 3415 RMD160 f950ffcc67cf5753997c2e55d6d8ba518253faba SHA1 8311af86a1d02b83a156a99f41db553da0dd2533 SHA256 0c02bea04de6b7673cbd452ceedd67ac025ba3b42b8da6b2fdefe4fe03c7e24b
 MD5 c4ed83231c1a0d43c593823ff0c53dfd transcode-1.1.0_pre20070315-r1.ebuild 3415
 RMD160 f950ffcc67cf5753997c2e55d6d8ba518253faba transcode-1.1.0_pre20070315-r1.ebuild 3415
 SHA256 0c02bea04de6b7673cbd452ceedd67ac025ba3b42b8da6b2fdefe4fe03c7e24b transcode-1.1.0_pre20070315-r1.ebuild 3415
-MISC ChangeLog 30207 RMD160 89c46830f300ffef2028c0ee9a42e1b83db2cfa3 SHA1 1358fb0a5a5edc84ef85901694f1f61d7bf3b238 SHA256 9ba1057228b34dca0182f0e2441ea9a21935af979a1a3038dc34f0b6ad016c0a
-MD5 e5d564b8bfe4974584dadd674689533c ChangeLog 30207
-RMD160 89c46830f300ffef2028c0ee9a42e1b83db2cfa3 ChangeLog 30207
-SHA256 9ba1057228b34dca0182f0e2441ea9a21935af979a1a3038dc34f0b6ad016c0a ChangeLog 30207
+MISC ChangeLog 30401 RMD160 fbdd0a8cfb868d7af385e711d1feeea4b66a52d2 SHA1 1e8a19c0d767b185fec58029678c6a02e094123b SHA256 198aa7dc5506d6798b6cb25ba6921152eb5d22f2bb08db70299f2b605f707b3c
+MD5 a408c756c08b73fe65caf84342999e6b ChangeLog 30401
+RMD160 fbdd0a8cfb868d7af385e711d1feeea4b66a52d2 ChangeLog 30401
+SHA256 198aa7dc5506d6798b6cb25ba6921152eb5d22f2bb08db70299f2b605f707b3c ChangeLog 30401
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -69,3 +76,10 @@ SHA256 d965e2c26b3227f53ee87eb9bfa858be903724a268bddf3d880803dc8eac976a files/di
 MD5 a40ce0eaa07ca2f09368793e864d7088 files/digest-transcode-1.1.0_pre20070315-r1 289
 RMD160 a18de979d3ee42b4ac05fc083c4d2ecc054ca076 files/digest-transcode-1.1.0_pre20070315-r1 289
 SHA256 016357c6d7555c8f1a4c7d8b5b45d82d3131c84775a0531f19ce62cd69691f94 files/digest-transcode-1.1.0_pre20070315-r1 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGBly2vFcC4BYPU0oRAlJbAKCsgwQlsg7ZLwYlgMobsyR7TY9aCgCgmwxC
+LKTV0QqNbJotPZ7JqUcjXUI=
+=aKGC
+-----END PGP SIGNATURE-----

diff --git a/media-video/transcode/files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch b/media-video/transcode/files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch
new file mode 100644 (file)
index 0000000..a66681d
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.0.3_rc2_p20070310-libmpeg3.patch
@@ -0,0 +1,60 @@
+Index: transcode/import/import_mpeg3.c
+===================================================================
+--- transcode.orig/import/import_mpeg3.c
++++ transcode/import/import_mpeg3.c
+@@ -69,6 +69,9 @@ MOD_open
+ {
+ 
+   int i;
++#if MPEG3_MINOR  > 6
++  int mpeg3_return_value = 0;
++#endif
+ 
+   param->fd = NULL;
+ 
+@@ -79,14 +82,22 @@ MOD_open
+   if (param->flag == TC_VIDEO) {
+       if (!file) {
+         if (!file_a) {
++#if MPEG3_MINOR  < 7
+             if((file = mpeg3_open(vob->video_in_file))==NULL) {
++#else
++            if(((file = mpeg3_open(vob->video_in_file, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
++#endif
+                 fprintf(stderr, "open file failed\n");
+                 return(TC_IMPORT_ERROR);
+             }
+             if (verbose & TC_DEBUG)
+                   printf("[%s] Opened video NO copy\n", MOD_NAME);
+         } else if (file_a) {
++#if MPEG3_MINOR  < 7
+             if((file = mpeg3_open_copy(vob->video_in_file, file_a))==NULL) {
++#else
++            if(((file = mpeg3_open_copy(vob->video_in_file, file_a, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
++#endif
+                 fprintf(stderr, "open file failed\n");
+                 return(TC_IMPORT_ERROR);
+             }
+@@ -98,14 +109,22 @@ MOD_open
+   if (param->flag == TC_AUDIO) {
+       if (!file_a) {
+         if (!file) {
++#if MPEG3_MINOR  < 7
+             if((file_a = mpeg3_open(vob->audio_in_file))==NULL) {
++#else
++            if(((file_a = mpeg3_open(vob->audio_in_file, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
++#endif
+                 fprintf(stderr, "open audio file failed\n");
+                 return(TC_IMPORT_ERROR);
+             }
+             if (verbose & TC_DEBUG)
+                   printf("[%s] Opened audio NO copy\n", MOD_NAME);
+         } else if (file) {
++#if MPEG3_MINOR  < 7
+             if((file_a = mpeg3_open_copy(vob->audio_in_file, file))==NULL) {
++#else
++            if(((file_a = mpeg3_open_copy(vob->audio_in_file, file, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
++#endif
+                 fprintf(stderr, "open_copy audio file failed\n");
+                 return(TC_IMPORT_ERROR);
+             }

diff --git a/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild b/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild
index fd8e134a1cdf3971cb7eeaa2190d68143feccd5a..bf6afb035faea575e29434f7d9641b756eb4304d 100644 (file)
--- a/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild
+++ b/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild,v 1.1 2007/03/24 14:32:00 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.3_rc2_p20070310-r1.ebuild,v 1.2 2007/03/25 11:27:44 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -59,6 +59,7 @@ src_unpack() {
                "${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
                "${S}"/docs/release-notes/Makefile.am
 
+       epatch "${FILESDIR}/${P}-libmpeg3.patch"
        eautoreconf
 }