diff options
20 files changed, 174 insertions, 322 deletions
diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index da845d239e43..999f43bf7961 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mpeg4ip -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,9 +23,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" INSTALLS_SHLIB= yes -BUILD_WRKSRC= ${WRKSRC}/lib/mp4v2 -INSTALL_WRKSRC= ${WRKSRC}/lib/mp4v2 - .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/include/systems.h) @@ -38,6 +34,7 @@ CFLAGS+= -O2 .endif post-patch: + ${TOUCH} -f ${WRKSRC}/bootstrapped # Speed up configure by not using 2 unneeded configure scripts. @${ECHO_CMD} "" > ${WRKSRC}/lib/rtp/configure @${ECHO_CMD} "" > ${WRKSRC}/lib/SDLAudio/configure @@ -45,8 +42,15 @@ post-patch: -e 's|>&/|>/|; s|-Wmissing-declarations||; \ s|-Wmissing-prototypes||' \ ${WRKSRC}/configure -pre-build: - @cd ${WRKSRC}/lib/gnu && ${MAKE} +do-build: +.for dir in lib/gnu lib/mp4av lib/mp4v2 + @(cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + +do-install: +.for dir in lib/gnu lib/mp4av lib/mp4v2 + @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) +.endfor post-install: .for i in include/mpeg4ip.h include/mpeg4ip_version.h mpeg4ip_config.h diff --git a/multimedia/mp4v2/distinfo b/multimedia/mp4v2/distinfo index 02820732b2b3..0243e6a5f5de 100644 --- a/multimedia/mp4v2/distinfo +++ b/multimedia/mp4v2/distinfo @@ -1,2 +1,2 @@ -MD5 (mpeg4ip-1.1.tar.gz) = fef0224a45485653a8db87bdd5c9e745 -SIZE (mpeg4ip-1.1.tar.gz) = 4351378 +MD5 (mpeg4ip-1.3.tar.gz) = 5a0301d3e395f17b2462ab95c2e5ba6a +SIZE (mpeg4ip-1.3.tar.gz) = 4680258 diff --git a/multimedia/mp4v2/files/patch-include::mpeg4ip.h b/multimedia/mp4v2/files/patch-include::mpeg4ip.h deleted file mode 100644 index 550c65913825..000000000000 --- a/multimedia/mp4v2/files/patch-include::mpeg4ip.h +++ /dev/null @@ -1,19 +0,0 @@ ---- include/mpeg4ip.h.orig Wed Sep 29 14:43:52 2004 -+++ include/mpeg4ip.h Wed Sep 29 14:44:10 2004 -@@ -160,14 +160,14 @@ - #include <errno.h> - #include <stdlib.h> - --#ifdef HAVE_INTTYPES_H - #include <inttypes.h> --#endif - #ifdef HAVE_STDINT_H - #include <stdint.h> - #endif -+#if 0 - #if !defined(HAVE_INTTYPES_H) || !defined(HAVE_STDINT_H) - #error "Don't have stdint.h or inttypes.h - no way to get uint8_t" -+#endif - #endif - - #include <unistd.h> diff --git a/multimedia/mp4v2/pkg-plist b/multimedia/mp4v2/pkg-plist index 51483ab5f2f2..8e64c33547e1 100644 --- a/multimedia/mp4v2/pkg-plist +++ b/multimedia/mp4v2/pkg-plist @@ -1,12 +1,31 @@ +bin/mp4art bin/mp4dump bin/mp4extract bin/mp4info bin/mp4tags bin/mp4trackdump +bin/mp4videoinfo include/mp4.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/mpeg4ip_config.h include/mpeg4ip_version.h +lib/libmp4av.a +lib/libmp4av.so +lib/libmp4av.so.0 lib/libmp4v2.a lib/libmp4v2.so lib/libmp4v2.so.0 +lib/libmpeg4ip_gnu.a +lib/libmpeg4ip_gnu.so +lib/libmpeg4ip_gnu.so.0 diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile index da845d239e43..999f43bf7961 100644 --- a/multimedia/mpeg4ip-libmp4v2/Makefile +++ b/multimedia/mpeg4ip-libmp4v2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mpeg4ip -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,9 +23,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" INSTALLS_SHLIB= yes -BUILD_WRKSRC= ${WRKSRC}/lib/mp4v2 -INSTALL_WRKSRC= ${WRKSRC}/lib/mp4v2 - .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/include/systems.h) @@ -38,6 +34,7 @@ CFLAGS+= -O2 .endif post-patch: + ${TOUCH} -f ${WRKSRC}/bootstrapped # Speed up configure by not using 2 unneeded configure scripts. @${ECHO_CMD} "" > ${WRKSRC}/lib/rtp/configure @${ECHO_CMD} "" > ${WRKSRC}/lib/SDLAudio/configure @@ -45,8 +42,15 @@ post-patch: -e 's|>&/|>/|; s|-Wmissing-declarations||; \ s|-Wmissing-prototypes||' \ ${WRKSRC}/configure -pre-build: - @cd ${WRKSRC}/lib/gnu && ${MAKE} +do-build: +.for dir in lib/gnu lib/mp4av lib/mp4v2 + @(cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + +do-install: +.for dir in lib/gnu lib/mp4av lib/mp4v2 + @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) +.endfor post-install: .for i in include/mpeg4ip.h include/mpeg4ip_version.h mpeg4ip_config.h diff --git a/multimedia/mpeg4ip-libmp4v2/distinfo b/multimedia/mpeg4ip-libmp4v2/distinfo index 02820732b2b3..0243e6a5f5de 100644 --- a/multimedia/mpeg4ip-libmp4v2/distinfo +++ b/multimedia/mpeg4ip-libmp4v2/distinfo @@ -1,2 +1,2 @@ -MD5 (mpeg4ip-1.1.tar.gz) = fef0224a45485653a8db87bdd5c9e745 -SIZE (mpeg4ip-1.1.tar.gz) = 4351378 +MD5 (mpeg4ip-1.3.tar.gz) = 5a0301d3e395f17b2462ab95c2e5ba6a +SIZE (mpeg4ip-1.3.tar.gz) = 4680258 diff --git a/multimedia/mpeg4ip-libmp4v2/files/patch-include::mpeg4ip.h b/multimedia/mpeg4ip-libmp4v2/files/patch-include::mpeg4ip.h deleted file mode 100644 index 550c65913825..000000000000 --- a/multimedia/mpeg4ip-libmp4v2/files/patch-include::mpeg4ip.h +++ /dev/null @@ -1,19 +0,0 @@ ---- include/mpeg4ip.h.orig Wed Sep 29 14:43:52 2004 -+++ include/mpeg4ip.h Wed Sep 29 14:44:10 2004 -@@ -160,14 +160,14 @@ - #include <errno.h> - #include <stdlib.h> - --#ifdef HAVE_INTTYPES_H - #include <inttypes.h> --#endif - #ifdef HAVE_STDINT_H - #include <stdint.h> - #endif -+#if 0 - #if !defined(HAVE_INTTYPES_H) || !defined(HAVE_STDINT_H) - #error "Don't have stdint.h or inttypes.h - no way to get uint8_t" -+#endif - #endif - - #include <unistd.h> diff --git a/multimedia/mpeg4ip-libmp4v2/pkg-plist b/multimedia/mpeg4ip-libmp4v2/pkg-plist index 51483ab5f2f2..8e64c33547e1 100644 --- a/multimedia/mpeg4ip-libmp4v2/pkg-plist +++ b/multimedia/mpeg4ip-libmp4v2/pkg-plist @@ -1,12 +1,31 @@ +bin/mp4art bin/mp4dump bin/mp4extract bin/mp4info bin/mp4tags bin/mp4trackdump +bin/mp4videoinfo include/mp4.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/mpeg4ip_config.h include/mpeg4ip_version.h +lib/libmp4av.a +lib/libmp4av.so +lib/libmp4av.so.0 lib/libmp4v2.a lib/libmp4v2.so lib/libmp4v2.so.0 +lib/libmpeg4ip_gnu.a +lib/libmpeg4ip_gnu.so +lib/libmpeg4ip_gnu.so.0 diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index ac1e681a7c25..5c898094431b 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mpeg4ip -PORTVERSION= 1.1 -PORTREVISION= 3 +PORTVERSION= 1.3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,6 +22,7 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \ a52.0:${PORTSDIR}/audio/liba52 \ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ + x264.1:${PORTSDIR}/multimedia/x264 \ mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 USE_GNOME= gtk20 @@ -30,7 +30,7 @@ USE_SDL= sdl USE_GMAKE= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL11 -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ @@ -54,46 +54,37 @@ MAN1= gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1 MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \ MP4AddRtpESConfigurationPacket.3 MP4AddRtpHint.3 MP4AddRtpImmediateData.3 \ MP4AddRtpPacket.3 MP4AddRtpSampleData.3 MP4AddRtpVideoHint.3 \ - MP4AddSceneTrack.3 MP4AddSystemsTrack.3 MP4AddTrack.3 \ - MP4AddTrackEdit.3 MP4AddVideoTrack.3 MP4AppendHintTrackSdp.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 MP4Create.3 MP4DeleteTrack.3 \ - MP4DeleteTrackEdit.3 MP4Dump.3 MP4FileInfo.3 MP4FindTrackId.3 \ - MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 MP4GetDuration.3 \ - MP4GetGraphicsProfileLevel.3 MP4GetHintTrackReferenceTrackId.3 \ - MP4GetHintTrackRtpPayload.3 MP4GetHintTrackSdp.3 MP4GetNumberOfTracks.3 \ - MP4GetODProfileLevel.3 MP4GetRtpHintNumberOfPackets.3 MP4GetRtpPacketBFrame.3 \ - MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 MP4GetSampleDuration.3 \ - MP4GetSampleIdFromEditTime.3 MP4GetSampleIdFromTime.3 MP4GetSampleRenderingOffset.3 \ - MP4GetSampleSize.3 MP4GetSampleSync.3 MP4GetSampleTime.3 \ - MP4GetSceneProfileLevel.3 MP4GetSessionSdp.3 MP4GetTimeScale.3 \ - MP4GetTrackAudioMpeg4Type.3 MP4GetTrackAudioType.3 MP4GetTrackBitRate.3 \ - MP4GetTrackDuration.3 MP4GetTrackESConfiguration.3 MP4GetTrackEditDuration.3 \ - MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 MP4GetTrackEditStart.3 \ - MP4GetTrackEditTotalDuration.3 MP4GetTrackFixedSampleDuration.3 MP4GetTrackMaxSampleSize.3 \ - MP4GetTrackNumberOfEdits.3 MP4GetTrackNumberOfSamples.3 MP4GetTrackTimeScale.3 \ - MP4GetTrackType.3 MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \ - MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 MP4GetVerbosity.3 \ - MP4GetVideoProfileLevel.3 MP4Info.3 MP4MakeIsmaCompliant.3 \ - MP4Modify.3 MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 MP4ReadRtpPacket.3 \ - MP4ReadSample.3 MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 \ + MP4AddSystemsTrack.3 MP4AddTrack.3 MP4AddTrackEdit.3 MP4AddVideoTrack.3 \ + MP4AppendHintTrackSdp.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 MP4Create.3 \ + MP4DeleteTrack.3 MP4DeleteTrackEdit.3 MP4Dump.3 MP4FileInfo.3 MP4FindTrackId.3 \ + MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 MP4GetDuration.3 MP4GetGraphicsProfileLevel.3 \ + MP4GetHintTrackReferenceTrackId.3 MP4GetHintTrackRtpPayload.3 MP4GetHintTrackSdp.3 \ + MP4GetNumberOfTracks.3 MP4GetODProfileLevel.3 MP4GetRtpHintNumberOfPackets.3 \ + MP4GetRtpPacketBFrame.3 MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 \ + MP4GetSampleDuration.3 MP4GetSampleIdFromEditTime.3 MP4GetSampleIdFromTime.3 \ + MP4GetSampleRenderingOffset.3 MP4GetSampleSize.3 MP4GetSampleSync.3 MP4GetSampleTime.3 \ + MP4GetSceneProfileLevel.3 MP4GetSessionSdp.3 MP4GetTimeScale.3 MP4GetTrackAudioMpeg4Type.3 \ + MP4GetTrackAudioType.3 MP4GetTrackBitRate.3 MP4GetTrackDuration.3 MP4GetTrackESConfiguration.3 \ + MP4GetTrackEditDuration.3 MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 \ + MP4GetTrackEditStart.3 MP4GetTrackEditTotalDuration.3 MP4GetTrackFixedSampleDuration.3 \ + MP4GetTrackMaxSampleSize.3 MP4GetTrackNumberOfEdits.3 MP4GetTrackNumberOfSamples.3 \ + MP4GetTrackTimeScale.3 MP4GetTrackType.3 MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 \ + MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 MP4GetVerbosity.3 MP4GetVideoProfileLevel.3 \ + MP4Info.3 MP4MakeIsmaCompliant.3 MP4Modify.3 MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 \ + MP4ReadRtpPacket.3 MP4ReadSample.3 MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 \ MP4SetAudioProfileLevel.3 MP4SetGraphicsProfileLevel.3 MP4SetHintTrackRtpPayload.3 \ - MP4SetHintTrackSdp.3 MP4SetODProfileLevel.3 MP4SetRtpTimestampStart.3 \ - MP4SetSampleRenderingOffset.3 MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 \ - MP4SetTimeScale.3 MP4SetTrackESConfiguration.3 MP4SetTrackEditDuration.3 \ - MP4SetTrackEditDwell.3 MP4SetTrackEditMediaStart.3 MP4SetTrackTimeScale.3 \ - MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 MP4WriteSample.3 + MP4SetHintTrackSdp.3 MP4SetODProfileLevel.3 MP4SetRtpTimestampStart.3 MP4SetSampleRenderingOffset.3 \ + MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 MP4SetTimeScale.3 MP4SetTrackESConfiguration.3 \ + MP4SetTrackEditDuration.3 MP4SetTrackEditDwell.3 MP4SetTrackEditMediaStart.3 \ + MP4SetTrackTimeScale.3 MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 MP4WriteRtpHint.3 \ + MP4WriteSample.3 .include <bsd.port.pre.mk> -# Build fix -.if ${OSVERSION} >= 502100 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib::sdp::sdp_decode.c -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-player::src::codec::mp3::mp3_file.cpp -.else +.if ${OSVERSION} < 500000 CFLAGS+= -O2 .endif @@ -135,7 +126,7 @@ PKG_NAME_SUFFIX+=-esound LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas .endif # xvid -.if defined(WITH_XVID) +.if !defined(WITHOUT_XVID) LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid PLIST_SUB+= XVID="" @@ -144,23 +135,28 @@ PLIST_SUB+= XVID="@comment " .endif post-patch: + ${TOUCH} -f ${WRKSRC}/bootstrapped +# ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool # don't compile or use libmp4v2 - @${REINPLACE_CMD} -e 's|mp4v2||' ${WRKSRC}/lib/Makefile.in - @${REINPLACE_CMD} -e 's|-I$(top_srcdir)/lib/mp4v2||; \ + @${REINPLACE_CMD} -e 's|mp4v2||; s|gnu||; s|mp4av||' \ + ${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|@LIBS@|@LIBS@ -lmp4v2|' \ - ${WRKSRC}/player/src/Makefile.in \ - ${WRKSRC}/lib/mpeg2t/Makefile.in \ - ${WRKSRC}/util/*/Makefile.in \ - ${WRKSRC}/server/*/Makefile.in - @${REINPLACE_CMD} -e 's|-I$(top_srcdir)/lib/mp4v2||; \ - s|../mp4v2/libmp4v2.la||; s|@LIBS@|@LIBS@ -lmp4v2|' \ - ${WRKSRC}/lib/mp4av/Makefile.in + 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|' @${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||' \ ${WRKSRC}/server/util/mp4encode/Makefile.in @${FIND} ${WRKSRC} -type f -name "*.[ch]" -or -name "*.cpp" | ${XARGS} -n 10 \ @@ -185,27 +181,17 @@ post-patch: -e 's|^(install-man.*)install-manm|\1|' \ ${WRKSRC}/doc/mp4v2/Makefile.in -# XXX - reminder for a future release -#post-configure: -# configure is not propagating PTHREAD_LIBS to the makefiles -# investigated by David Yeske <dyeske@yahoo.com> -#.if ${OSVERSION} >= 500000 -# @${REINPLACE_CMD} -E \ -# -e 's|(-lSDL-...)|${PTHREAD_LIBS} \1|' \ -# ${WRKSRC}/player/src/Makefile \ -# ${WRKSRC}/util/yuv/Makefile \ -# ${WRKSRC}/util/iptv/Makefile -#.endif - post-install: @${MKDIR} ${DATADIR} - @${INSTALL_DATA} \ + ${INSTALL_SCRIPT} ${WRKSRC}/server/util/mp4encode/mp4encode \ + ${PREFIX}/bin + ${INSTALL_DATA} \ ${WRKSRC}/server/util/mp4encode/mp4venc_template.par \ ${DATADIR} .ifndef(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for files in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/doc/${files} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${files} ${DOCSDIR} .endfor .endif diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo index 02820732b2b3..0243e6a5f5de 100644 --- a/multimedia/mpeg4ip/distinfo +++ b/multimedia/mpeg4ip/distinfo @@ -1,2 +1,2 @@ -MD5 (mpeg4ip-1.1.tar.gz) = fef0224a45485653a8db87bdd5c9e745 -SIZE (mpeg4ip-1.1.tar.gz) = 4351378 +MD5 (mpeg4ip-1.3.tar.gz) = 5a0301d3e395f17b2462ab95c2e5ba6a +SIZE (mpeg4ip-1.3.tar.gz) = 4680258 diff --git a/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c b/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c deleted file mode 100644 index 08933c2df331..000000000000 --- a/multimedia/mpeg4ip/files/extra-patch-lib::sdp::sdp_decode.c +++ /dev/null @@ -1,29 +0,0 @@ ---- lib/sdp/sdp_decode.c.orig Tue Feb 24 15:54:20 2004 -+++ lib/sdp/sdp_decode.c Mon Nov 22 20:17:07 2004 -@@ -378,7 +378,7 @@ - q = NULL; - while (p != NULL) { - if (new->adj_time == p->adj_time) { -- sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", p->adj_time); -+ sdp_debug(LOG_NOTICE, "Duplicate time %ld in adj description", (long)p->adj_time); - free(new); - return (start); - } -@@ -1558,6 +1558,7 @@ - int valid; - time_adj_desc_t *start_aptr, *aptr; - time_t adj_time; -+ long adj_time_l; - int32_t offset; - int possign; - int err; -@@ -1580,7 +1581,8 @@ - continue; - } - // process <adjustment time> - adjust it from NTP to unix time -- sscanf(sep, "%ld", &adj_time); -+ sscanf(sep, "%ld", &adj_time_l); -+ adj_time = adj_time_l; - - // Check for negative sign for offset. - ADV_SPACE(lptr); diff --git a/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp b/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp deleted file mode 100644 index 5a1bed279202..000000000000 --- a/multimedia/mpeg4ip/files/extra-patch-player::src::codec::mp3::mp3_file.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- player/src/codec/mp3/mp3_file.cpp.orig Wed Sep 29 00:24:31 2004 -+++ player/src/codec/mp3/mp3_file.cpp Wed Sep 29 00:28:47 2004 -@@ -126,6 +126,7 @@ - descptr[1] = strdup(desc); - CHECK_AND_FREE(ret); - } -+ ret = ID3_v1_genre_description[NULL]; - ret = ID3_GetAlbum(&myTag); - if (ret) { - diff --git a/multimedia/mpeg4ip/files/patch-common::video::libmpeg32::video::Makefile.in b/multimedia/mpeg4ip/files/patch-common::video::libmpeg32::video::Makefile.in deleted file mode 100644 index 9990806a0e5f..000000000000 --- a/multimedia/mpeg4ip/files/patch-common::video::libmpeg32::video::Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ ---- common/video/libmpeg32/video/Makefile.in.orig Tue Sep 28 23:54:37 2004 -+++ common/video/libmpeg32/video/Makefile.in Tue Sep 28 23:55:25 2004 -@@ -290,11 +290,11 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/seek.Plo ./$(DEPDIR)/slice.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/vlc.Plo - CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) --LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ -+LTCCASCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CCAS) $(AM_CCASFLAGS) \ - $(CCASFLAGS) - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ diff --git a/multimedia/mpeg4ip/files/patch-common::video::mpeg4-2000::idct::idct.hpp b/multimedia/mpeg4ip/files/patch-common::video::mpeg4-2000::idct::idct.hpp deleted file mode 100644 index 14a143f5c2d7..000000000000 --- a/multimedia/mpeg4ip/files/patch-common::video::mpeg4-2000::idct::idct.hpp +++ /dev/null @@ -1,12 +0,0 @@ ---- common/video/mpeg4-2000/idct/idct.hpp.orig Thu Sep 30 01:01:36 2004 -+++ common/video/mpeg4-2000/idct/idct.hpp Thu Sep 30 01:01:56 2004 -@@ -22,6 +22,9 @@ - #ifndef _INT_IDCT_ - #define _INT_IDCT_ 1 - -+#ifndef BLOCK_SIZE -+#define BLOCK_SIZE 5 -+#endif - - #define IDCT_BLOCK_SIZE 8 - class idct{ diff --git a/multimedia/mpeg4ip/files/patch-configure b/multimedia/mpeg4ip/files/patch-configure index 954f794c861e..ac538a3ecee4 100644 --- a/multimedia/mpeg4ip/files/patch-configure +++ b/multimedia/mpeg4ip/files/patch-configure @@ -1,14 +1,13 @@ ---- configure.orig Thu Dec 2 15:36:17 2004 -+++ configure Thu Dec 2 15:36:51 2004 -@@ -23179,7 +23179,11 @@ - echo "$as_me:$LINENO: checking libmpeg2 version" >&5 - echo $ECHO_N "checking libmpeg2 version... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -+#if defined(__FreeBSD__) && __FreeBSD__ < 5 -+#include <inttypes.h> -+#else - #include <stdint.h> -+#endif - #include <mpeg2dec/mpeg2.h> - - #ifndef MPEG2_VERSION +--- configure.orig Thu May 19 04:55:17 2005 ++++ configure Thu May 19 04:56:09 2005 +@@ -26062,8 +26062,8 @@ + if test x$have_ffmpeg_arg = xtrue; then + { echo "$as_me:$LINENO: have enable ffmpeg $enable_ffmpeg" >&5 + echo "$as_me: have enable ffmpeg $enable_ffmpeg" >&6;} +- FFMPEG_INC=-I${enable_ffmpeg}/libavcodec +- FFMPEG_LIB="${enable_ffmpeg}/libavcodec/libavcodec.a -lz" ++ FFMPEG_INC=-I${enable_ffmpeg}/include/ffmpeg ++ FFMPEG_LIB="${enable_ffmpeg}/lib/libavcodec.a -lz" + saveCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $FFMPEG_INC" + echo "$as_me:$LINENO: checking for AVRational" >&5 diff --git a/multimedia/mpeg4ip/files/patch-gcc34 b/multimedia/mpeg4ip/files/patch-gcc34 deleted file mode 100644 index 8c485c15e72c..000000000000 --- a/multimedia/mpeg4ip/files/patch-gcc34 +++ /dev/null @@ -1,45 +0,0 @@ ---- common/video/mpeg4-2000/tools/entropy/huffman.cpp.orig Tue Sep 28 22:51:26 2004 -+++ common/video/mpeg4-2000/tools/entropy/huffman.cpp Tue Sep 28 22:51:47 2004 -@@ -243,9 +243,6 @@ - Void CHuffmanTree::printStatistics (Double dEntropy, Double dNOfBits, ostream &stream) - { - stream<<endl<<endl; -- stream<<"//Entropy Per Symbol : "<<dEntropy<<endl; -- stream<<"//Bits Per Symbol : "<<dNOfBits<<endl; -- stream<<"//Table Efficiency : "<<dEntropy/dNOfBits<<endl; - } - - Int CHuffmanCoDec::makeIndexFromSymbolInTable(istream &huffmanTable) ---- common/video/mpeg4-2000/tools/entropy/bitstrm.cpp.orig Tue Sep 28 22:56:07 2004 -+++ common/video/mpeg4-2000/tools/entropy/bitstrm.cpp Tue Sep 28 22:56:25 2004 -@@ -323,7 +323,6 @@ - if (m_pstrmTrace != NULL) { - m_pstrmTrace->width (20); - (*m_pstrmTrace) << rgchSymbolName << "= "; -- (*m_pstrmTrace) << fltValue << "\n"; - m_pstrmTrace->flush (); - } - } -@@ -356,8 +355,6 @@ - if (m_pstrmTrace != NULL) { - m_pstrmTrace->width (20); - (*m_pstrmTrace) << rgchSymbolName << "= "; -- (*m_pstrmTrace) << vctValue.x << ", "; -- (*m_pstrmTrace) << vctValue.y << "\n "; - m_pstrmTrace->flush (); - } - } ---- common/video/mpeg4-2000/sys/mode.cpp.orig Tue Sep 28 23:05:10 2004 -+++ common/video/mpeg4-2000/sys/mode.cpp Tue Sep 28 23:05:59 2004 -@@ -409,12 +409,6 @@ - // if (bVOPPrint) - cout << "\t" << "Shape:" << "\t\t\t" << nBitsShape << "\n"; - cout << "\t" << "Total:" << "\t\t\t" << nBitsTotal << "\n"; -- cout << "\t" << "SNR Y:" << "\t\t\t" << dSNRY / nVOPs << " dB\n"; -- cout << "\t" << "SNR U:" << "\t\t\t" << dSNRU / nVOPs << " dB\n"; -- cout << "\t" << "SNR V:" << "\t\t\t" << dSNRV / nVOPs << " dB\n"; -- for(Int iAuxComp=0;iAuxComp<m_iAuxCompCount;iAuxComp++) // MAC (SB) 26-Nov-99 -- cout << "\t" << "SNR A[" << iAuxComp << "]:" << "\t\t" << dSNRA[iAuxComp] / nVOPs << " dB\n"; -- cout << "\n\t" << "average Qp:" << "\t\t" << (Double)nQp / nQMB << "\n\n"; - cout.flush (); - } diff --git a/multimedia/mpeg4ip/files/patch-include::mpeg4ip.h b/multimedia/mpeg4ip/files/patch-include::mpeg4ip.h deleted file mode 100644 index 550c65913825..000000000000 --- a/multimedia/mpeg4ip/files/patch-include::mpeg4ip.h +++ /dev/null @@ -1,19 +0,0 @@ ---- include/mpeg4ip.h.orig Wed Sep 29 14:43:52 2004 -+++ include/mpeg4ip.h Wed Sep 29 14:44:10 2004 -@@ -160,14 +160,14 @@ - #include <errno.h> - #include <stdlib.h> - --#ifdef HAVE_INTTYPES_H - #include <inttypes.h> --#endif - #ifdef HAVE_STDINT_H - #include <stdint.h> - #endif -+#if 0 - #if !defined(HAVE_INTTYPES_H) || !defined(HAVE_STDINT_H) - #error "Don't have stdint.h or inttypes.h - no way to get uint8_t" -+#endif - #endif - - #include <unistd.h> diff --git a/multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h b/multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h deleted file mode 100644 index 3677f0259efc..000000000000 --- a/multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/files/patch-player::src::mpeg3_rtp_bytestream.cpp b/multimedia/mpeg4ip/files/patch-player::src::mpeg3_rtp_bytestream.cpp deleted file mode 100644 index 43f23b9841cd..000000000000 --- a/multimedia/mpeg4ip/files/patch-player::src::mpeg3_rtp_bytestream.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- player/src/mpeg3_rtp_bytestream.cpp.orig Thu Sep 30 03:10:31 2004 -+++ player/src/mpeg3_rtp_bytestream.cpp Thu Sep 30 03:09:12 2004 -@@ -32,6 +32,10 @@ - #else - #define rtp_message(loglevel, fmt...) message(loglevel, "rtpbyst", fmt) - #endif -+ -+uint8_t temp_ref; -+int frame_type; -+ - static rtp_packet *end_of_pak (rtp_packet *start) - { - while (start->rtp_next->rtp_pak_ts == start->rtp_pak_ts) -@@ -74,7 +78,6 @@ - int32_t diff; - int correct_hdr; - int dropped_seq; -- uint8_t temp_ref; - diff = m_buffer_len - m_bytes_used; - - if (diff > 2) { -@@ -86,7 +89,6 @@ - #endif - return (m_last_realtime); - } -- int frame_type; - m_buffer_len = 0; - dropped_seq = 0; - while (finished == 0) { diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist index cfa49ec34a05..d97a81a19944 100644 --- a/multimedia/mpeg4ip/pkg-plist +++ b/multimedia/mpeg4ip/pkg-plist @@ -9,34 +9,35 @@ bin/mp4player bin/mpeg2video_parse bin/mpeg4ip-config bin/mpeg4vol +bin/mpeg_ps_extract +bin/mpeg_ps_info bin/rgb2yuv +bin/sdl_pcm_play bin/yuvdump include/codec_plugin.h -include/mp4av.h -include/mp4av_aac.h -include/mp4av_adts.h -include/mp4av_audio.h -include/mp4av_hinters.h -include/mp4av_mp3.h -include/mp4av_mpeg3.h -include/mp4av_mpeg4.h +include/h264_sdp.h include/mpeg4_audio_config.h include/mpeg4_sdp.h +include/mpeg4ip_bitstream.h include/mpeg4ip_byteswap.h include/mpeg4ip_config_set.h include/mpeg4ip_getopt.h include/rtp_plugin.h include/sdp.h include/sdp_error.h +include/text_plugin.h +lib/libh264util.a +lib/libh264util.so +lib/libh264util.so.0 lib/libhttp.a lib/libhttp.so lib/libhttp.so.0 +lib/libismacryp.a +lib/libismacryp.so +lib/libismacryp.so.0 lib/libmp4.a lib/libmp4.so lib/libmp4.so.0 -lib/libmp4av.a -lib/libmp4av.so -lib/libmp4av.so.0 lib/libmp4util.a lib/libmp4util.so lib/libmp4util.so.0 @@ -44,6 +45,21 @@ lib/libmpeg4ipSDL-1.2.so lib/libmpeg4ipSDL-1.2.so.7 lib/libmpeg4ipSDL.la lib/libmpeg4ipSDL.so +lib/libmpeg4ip_celp.a +lib/libmpeg4ip_celp.so +lib/libmpeg4ip_celp.so.0 +lib/libmpeg4ip_celpbs.a +lib/libmpeg4ip_celpbs.so +lib/libmpeg4ip_celpbs.so.0 +lib/libmpeg4ip_faad.a +lib/libmpeg4ip_faad.so +lib/libmpeg4ip_faad.so.0 +lib/libmpeg4ip_fposrec.a +lib/libmpeg4ip_fposrec.so +lib/libmpeg4ip_fposrec.so.0 +lib/libmpeg4ip_mpeg4_iso.la +lib/libmpeg4ip_mpeg4_iso.so +lib/libmpeg4ip_mpeg4_iso.so.0 lib/libmsg_queue.a lib/libmsg_queue.so lib/libmsg_queue.so.0 @@ -56,10 +72,22 @@ lib/mp4player_plugin/aac_plugin.so lib/mp4player_plugin/aac_plugin.so.0 lib/mp4player_plugin/celp_plugin.so lib/mp4player_plugin/celp_plugin.so.0 +lib/mp4player_plugin/ffmpeg_audio_plugin.so +lib/mp4player_plugin/ffmpeg_audio_plugin.so.0 +lib/mp4player_plugin/ffmpeg_video_plugin.so +lib/mp4player_plugin/ffmpeg_video_plugin.so.0 +lib/mp4player_plugin/g711_audio_plugin.so +lib/mp4player_plugin/g711_audio_plugin.so.0 lib/mp4player_plugin/h261_plugin.so lib/mp4player_plugin/h261_plugin.so.0 lib/mp4player_plugin/h261_rtp_plugin.so lib/mp4player_plugin/h261_rtp_plugin.so.0 +lib/mp4player_plugin/h264_rtp_plugin.so +lib/mp4player_plugin/h264_rtp_plugin.so.0 +lib/mp4player_plugin/href_rtp_plugin.so +lib/mp4player_plugin/href_rtp_plugin.so.0 +lib/mp4player_plugin/href_text_plugin.so +lib/mp4player_plugin/href_text_plugin.so.0 lib/mp4player_plugin/isma_enc_rtp_plugin.so lib/mp4player_plugin/isma_enc_rtp_plugin.so.0 lib/mp4player_plugin/isma_enc_video_rtp_plugin.so @@ -70,14 +98,18 @@ lib/mp4player_plugin/mp3_plugin.so lib/mp4player_plugin/mp3_plugin.so.0 lib/mp4player_plugin/mpeg2dec_video_plugin.so lib/mp4player_plugin/mpeg2dec_video_plugin.so.0 -lib/mp4player_plugin/mpeg3_video_plugin.so -lib/mp4player_plugin/mpeg3_video_plugin.so.0 lib/mp4player_plugin/mpeg4_iso_plugin.so lib/mp4player_plugin/mpeg4_iso_plugin.so.0 +lib/mp4player_plugin/plaintext_text_plugin.so +lib/mp4player_plugin/plaintext_text_plugin.so.0 lib/mp4player_plugin/raw_audio_plugin.so lib/mp4player_plugin/raw_audio_plugin.so.0 lib/mp4player_plugin/raw_video_plugin.so lib/mp4player_plugin/raw_video_plugin.so.0 +lib/mp4player_plugin/rfc2429_rtp_plugin.so +lib/mp4player_plugin/rfc2429_rtp_plugin.so.0 +lib/mp4player_plugin/rfc3267_plugin.so +lib/mp4player_plugin/rfc3267_plugin.so.0 lib/mp4player_plugin/wav_plugin.so lib/mp4player_plugin/wav_plugin.so.0 %%XVID%%lib/mp4player_plugin/xvid10_plugin.so @@ -85,4 +117,3 @@ lib/mp4player_plugin/wav_plugin.so.0 %%DATADIR%%/mp4venc_template.par @dirrm %%DATADIR%% @dirrm lib/mp4player_plugin -@unexec rmdir %D/share/doc/mpeg4ip 2>/dev/null || true |