Attachment #44961 for bug #69452





USE_GNOME=	glib12 lthack
USE_GMAKE=	yes
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}"
WANT_GNOME=	yes
WANT_SDL=	yes


		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|-pthread||' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \
		${WRKSRC}/lavtools/liblavplay.c \




--- 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

Line 0 Link Here

(-)/usr/ports/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c (+10 lines)
	1	--- lavtools/lavpipe.c.orig Thu Jul 22 18:17:47 2004
	2	+++ lavtools/lavpipe.c Thu Jul 22 18:18:08 2004
	3	@@ -582,6 +582,7 @@
	4	mjpeg_info( "closing input %d (source %d)", i, current_index);
	5	decommission_pipe_source(source);
	6	KEEP_SOURCE:
	7	+ ;
	8	}
	9	}
	10	}




--- 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++)
 	{

Return to bug 69452

Lines 21-34 Link Here

(-)/usr/ports/multimedia/mjpegtools/Makefile (-4 / +4 lines)
21		21
22	USE_GNOME= glib12 lthack	22	USE_GNOME= glib12 lthack
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	USE_LIBTOOL_VER=15	24	USE_INC_LIBTOOL_VER=15
25	USE_REINPLACE= yes	25	USE_REINPLACE= yes
26	USE_XLIB= yes	26	USE_XLIB= yes
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
28	CONFIGURE_ARGS= --program-transform-name=""	28	CONFIGURE_ARGS= --program-transform-name=""
29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
30	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \	30	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
31	PTHREAD_LIBS="${PTHREAD_LIBS}"
32	WANT_GNOME= yes	31	WANT_GNOME= yes
33	WANT_SDL= yes	32	WANT_SDL= yes
34		33
Lines 155-161 Link Here
155	s,-ldl([[:space:]]\|"),\1,; \	154	s,-ldl([[:space:]]\|"),\1,; \
156	s\|-L/lib\|\|g; \	155	s\|-L/lib\|\|g; \
157	s\|(-L\$$with_dv)(\$$with_dv_l)\|\1/lib\|; \	156	s\|(-L\$$with_dv)(\$$with_dv_l)\|\1/lib\|; \
158	s\|(-ldv)\|-L${LOCALBASE}/lib \1 ${PTHREAD_LIBS:S/"//g}\|' \	157	s\|(-ldv)\|-L${LOCALBASE}/lib \1 ${PTHREAD_LIBS:S/"//g}\|; \
		158	s\|-pthread\|\|' \
159	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	159	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
160	@${REINPLACE_CMD} -e 's\|SDL/\|SDL11/\|' \	160	@${REINPLACE_CMD} -e 's\|SDL/\|SDL11/\|' \
161	${WRKSRC}/lavtools/liblavplay.c \	161	${WRKSRC}/lavtools/liblavplay.c \

Line 0 Link Here

(-)/usr/ports/multimedia/mjpegtools/files/patch-configure (+23 lines)
	1	--- configure.orig Thu Jul 22 18:15:58 2004
	2	+++ configure Thu Jul 22 18:16:36 2004
	3	@@ -25858,16 +25858,16 @@
	4	fi
	5	have_cmov=false
	6	case $arch in
	7	- i786) ARCHFLAGS="-mcpu=i786 -march=$arch"
	8	+ i786) ARCHFLAGS=""
	9	have_cmov=true
	10	;;
	11	- i686) ARCHFLAGS="-mcpu=i686 -march=$arch"
	12	+ i686) ARCHFLAGS=""
	13	have_cmov=true
	14	;;
	15	- i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
	16	+ i586) ARCHFLAGS=""
	17	have_cmov=false
	18	;;
	19	- *) ARCHFLAGS="-mcpu=i686 -march=$arch"
	20	+ *) ARCHFLAGS=""
	21	have_cmov=true
	22	;;
	23	esac

Line 0 Link Here

(-)/usr/ports/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc (+15 lines)
	1	--- mpeg2enc/picture.cc.orig Thu Jul 22 18:23:54 2004
	2	+++ mpeg2enc/picture.cc Thu Jul 22 18:24:32 2004
	3	@@ -83,9 +83,9 @@
	4	}
	5
	6
	7	- curref = new (uint8_t *)[5];
	8	- curorg = new (uint8_t *)[5];
	9	- pred = new (uint8_t *)[5];
	10	+ curref = new uint8_t * [5];
	11	+ curorg = new uint8_t * [5];
	12	+ pred = new uint8_t * [5];
	13
	14	for( i = 0 ; i<3; i++)
	15	{