Chase multimedia/mp4v2 update.

PR:		ports/148643
Submitted by:	Christopher Key <cjk32 at cam.ac.uk>

5 files changed, 89 insertions, 17 deletions

diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index da4871d4c4fc..65d53a5e1418 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -18,7 +18,7 @@ PKGNAMESUFFIX=	${PKG_NAME_SUFFIX}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Standards-based system to encode, stream and play MPEG-4 audio/video
 
-BUILD_DEPENDS=	mpeg4ip-libmp4v2>=1.6.1:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+BUILD_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 \
 		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		faad.2:${PORTSDIR}/audio/faad \
@@ -28,7 +28,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		x264.98:${PORTSDIR}/multimedia/x264
-RUN_DEPENDS=	mpeg4ip-libmp4v2>=1.6.1:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+RUN_DEPENDS=	mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2
 
 USE_GNOME=	gtk20
 USE_SDL=	sdl
@@ -147,24 +147,15 @@ BROKEN=		Does not compile
 post-patch:
 	@${TOUCH} -f ${WRKSRC}/bootstrapped
 # don't compile or use libmp4v2
-	@${REINPLACE_CMD} -e 's|mp4v2||; s|gnu||; s|mp4av||' \
+	@${REINPLACE_CMD} -e 's|mp4v2||' \
 		${WRKSRC}/lib/Makefile.in
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|-I$(top_srcdir)/lib/mp4v2||; \
 		s|$$(top_builddir)/lib/mp4v2/libmp4v2.la||; \
-		s|$$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la||; \
-		s|$$(top_builddir)/lib/mp4av/libmp4av.la||; \
 		s|$$(top_srcdir)/lib/mp4v2/libmp4v2.la||; \
-		s|$$(top_srcdir)/lib/gnu/libmpeg4ip_gnu.la||; \
-		s|$$(top_srcdir)/lib/mp4av/libmp4av.la||; \
-		s|@LIBS@|@LIBS@ -lmp4v2 -lmp4av -lmpeg4ip_gnu|; \
+		s|@LIBS@|@LIBS@ -lmp4v2|; \
 		s|nasm|yasm|'
-	@${REINPLACE_CMD} -e 's|mpeg4ip.h||; \
-		s|mpeg4ip_config.h||; s|mpeg4ip_version.h||' \
-		${WRKSRC}/include/Makefile.in
-	@${REINPLACE_CMD} -e 's|include_HEADERS = mpeg4ip_config.h||' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Werror||' \
 		${WRKSRC}/common/video/iso-mpeg4/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|mp4venc_template.par||' \
@@ -172,7 +163,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*.[ch]" -or -name "*.cpp" | ${XARGS} -n 10 \
 		${REINPLACE_CMD} -e \
 		's|<stdint.h>|<inttypes.h>|; \
-		s|mp4v2/mp4.h|mp4.h|; \
 		s|<malloc.h>|<stdlib.h>|; \
 		s|<avcodec.h>|<libavcodec/avcodec.h>|; \
 		s|<swscale.h>|<libswscale/swscale.h>|; \
@@ -196,6 +186,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec -lswscale|g' \
 		${WRKSRC}/configure
 
+# replace bundled mp4v2 with placeholder
+post-configure:
+	@${RM} -rf ${WRKSRC}/lib/mp4v2
+	@${MKDIR} ${WRKSRC}/lib/mp4v2
+	@echo '#include "mpeg4ip.h"' > ${WRKSRC}/lib/mp4v2/mp4.h
+
+
 post-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/server/util/mp4encode/mp4encode \
diff --git a/multimedia/mpeg4ip/files/patch-include__mpeg4ip.h b/multimedia/mpeg4ip/files/patch-include__mpeg4ip.h
new file mode 100644
index 000000000000..57da1d24bb27
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-include__mpeg4ip.h
@@ -0,0 +1,43 @@
+--- ./include/mpeg4ip.h.orig	2006-08-07 19:27:00.000000000 +0100
++++ ./include/mpeg4ip.h	2010-07-14 18:47:44.000000000 +0100
+@@ -58,6 +58,8 @@
+ // file 
+ #include "mpeg4ip_version.h"
+ 
++#include <mp4v2/mp4v2.h>
++
+ #ifdef _WIN32
+ #include "mpeg4ip_win32.h"
+ #include "mpeg4ip_version.h"
+@@ -178,6 +180,7 @@
+ #define LLU  U64
+ 
+ #include <stdarg.h>
++/* from mp4v2/mp4v2.h
+ typedef void (*error_msg_func_t)(int loglevel,
+ 				 const char *lib,
+ 				 const char *fmt,
+@@ -186,6 +189,7 @@
+ 				   const char *lib,
+ 				   const char *fmt,
+ 				   ...);
++*/
+ #ifndef HAVE_IN_PORT_T
+ typedef uint16_t in_port_t;
+ #endif
+@@ -271,6 +275,7 @@
+ 
+ #ifndef __cplusplus
+ 
++/* from mp4v2/mp4v2.h
+ #ifndef bool
+  #if SIZEOF_BOOL == 8
+   typedef uint64_t bool;
+@@ -292,6 +297,7 @@
+  #define true TRUE
+  #endif
+ #endif
++*/
+ 
+ #endif
+ 
diff --git a/multimedia/mpeg4ip/files/patch-include__mpeg4ip_getopt.h b/multimedia/mpeg4ip/files/patch-include__mpeg4ip_getopt.h
new file mode 100644
index 000000000000..3677f0259efc
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-include__mpeg4ip_getopt.h
@@ -0,0 +1,12 @@
+--- include/mpeg4ip_getopt.h.orig	Tue Oct 15 13:12:27 2002
++++ include/mpeg4ip_getopt.h	Mon Feb 24 05:23:50 2003
+@@ -11,6 +11,9 @@
+ #endif
+ 
+ #ifdef HAVE_GETOPT_H
++#ifdef __FreeBSD__
++#define __GNU_LIBRARY__
++#endif
+ #include <getopt.h>
+ #endif
+ 
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index cdc6cc1c2472..1c3c92b5e8fc 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -18,12 +18,26 @@ bin/sdl_pcm_play
 bin/yuvdump
 include/codec_plugin.h
 include/h264_sdp.h
+include/mp4av.h
+include/mp4av_aac.h
+include/mp4av_ac3.h
+include/mp4av_adts.h
+include/mp4av_amr.h
+include/mp4av_audio.h
+include/mp4av_h264.h
+include/mp4av_hinters.h
+include/mp4av_mp3.h
+include/mp4av_mpeg3.h
+include/mp4av_mpeg4.h
+include/mpeg4ip.h
 include/mpeg4_audio_config.h
 include/mpeg4_sdp.h
 include/mpeg4ip_bitstream.h
 include/mpeg4ip_byteswap.h
+include/mpeg4ip_config.h
 include/mpeg4ip_config_set.h
 include/mpeg4ip_getopt.h
+include/mpeg4ip_version.h
 include/rtp_plugin.h
 include/sdp.h
 include/sdp_error.h
@@ -37,6 +51,9 @@ lib/libismacryp.so.0
 lib/libmp4.la
 lib/libmp4.so
 lib/libmp4.so.0
+lib/libmp4av.la
+lib/libmp4av.so
+lib/libmp4av.so.0
 lib/libmp4util.la
 lib/libmp4util.so
 lib/libmp4util.so.0
@@ -59,6 +76,9 @@ lib/libmpeg4ip_ffmpeg.so.0
 lib/libmpeg4ip_fposrec.la
 lib/libmpeg4ip_fposrec.so
 lib/libmpeg4ip_fposrec.so.0
+lib/libmpeg4ip_gnu.la
+lib/libmpeg4ip_gnu.so
+lib/libmpeg4ip_gnu.so.0
 lib/libmpeg4ip_mpeg4_iso.la
 lib/libmpeg4ip_mpeg4_iso.so
 lib/libmpeg4ip_mpeg4_iso.so.0
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index dfa0c7f0426b..7347f2054d97 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quodlibet
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio python gnome
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -82,7 +82,7 @@ USE_GSTREAMER+=	wavpack
 .endif
 
 .if !defined(WITHOUT_MPEG4IP)
-LIB_DEPENDS+=	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
 USE_GSTREAMER+=	faad
 .endif