7 files changed, 24 insertions, 116 deletions

diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 9af28075deff..9a61682b903b 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	1.5.0.1
-PORTREVISION=	5
+PORTVERSION=	1.6
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +24,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		x264.50:${PORTSDIR}/multimedia/x264
-RUN_DEPENDS=	mpeg4ip-libmp4v2>=1.5:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+RUN_DEPENDS=	mpeg4ip-libmp4v2>=1.6:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
 
 USE_GNOME=	gtk20
 USE_SDL=	sdl
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index 0b5f8e82cb84..df5b55839b94 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpeg4ip-1.5.0.1.tar.gz) = f53b06c62e914ab724bda9d9af041e08
-SHA256 (mpeg4ip-1.5.0.1.tar.gz) = 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6
-SIZE (mpeg4ip-1.5.0.1.tar.gz) = 4826180
+MD5 (mpeg4ip-1.6.tar.gz) = 004b481542e5aa9fdb455d9a1b640eff
+SHA256 (mpeg4ip-1.6.tar.gz) = 7ca1000d3f2055b4c6bf08bcdb7c5e237caca1c00da3a3aa0447ffc9b5f2876a
+SIZE (mpeg4ip-1.6.tar.gz) = 4651801
diff --git a/multimedia/mpeg4ip/files/patch-common_video_iso-mpeg4_src_type_basic.cpp b/multimedia/mpeg4ip/files/patch-common_video_iso-mpeg4_src_type_basic.cpp
new file mode 100644
index 000000000000..7819ebe00913
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-common_video_iso-mpeg4_src_type_basic.cpp
@@ -0,0 +1,15 @@
+--- common/video/iso-mpeg4/src/type_basic.cpp.orig	2007-09-23 17:04:08.000000000 -0400
++++ common/video/iso-mpeg4/src/type_basic.cpp	2007-09-23 17:04:39.000000000 -0400
+@@ -317,10 +317,12 @@
+ 	iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+ 
++/*
+ Void CMotionVector::setToZero (Void)
+ {
+ 	memset (this, 0, sizeof (*this));
+ }
++*/
+ 
+ // RRV insertion
+ Void CMotionVector::scaleup ()
diff --git a/multimedia/mpeg4ip/files/patch-fix_with_gcc42 b/multimedia/mpeg4ip/files/patch-fix_with_gcc42
deleted file mode 100644
index 3a68696d8796..000000000000
--- a/multimedia/mpeg4ip/files/patch-fix_with_gcc42
+++ /dev/null
@@ -1,18 +0,0 @@
---- common/video/iso-mpeg4/src/type_basic.cpp.orig	Mon Jun 11 11:51:06 2007
-+++ common/video/iso-mpeg4/src/type_basic.cpp	Mon Jun 11 11:52:17 2007
-@@ -317,13 +317,13 @@
- 	iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
- }
- 
--Void CMotionVector::setToZero (Void)
-+Void CMotionVector::setToZero ()
- {
- 	memset (this, 0, sizeof (*this));
- }
- 
- // RRV insertion
--Void CMotionVector::scaleup (Void)
-+Void CMotionVector::scaleup ()
- {
- 	if(m_vctTrueHalfPel.x == 0){
- 		m_vctTrueHalfPel_x2.x = 0;
diff --git a/multimedia/mpeg4ip/files/patch-fix_with_new_ffmpeg b/multimedia/mpeg4ip/files/patch-fix_with_new_ffmpeg
deleted file mode 100644
index 4e420df790f9..000000000000
--- a/multimedia/mpeg4ip/files/patch-fix_with_new_ffmpeg
+++ /dev/null
@@ -1,22 +0,0 @@
---- player/plugin/audio/ffmpeg/ffmpeg.cpp.orig	Sun Apr  8 16:21:30 2007
-+++ player/plugin/audio/ffmpeg/ffmpeg.cpp	Sun Apr  8 16:22:05 2007
-@@ -166,7 +166,7 @@
-     break;
-   }
-   if (userdata) {
--    ffmpeg->m_c->extradata = (void *)userdata;
-+    ffmpeg->m_c->extradata = (uint8_t *)userdata;
-     ffmpeg->m_c->extradata_size = ud_size;
-   }
-   if (avcodec_open(ffmpeg->m_c, ffmpeg->m_codec) < 0) {
---- player/plugin/video/ffmpeg/ffmpeg.cpp.orig	Sun Apr  8 16:22:49 2007
-+++ player/plugin/video/ffmpeg/ffmpeg.cpp	Sun Apr  8 16:23:20 2007
-@@ -255,7 +255,7 @@
-   }
-     break;
-   case CODEC_ID_SVQ3:
--    ffmpeg->m_c->extradata = (void *)userdata;
-+    ffmpeg->m_c->extradata = (uint8_t *)userdata;
-     ffmpeg->m_c->extradata_size = ud_size;
-     if (vinfo != NULL) {
-       ffmpeg->m_c->width = vinfo->width;
diff --git a/multimedia/mpeg4ip/files/patch-mpeg4ip-1.5.0.1-x264 b/multimedia/mpeg4ip/files/patch-mpeg4ip-1.5.0.1-x264
deleted file mode 100644
index f80de8afc317..000000000000
--- a/multimedia/mpeg4ip/files/patch-mpeg4ip-1.5.0.1-x264
+++ /dev/null
@@ -1,67 +0,0 @@
---- server/mp4live/video_x264.cpp.old	2006-05-11 22:23:19.000000000 +0200
-+++ server/mp4live/video_x264.cpp	2006-09-29 21:55:42.000000000 +0200
-@@ -32,7 +32,9 @@
- 
- static config_index_t CFG_X264_FORCE_BASELINE;
- static config_index_t CFG_X264_USE_CABAC;
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- static config_index_t CFG_X264_USE_CBR;
-+#endif
- static config_index_t CFG_X264_BIT_RATE_TOLERANCE;
- static config_index_t CFG_X264_USE_VBV;
- static config_index_t CFG_X264_VBV_BITRATE_MULT;
-@@ -44,7 +46,9 @@
- static SConfigVariable X264EncoderVariables[] = {
-   CONFIG_BOOL(CFG_X264_FORCE_BASELINE, "x264ForceBaseline", false),
-   CONFIG_BOOL(CFG_X264_USE_CABAC, "x264UseCabac", true),
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
-   CONFIG_BOOL(CFG_X264_USE_CBR, "x264UseCbr", true),
-+#endif
-   CONFIG_FLOAT(CFG_X264_BIT_RATE_TOLERANCE, "x264BitRateTolerance", 1.0),
-   CONFIG_BOOL(CFG_X264_USE_VBV, "x264UseVbv", false),
-   CONFIG_FLOAT(CFG_X264_VBV_BITRATE_MULT, "x264VbvBitRateMult", 1.0),
-@@ -56,7 +60,9 @@
- 
- GUI_BOOL(gui_baseline, CFG_X264_FORCE_BASELINE, "Force Baseline (overrides below)");
- GUI_BOOL(gui_cabac, CFG_X264_USE_CABAC, "Use Cabac");
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- GUI_BOOL(gui_cbr, CFG_X264_USE_CBR, "Use CBR");
-+#endif
- GUI_BOOL(gui_bframe, CFG_VIDEO_USE_B_FRAMES, "Use B Frames");
- GUI_INT_RANGE(gui_bframenum, CFG_VIDEO_NUM_OF_B_FRAMES, "Number of B frames", 1, 4);
- 
-@@ -75,7 +81,9 @@
- DECLARE_TABLE(x264_gui_options) = {
-   TABLE_GUI(gui_baseline),
-   TABLE_GUI(gui_cabac),
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
-   TABLE_GUI(gui_cbr),
-+#endif
-   TABLE_GUI(gui_bframe),
-   TABLE_GUI(gui_bframenum),
-   TABLE_GUI(gui_brate),
-@@ -168,7 +176,11 @@
-     m_param.i_bframe = 0;
-   //debug_message("h264 b frames %d", m_param.i_bframe);
-   m_param.rc.i_bitrate = Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE);
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
-   m_param.rc.b_cbr = Profile()->GetBoolValue(CFG_X264_USE_CBR) ? 1 : 0;
-+#else
-+  m_param.rc.i_rc_method = X264_RC_ABR;
-+#endif
-   m_param.rc.f_rate_tolerance = Profile()->GetFloatValue(CFG_X264_BIT_RATE_TOLERANCE);
-   if (Profile()->GetBoolValue(CFG_X264_USE_VBV)) {
-     if (Profile()->GetBoolValue(CFG_X264_FORCE_BASELINE)) {
---- server/mp4live/video_x264.h.old	2006-11-11 20:56:48.000000000 +0100
-+++ server/mp4live/video_x264.h	2006-11-11 20:57:49.000000000 +0100
-@@ -33,6 +33,10 @@
- }
- #endif
- 
-+#if X264_BUILD > 47
-+#define HAVE_X264_PARAM_T_RC_I_RC_METHOD
-+#endif
-+
- class CX264VideoEncoder : public CVideoEncoder {
-  public:
- 	CX264VideoEncoder(CVideoProfile *vp, 
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index 1670ecdc791e..4df580a7002e 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -11,6 +11,7 @@ bin/mpeg4ip-config
 bin/mpeg4vol
 bin/mpeg_ps_extract
 bin/mpeg_ps_info
+bin/mpeg2t_dump
 bin/rgb2yuv
 bin/sdl_pcm_play
 bin/yuvdump
@@ -26,9 +27,6 @@ include/rtp_plugin.h
 include/sdp.h
 include/sdp_error.h
 include/text_plugin.h
-lib/libh264util.la
-lib/libh264util.so
-lib/libh264util.so.0
 lib/libhttp.la
 lib/libhttp.so
 lib/libhttp.so.0
@@ -54,6 +52,9 @@ lib/libmpeg4ip_celpbs.so.0
 lib/libmpeg4ip_faad.la
 lib/libmpeg4ip_faad.so
 lib/libmpeg4ip_faad.so.0
+lib/libmpeg4ip_ffmpeg.la
+lib/libmpeg4ip_ffmpeg.so
+lib/libmpeg4ip_ffmpeg.so.0
 lib/libmpeg4ip_fposrec.la
 lib/libmpeg4ip_fposrec.so
 lib/libmpeg4ip_fposrec.so.0