- Fix build with gcc 3.4

- Fix plist
- Respect CC and CFLAGS
- Fix WITH_QUICKTIME knob

PR:		ports/69452, ports/69595
Submitted by:	Michael Johnson <ahze@ahze.net>,
		Christian Hiris <4711@chello.at>
Approved by:	maintainer timeout (1 month)

5 files changed, 58 insertions, 14 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 00829173127e..30059e8fdb83 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mjpegtools
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
@@ -19,18 +19,18 @@ LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
-USE_GNOME=	glib12 lthack
+USE_GNOME=	glib12
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --program-transform-name=""
+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
+INSTALLS_SHLIB=	yes
 
 INFO=	mjpeg-howto
 MAN1=	jpeg2yuv.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
@@ -76,7 +76,7 @@ WITH_LIBGNUGETOPT=	yes
 WITH_LIBMOVTAR=	yes
 .endif
 # QUICKTIME
-.if exists(${LOCALBASE}/lib/libopenquicktime.so.0)
+.if exists(${LOCALBASE}/lib/libquicktime.so.0)
 WITH_QUICKTIME=	yes
 .endif
 # SDL
@@ -120,9 +120,9 @@ CONFIGURE_ARGS+=	--with-sdl
 .endif
 #
 .ifdef(WITH_QUICKTIME)
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
+LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
 
-CONFIGURE_ARGS+=	--with-quicktime=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-quicktime
 .endif
 
 pre-everything::
@@ -155,7 +155,8 @@ post-patch:
 		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 --git a/multimedia/mjpegtools/files/patch-configure b/multimedia/mjpegtools/files/patch-configure
new file mode 100644
index 000000000000..2272d1c6f4b5
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-configure
@@ -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 --git a/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c b/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c
new file mode 100644
index 000000000000..981a612354b5
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-lavtools::lavpipe.c
@@ -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 --git a/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc b/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc
new file mode 100644
index 000000000000..f69b9f43ff7c
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-mpeg2enc::picture.cc
@@ -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++)
+ 	{
diff --git a/multimedia/mjpegtools/pkg-plist b/multimedia/mjpegtools/pkg-plist
index fb43ae24366d..7f52508f81e4 100644
--- a/multimedia/mjpegtools/pkg-plist
+++ b/multimedia/mjpegtools/pkg-plist
@@ -86,28 +86,23 @@ include/mjpegtools/yuv4mpeg.h
 lib/liblavfile-1.6.so
 lib/liblavfile-1.6.so.2
 lib/liblavfile.a
-lib/liblavfile.la
 lib/liblavfile.so
 lib/liblavjpeg-1.6.so
 lib/liblavjpeg-1.6.so.2
 lib/liblavjpeg.a
-lib/liblavjpeg.la
 lib/liblavjpeg.so
 lib/liblavplay-1.6.so
 lib/liblavplay-1.6.so.2
 lib/liblavplay.a
-lib/liblavplay.la
 lib/liblavplay.so
 lib/libmjpegutils.a
 lib/libmpeg2encpp-1.6.so
 lib/libmpeg2encpp-1.6.so.2
 lib/libmpeg2encpp.a
-lib/libmpeg2encpp.la
 lib/libmpeg2encpp.so
 lib/libmplex2-1.6.so
 lib/libmplex2-1.6.so.2
 lib/libmplex2.a
-lib/libmplex2.la
 lib/libmplex2.so
 libdata/pkgconfig/mjpegtools.pc
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true