3 files changed, 78 insertions, 20 deletions

diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index dd36295a3f24..127650ee954b 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -32,8 +32,8 @@ USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-ffmpeg=${LOCALBASE} \
 		--enable-mp4live \
 		--disable-static
@@ -84,13 +84,6 @@ MAN3=	MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-CFLAGS+=	-O2
-PLIST_SUB+=	GCC="@comment "
-.else
-PLIST_SUB+=	GCC=""
-.endif
-
 ###
 ## Auto detect possible extensions
 ###
@@ -128,6 +121,12 @@ PKG_NAME_SUFFIX+=-esound
 .if defined(WITH_NAS)
 LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
 .endif
+
+# ipv6
+.if !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
 # xvid
 .if !defined(WITHOUT_XVID)
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
@@ -205,14 +204,6 @@ WITHOUT_MMX=yes
 .endif
 
 ###
-## FreeBSD extensions detection
-###
-# ipv6
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-###
 ## Enable extensions based on arch detection
 ###
 # mmx
diff --git a/multimedia/mpeg4ip/files/patch-mpeg4ip-1.5.0.1-x264 b/multimedia/mpeg4ip/files/patch-mpeg4ip-1.5.0.1-x264
new file mode 100644
index 000000000000..f80de8afc317
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-mpeg4ip-1.5.0.1-x264
@@ -0,0 +1,67 @@
+--- 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 bb7332cbd25a..1670ecdc791e 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -117,9 +117,9 @@ lib/mp4player_plugin/latm_rtp_plugin.so.0
 lib/mp4player_plugin/mp3_plugin.la
 lib/mp4player_plugin/mp3_plugin.so
 lib/mp4player_plugin/mp3_plugin.so.0
-%%GCC%%lib/mp4player_plugin/mpeg2dec_video_plugin.la
-%%GCC%%lib/mp4player_plugin/mpeg2dec_video_plugin.so
-%%GCC%%lib/mp4player_plugin/mpeg2dec_video_plugin.so.0
+lib/mp4player_plugin/mpeg2dec_video_plugin.la
+lib/mp4player_plugin/mpeg2dec_video_plugin.so
+lib/mp4player_plugin/mpeg2dec_video_plugin.so.0
 lib/mp4player_plugin/mpeg4_iso_plugin.la
 lib/mp4player_plugin/mpeg4_iso_plugin.so
 lib/mp4player_plugin/mpeg4_iso_plugin.so.0