Fix to build and work with libmpeg3 1.7

(Portage version: 2.1.2.2)

3 files changed, 68 insertions, 2 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index f5c98fef8a9c..9ee8a6630e96 100644
--- 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/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
index 000000000000..a66681d31b33
--- /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 fd8e134a1cdf..bf6afb035fae 100644
--- 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
 }