added patch to make it compile again. fixes #60695.

4 files changed, 57 insertions, 7 deletions

diff --git a/media-video/mpeg-movie/ChangeLog b/media-video/mpeg-movie/ChangeLog
index 4be08a71bba3..f6cd314cab85 100644
--- a/media-video/mpeg-movie/ChangeLog
+++ b/media-video/mpeg-movie/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg-movie
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/ChangeLog,v 1.7 2004/08/12 20:46:10 chriswhite Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/ChangeLog,v 1.8 2005/01/09 06:18:29 luckyduck Exp $
+
+  09 Jan 2005; <lucky@gentoo.org> +files/mpeg-movie-1.6.0-r1-gentoo.patch,
+  mpeg-movie-1.6.0-r1.ebuild:
+  added patch to make it compile again. fixes #60695
 
   13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
   Adding missing metadata.xml.
diff --git a/media-video/mpeg-movie/Manifest b/media-video/mpeg-movie/Manifest
index d7b617e8ad2e..fc8ca2c16cd0 100644
--- a/media-video/mpeg-movie/Manifest
+++ b/media-video/mpeg-movie/Manifest
@@ -1,4 +1,5 @@
-MD5 a0064c14a4781c08ebec5c40bca69404 mpeg-movie-1.6.0-r1.ebuild 2760
-MD5 85bd034706d87b4412ee64b07f2b1e26 ChangeLog 1265
+MD5 da8976fc6952a5321667de28277677a1 mpeg-movie-1.6.0-r1.ebuild 2817
+MD5 6bdc10276ac82b704f42d21af118d466 ChangeLog 1423
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 1f5979214c419ba2946b7d77663a69fa files/digest-mpeg-movie-1.6.0-r1 69
+MD5 653a9a9061cfbdb84938b0dd02a01b33 files/mpeg-movie-1.6.0-r1-gentoo.patch 1281
diff --git a/media-video/mpeg-movie/files/mpeg-movie-1.6.0-r1-gentoo.patch b/media-video/mpeg-movie/files/mpeg-movie-1.6.0-r1-gentoo.patch
new file mode 100644
index 000000000000..41746a832ddc
--- /dev/null
+++ b/media-video/mpeg-movie/files/mpeg-movie-1.6.0-r1-gentoo.patch
@@ -0,0 +1,41 @@
+diff -urpN mpeg_movie.orig/video_in/headers/libpnmrw.h mpeg_movie/video_in/headers/libpnmrw.h
+--- mpeg_movie.orig/video_in/headers/libpnmrw.h	2005-01-09 05:49:31.570006416 +0100
++++ mpeg_movie/video_in/headers/libpnmrw.h	2005-01-09 05:55:37.625357544 +0100
+@@ -19,10 +19,12 @@
+ ** malloc.h at all.  A sad situation.  If you have compilation problems
+ ** that point here, feel free to tweak or remove these declarations.
+ */
++/*
+ #include <malloc.h>
+ #if !defined(sco)  &&  !defined(sgi) && !defined(IRIX)
+ extern char* malloc();
+-#endif
++#endif 
++*/
+ /* End of configurable definitions. */
+ 
+ 
+diff -urpN mpeg_movie.orig/video_in/libpnmrw.c mpeg_movie/video_in/libpnmrw.c
+--- mpeg_movie.orig/video_in/libpnmrw.c	2005-01-09 05:49:31.571006264 +0100
++++ mpeg_movie/video_in/libpnmrw.c	2005-01-09 06:46:37.986111992 +0100
+@@ -32,6 +32,7 @@
+ 
+ /* if don't have string.h, try strings.h */
+ #include <string.h>
++#include <errno.h>
+ #define rindex(s,c) strrchr(s,c)
+ 
+ 
+@@ -126,11 +127,10 @@ static void
+   pm_perror( reason )
+ char* reason;
+ {
+-  extern const char *const sys_errlist[];
+   extern int errno;
+   char* e;
+ 
+-  e = sys_errlist[errno];
++  e = strerror(errno);
+ 
+   if ( reason != 0 && reason[0] != '\0' )
+     (void) fprintf( stderr, "%s: %s - %s\n", progname, reason, e );
diff --git a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
index 392f6699787b..4ad1b48b48b2 100644
--- a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
+++ b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.10 2004/07/14 22:01:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.11 2005/01/09 06:18:29 luckyduck Exp $
+
+inherit eutils
 
 MY_P=${PN/-/_}
 S=${WORKDIR}/${MY_P}
@@ -20,6 +22,9 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+
 	for i in video_in video_out
 	do
 		cd ${S}/${i}
@@ -81,7 +86,6 @@ src_unpack() {
 		mpeg_export.h.orig > mpeg_export.h
 }
 src_compile() {
-
 	emake || make || die
 
 }