Attachment 44961 Details for Bug 69452 – mjpegtools-1.6.2_1.patch

[patch] mjpegtools-1.6.2_1.patch

mjpegtools-1.6.2_1.patch (text/plain), 3.25 KB, created by Michael Johnson on 2004-07-23 00:50:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Johnson

Created: 2004-07-23 00:50:21 UTC

Size: 3.25 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/multimedia/mjpegtools.orig/Makefile /usr/ports/multimedia/mjpegtools/Makefile
>--- /usr/ports/multimedia/mjpegtools.orig/Makefile	Sat Jun 26 00:54:26 2004
>+++ /usr/ports/multimedia/mjpegtools/Makefile	Thu Jul 22 19:38:44 2004
>@@ -21,14 +21,13 @@
> 
> USE_GNOME=	glib12 lthack
> USE_GMAKE=	yes
>-USE_LIBTOOL_VER=15
>+USE_INC_LIBTOOL_VER=15
> USE_REINPLACE=	yes
> USE_XLIB=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS= --program-transform-name=""
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
>-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
>-		PTHREAD_LIBS="${PTHREAD_LIBS}"
>+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
> WANT_GNOME=	yes
> WANT_SDL=	yes
> 
>@@ -155,7 +154,8 @@
> 		s,-ldl([[:space:]]|"),\1,; \
> 		s|-L/lib||g; \
> 		s|(-L\$$with_dv)(\$$with_dv_l)|\1/lib|; \
>-		s|(-ldv)|-L${LOCALBASE}/lib \1 ${PTHREAD_LIBS:S/"//g}|' \
>+		s|(-ldv)|-L${LOCALBASE}/lib \1 ${PTHREAD_LIBS:S/"//g}|; \
>+		s|-pthread||' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \
> 		${WRKSRC}/lavtools/liblavplay.c \
>diff -ruN --exclude=CVS /usr/ports/multimedia/mjpegtools.orig/files/patch-configure /usr/ports/multimedia/mjpegtools/files/patch-configure
>--- /usr/ports/multimedia/mjpegtools.orig/files/patch-configure	Wed Dec 31 19:00:00 1969
>+++ /usr/ports/multimedia/mjpegtools/files/patch-configure	Thu Jul 22 18:16:48 2004
>@@ -0,0 +1,23 @@
>+--- configure.orig	Thu Jul 22 18:15:58 2004
>++++ configure	Thu Jul 22 18:16:36 2004
>+@@ -25858,16 +25858,16 @@
>+   fi
>+   have_cmov=false
>+   case $arch in
>+-  i786) ARCHFLAGS="-mcpu=i786 -march=$arch"
>++  i786) ARCHFLAGS=""
>+   have_cmov=true
>+   ;;
>+-  i686) ARCHFLAGS="-mcpu=i686 -march=$arch"
>++  i686) ARCHFLAGS=""
>+   have_cmov=true
>+   ;;
>+-  i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
>++  i586) ARCHFLAGS=""
>+   have_cmov=false
>+   ;;
>+-  *) ARCHFLAGS="-mcpu=i686 -march=$arch"
>++  *) ARCHFLAGS=""
>+   have_cmov=true
>+   ;;
>+   esac
>diff -ruN --exclude=CVS /usr/ports/multimedia/mjpegtools.orig/files/patch-lavtools::lavpipe.c /usr/ports/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c
>--- /usr/ports/multimedia/mjpegtools.orig/files/patch-lavtools::lavpipe.c	Wed Dec 31 19:00:00 1969
>+++ /usr/ports/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c	Thu Jul 22 19:39:55 2004
>@@ -0,0 +1,10 @@
>+--- lavtools/lavpipe.c.orig	Thu Jul 22 18:17:47 2004
>++++ lavtools/lavpipe.c	Thu Jul 22 18:18:08 2004
>+@@ -582,6 +582,7 @@
>+       mjpeg_info( "closing input %d (source %d)", i, current_index);
>+       decommission_pipe_source(source);
>+     KEEP_SOURCE:
>++    ;
>+     }
>+   }
>+ }
>diff -ruN --exclude=CVS /usr/ports/multimedia/mjpegtools.orig/files/patch-mpeg2enc::picture.cc /usr/ports/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc
>--- /usr/ports/multimedia/mjpegtools.orig/files/patch-mpeg2enc::picture.cc	Wed Dec 31 19:00:00 1969
>+++ /usr/ports/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc	Thu Jul 22 18:25:30 2004
>@@ -0,0 +1,15 @@
>+--- mpeg2enc/picture.cc.orig	Thu Jul 22 18:23:54 2004
>++++ mpeg2enc/picture.cc	Thu Jul 22 18:24:32 2004
>+@@ -83,9 +83,9 @@
>+     }
>+ 
>+ 
>+-	curref = new (uint8_t *)[5];
>+-	curorg = new (uint8_t *)[5];
>+-	pred   = new (uint8_t *)[5];
>++	curref = new uint8_t * [5];
>++	curorg = new uint8_t * [5];
>++	pred   = new uint8_t * [5];
>+ 
>+ 	for( i = 0 ; i<3; i++)
>+ 	{

Actions: View | Diff

Attachments on bug 69452: 44961 | 44962