3 files changed, 51 insertions, 45 deletions

diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 6378235db926..fb542891ee45 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	0.9.4.1
+PORTVERSION=	0.9.5
 CATEGORIES=	graphics audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14 \
-		libtool:${PORTSDIR}/devel/libtool \
+BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
 		nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${DATADIR}
+CONFIGURE_ARGS=	--datadir=${DATADIR} \
+		--with-glib-prefix=${LOCALBASE} \
+		--with-gtk-prefix=${LOCALBASE} \
+		--program-transform-name=''
 CONFIGURE_ENV=	PATH=${WRKDIR}/auto-bin:$$PATH
-CONFIGURE_SCRIPT=	bootstrap
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
@@ -36,11 +38,15 @@ MAN3=   MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
 	MP4AddRtpImmediateData.3 MP4AddRtpPacket.3 MP4AddRtpSampleData.3 \
 	MP4AddRtpVideoHint.3 MP4AddSceneTrack.3 MP4AddSystemsTrack.3 \
 	MP4AddTrack.3 MP4AddVideoTrack.3 MP4AppendHintTrackSdp.3 \
+	MP4AddTrackEdit.3 \
 	MP4AppendSessionSdp.3 MP4BinaryToBase16.3 MP4BinaryToBase64.3 \
+	MP4CloneTrack.3 \
 	MP4Close.3 MP4ConvertFromMovieDuration.3 \
 	MP4ConvertFromTrackDuration.3 MP4ConvertFromTrackTimestamp.3 \
 	MP4ConvertToTrackDuration.3 MP4ConvertToTrackTimestamp.3 \
+	MP4CopySample.3 MP4CopyTrack.3 MP4DeleteTrackEdit.3 \
 	MP4Create.3 MP4DeleteTrack.3 MP4Dump.3 MP4FindTrackId.3 \
+	MP4FileInfo.3 \
 	MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 MP4GetDuration.3 \
 	MP4GetGraphicsProfileLevel.3 MP4GetHintTrackReferenceTrackId.3 \
 	MP4GetHintTrackRtpPayload.3 MP4GetHintTrackSdp.3 \
@@ -48,6 +54,7 @@ MAN3=   MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
 	MP4GetRtpHintNumberOfPackets.3 MP4GetRtpPacketBFrame.3 \
 	MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 \
 	MP4GetSampleDuration.3 MP4GetSampleIdFromTime.3 \
+	MP4GetSampleIdFromEditTime.3 \
 	MP4GetSampleRenderingOffset.3 MP4GetSampleSize.3 \
 	MP4GetSampleSync.3 MP4GetSampleTime.3 MP4GetSceneProfileLevel.3 \
 	MP4GetSessionSdp.3 MP4GetTimeScale.3 MP4GetTrackAudioType.3 \
@@ -55,15 +62,23 @@ MAN3=   MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \
 	MP4GetTrackESConfiguration.3 MP4GetTrackFixedSampleDuration.3 \
 	MP4GetTrackMaxSampleSize.3 MP4GetTrackNumberOfSamples.3 \
 	MP4GetTrackTimeScale.3 MP4GetTrackType.3 \
+	MP4GetTrackAudioMpeg4Type.3 MP4GetTrackEditDuration.3 \
+	MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 \
+	MP4GetTrackEditStart.3 MP4GetTrackEditTotalDuration.3 \
+	MP4GetTrackNumberOfEdits.3 \
 	MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \
 	MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 MP4GetVerbosity.3 \
 	MP4GetVideoProfileLevel.3 MP4MakeIsmaCompliant.3 MP4Modify.3 \
+	MP4Info.3 \
 	MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 MP4ReadRtpPacket.3 \
 	MP4ReadSample.3 MP4SetAudioProfileLevel.3 \
+	MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 \
 	MP4SetGraphicsProfileLevel.3 MP4SetHintTrackRtpPayload.3 \
 	MP4SetHintTrackSdp.3 MP4SetODProfileLevel.3 \
 	MP4SetRtpTimestampStart.3 MP4SetSampleRenderingOffset.3 \
 	MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 MP4SetTimeScale.3 \
+	MP4SetTrackEditDuration.3 MP4SetTrackEditDwell.3 \
+	MP4SetTrackEditMediaStart.3 \
 	MP4SetTrackESConfiguration.3 MP4SetTrackTimeScale.3 \
 	MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 \
 	MP4WriteSample.3
@@ -74,35 +89,30 @@ post-extract:
 .endfor
 
 post-patch:
-	@${PERL} -pi -e 's|^(AC_ARG_ENABLE\(ipv6)|\1,|' \
-		${CONFIGURE_WRKSRC}/configure.in
-	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} -n 10 ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} -n 10 \
+		${REINPLACE_CMD} -e \
 		's|stdint\.h|inttypes.h|;s|malloc\.h|stdlib.h|'
 # replacing distfile's libs with ports' versions
-	@${PERL} -pi -e 's|SDL||' ${WRKSRC}/lib/Makefile.am
-	@${PERL} -pi -e 's|^(SDL_CFLAGS=).+|\1"`${SDL_CONFIG} --cflags`"|; \
-		s|^(SDL_LIBS=).+|\1"`${SDL_CONFIG} --libs`"|; \
-		s|\s+lib/SDL.*\n||' \
-		${CONFIGURE_WRKSRC}/configure.in
-	@${FIND} ${WRKSRC} -type f -name "Makefile.am" | ${XARGS} -n 10 ${PERL} -pi -e \
-		's|-I[^\s]+?lib/SDL/include|-I${LOCALBASE}/include/SDL11|; \
-		s|\$$[^\s]+/lib/SDL/src/main/libSDLmain.a|${LOCALBASE}/lib/libSDLmain-1.1.a|'
-	@${PERL} -pi -e 's!SDL_(Has|)AudioDelayMsec.*;$$!0;!' \
-		${WRKSRC}/player/src/audio.cpp
-
-# Borrowed from kde* ports. Thanks to Will Andrews <will@FreeBSD.org>
-pre-configure:
-	@${MKDIR} ${WRKDIR}/auto-bin
-.for AC in autoconf autoheader
-	@${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKDIR}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	@${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKDIR}/auto-bin/${AM}
-.endfor
+	@${REINPLACE_CMD} -E -e 's|(SUBDIRS.+)SDL|\1|' \
+		${WRKSRC}/lib/Makefile.in
+	@${REINPLACE_CMD} -E -e 's|lib/SDL/sdl-config|${SDL_CONFIG}|; \
+		s|^(SDL_LIBS=).+$$|\1"`${SDL_CONFIG} --libs`"|' \
+		${CONFIGURE_WRKSRC}/configure
+	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
+		-n 10 ${REINPLACE_CMD} -E -e \
+		's|-I[^ ]+lib/SDL/include|-I${LOCALBASE}/include/SDL11|; \
+		s|\$$[^ ]+/lib/SDL/src/main/libSDLmain.a|${LOCALBASE}/lib/libSDLmain-1.1.a|'
+	@${REINPLACE_CMD} -E -e \
+		's!SDL_(AudioDelayMsec|HasAudioDelayMsec).*;$$!0;!' \
+		${WRKSRC}/player/src/audio_sdl.cpp
 
 post-configure:
-	@${FIND} ${WRKSRC} -type f -name "Makefile" | ${XARGS} -n 10 ${PERL} -pi -e \
-		's!\s(autoconf|autoheader|automake|aclocal)$$!${WRKDIR}/auto-bin/\1!'
+# disable GNU auto* tools
+# remove -Werror
+	@${FIND} ${WRKSRC} -type f -name "Makefile" | ${XARGS} \
+		-n 10 ${REINPLACE_CMD} -E -e \
+		's! (autoconf|autoheader|automake|aclocal)$$! ${TRUE}!; \
+		s|-Werror||g'
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index 51a5ad9c80f8..b8b5a70b6a46 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1 +1 @@
-MD5 (mpeg4ip-0.9.4.1.tar.gz) = d05effbe5d304ecf6ca150b1a411dc21
+MD5 (mpeg4ip-0.9.5.tar.gz) = 7a462376de24beea42f315e0b1dec5e2
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index 8e1330a885ba..81585621b3a5 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -15,10 +15,6 @@ bin/xvidenc
 bin/yuvdump
 lib/libconfig_file.a
 lib/libconfig_file.la
-lib/libfaac.a
-lib/libfaac.la
-lib/libfaac.so
-lib/libfaac.so.0
 lib/libh26lenc.a
 lib/libh26lenc.la
 lib/libh26lenc.so
@@ -43,22 +39,22 @@ lib/libmsg_queue.a
 lib/libmsg_queue.la
 lib/libsdp.a
 lib/libsdp.la
-lib/libuclmmbase.a
-lib/libuclmmbase.la
-lib/libuclmmbase.so
-lib/libuclmmbase.so.0
-lib/libxvid.a
-lib/libxvid.la
-lib/libxvid.so
-lib/libxvid.so.0
 lib/mp4player_plugin/aac_plugin.a
 lib/mp4player_plugin/aac_plugin.la
 lib/mp4player_plugin/aac_plugin.so
 lib/mp4player_plugin/aac_plugin.so.0
+lib/mp4player_plugin/celp_plugin.a
+lib/mp4player_plugin/celp_plugin.la
+lib/mp4player_plugin/celp_plugin.so
+lib/mp4player_plugin/celp_plugin.so.0
 lib/mp4player_plugin/mp3_plugin.a
 lib/mp4player_plugin/mp3_plugin.la
 lib/mp4player_plugin/mp3_plugin.so
 lib/mp4player_plugin/mp3_plugin.so.0
+lib/mp4player_plugin/mpeg3_video_plugin.a
+lib/mp4player_plugin/mpeg3_video_plugin.la
+lib/mp4player_plugin/mpeg3_video_plugin.so
+lib/mp4player_plugin/mpeg3_video_plugin.so.0
 lib/mp4player_plugin/mpeg4_iso_plugin.a
 lib/mp4player_plugin/mpeg4_iso_plugin.la
 lib/mp4player_plugin/mpeg4_iso_plugin.so