Index: branches/2018Q1/multimedia/avidemux/Makefile =================================================================== --- branches/2018Q1/multimedia/avidemux/Makefile (revision 465662) +++ branches/2018Q1/multimedia/avidemux/Makefile (revision 465663) @@ -1,50 +1,50 @@ # Created by: Anish Mistry (with help from mean) # $FreeBSD$ # assuming freebsd always has 16 byte aligned malloc as macos does. is this true? # nls files not getting installed with nls=on. are they getting built? # sync port options with current software options PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 8 +PORTREVISION= 10 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor .include "${.CURDIR}/Makefile.common" .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4} PLIST_FILES+= ${DATADIR}/${PORTNAME}.png .endif .if ${PORT_OPTIONS:MGTK2} PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}.desktop .endif .if ${PORT_OPTIONS:MQT4} PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}_qt4.desktop .endif CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux_core post-configure: post-configure-common post-install: .if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} @${MKDIR} "${STAGEDIR}${DATADIR}" ${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png" .if ${PORT_OPTIONS:MGTK3} @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \ < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}" .endif .if ${PORT_OPTIONS:MQT4} @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \ < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}" .endif .endif .include Index: branches/2018Q1/multimedia/avidemux/Makefile.common =================================================================== --- branches/2018Q1/multimedia/avidemux/Makefile.common (revision 465662) +++ branches/2018Q1/multimedia/avidemux/Makefile.common (revision 465663) @@ -1,287 +1,286 @@ # $FreeBSD$ -PORTREVISION?= 4 AVIDEMUX_VERSION= 2.6.11 MASTER_SITES= \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} BUILD_DEPENDS+= yasm:devel/yasm \ bash:shells/bash LIB_DEPENDS+= libmad.so:audio/libmad \ libdca.so:multimedia/libdca \ libpng.so:graphics/png LICENSE= GPLv2 USE_GNOME= libxml2 USE_QT4= # empty OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options USES= cmake:outsource,noninja pkgconfig iconv gmake compiler:features sqlite USES+= dos2unix DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake \ avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \ avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none CMAKE_ARGS+= -DQT5:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= yes # ARCH BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \ PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU OPTIONS_DEFAULT= QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ SDL FAAD VDPAU VORBIS OPTIONS_SUB= yes CLI_DESC= Build CLI tool FRIBIDI_CMAKE_OFF= -DFRIDIBI:BOOL=OFF FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi OPUS_CMAKE_OFF= -DOPUS:BOOL=OFF OPUS_LIB_DEPENDS= libopus.so:audio/opus TWOLAME_CMAKE_OFF= -DTWOLAME:BOOL=OFF TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame .if !defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= LAME FAAC AMR X264 .endif .include .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" . if ${PORT_OPTIONS:MQT4} PLIST_SUB+= QT_NLS="" . else PLIST_SUB+= QT_NLS="@comment " . endif .else CMAKE_ARGS+= -DNO_NLS:BOOL=ON PLIST_SUB+= NLS="@comment " QT_NLS="@comment " .endif # for libexecinfo: (so that __builtin_frame_address() finds the top # of the stack) .if ${ARCH} == amd64 CFLAGS+= -fno-omit-frame-pointer #MAKE_ENV+= ARCH=x86_64 #CONFIGURE_ENV+= ARCH=x86_64 .endif CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=/usr/include CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo # We haven't ALSA(Never) & Aften(Yet) on FreeBSD CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF .if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MQT4) CMAKE_ARGS+= -DX11:BOOL=OFF .else USE_GNOME+= libxslt .endif .if ${PORT_OPTIONS:MGTK3} USE_GNOME+= gnomeprefix gtk30 PLIST_SUB+= GTK="" .else CMAKE_ARGS+= -DGTK:BOOL=OFF PLIST_SUB+= GTK="@comment " .endif .if ${PORT_OPTIONS:MQT4} USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build gui PLIST_SUB+= QT4="" .else CMAKE_ARGS+= -DQT4:BOOL=OFF PLIST_SUB+= QT4="@comment " .endif .if ${PORT_OPTIONS:MCLI} PLIST_SUB+= CLI="" .else PLIST_SUB+= CLI="@comment " .endif .if ${PORT_OPTIONS:MOSS} CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=ON .else CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=OFF .endif .if ${PORT_OPTIONS:MESOUND} USE_GNOME+= esound PLIST_SUB+= ESD="" .else CMAKE_ARGS+= -DESD:BOOL=OFF PLIST_SUB+= ESD="@comment " .endif .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= libjack.so:audio/jack PLIST_SUB+= JACK="" .else CMAKE_ARGS+= -DJACK:BOOL=OFF PLIST_SUB+= JACK="@comment " .endif .if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= libpulse.so:audio/pulseaudio PLIST_SUB+= PULSE="" .else CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF PLIST_SUB+= PULSE="@comment " .endif .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= libfreetype.so:print/freetype2 PLIST_SUB+= FREETYPE="" .else CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF PLIST_SUB+= FREETYPE="@comment " .endif .if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig .else CMAKE_ARGS+= -DFONTCONFIG:BOOL=OFF .endif .if ${PORT_OPTIONS:MXVIDEO} #LIB_DEPENDS+= Xv:x11/libXv USE_XORG+= xv .else CMAKE_ARGS+= -DXVIDEO:BOOL=OFF .endif .if ${PORT_OPTIONS:MFAAC} LIB_DEPENDS+= libfaac.so:audio/faac PLIST_SUB+= FAAC="" .else CMAKE_ARGS+= -DFAAC:BOOL=OFF PLIST_SUB+= FAAC="@comment " .endif .if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= libmp3lame.so:audio/lame PLIST_SUB+= LAME="" .else CMAKE_ARGS+= -DLAME:BOOL=OFF PLIST_SUB+= LAME="@comment " .endif .if ${PORT_OPTIONS:MFAAD} LIB_DEPENDS+= libfaad.so:audio/faad PLIST_SUB+= FAAD="" .else CMAKE_ARGS+= -DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF PLIST_SUB+= FAAD="@comment " .endif .if ${PORT_OPTIONS:MX264} LIB_DEPENDS+= libx264.so:multimedia/libx264 PLIST_SUB+= X264="" .else CMAKE_ARGS+= -DX264:BOOL=OFF PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MX265} LIB_DEPENDS+= libx265.so:multimedia/x265 PLIST_SUB+= X265="" .else CMAKE_ARGS+= -DX265:BOOL=OFF PLIST_SUB+= X265="@comment " .endif .if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= libvpx.so:multimedia/libvpx PLIST_SUB+= VPX="" .else CMAKE_ARGS+= -DVPXDEC:BOOL=OFF PLIST_SUB+= VPX="@comment " .endif .if ${PORT_OPTIONS:MXVID} LIB_DEPENDS+= libxvidcore.so:multimedia/xvid PLIST_SUB+= XVID="" .else CMAKE_ARGS+= -DXVID:BOOL=OFF PLIST_SUB+= XVID="@comment " .endif .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl PLIST_SUB+= SDL="" .else CMAKE_ARGS+= -DSDL:BOOL=OFF PLIST_SUB+= SDL="@comment " .endif .if ${PORT_OPTIONS:MVAAPI} LIB_DEPENDS+= libva.so:multimedia/libva PLIST_SUB+= VAAPI="" .else CMAKE_ARGS+= -DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF PLIST_SUB+= VAAPI="@comment " .endif .if ${PORT_OPTIONS:MVDPAU} LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau PLIST_SUB+= VDPAU="" .else CMAKE_ARGS+= -DVDPAU:BOOL=OFF PLIST_SUB+= VDPAU="@comment " .endif .if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbis.so:audio/libvorbis PLIST_SUB+= VORBIS="" .else CMAKE_ARGS+= -DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF PLIST_SUB+= VORBIS="@comment " .endif .if ${PORT_OPTIONS:MAMR} LIB_DEPENDS+= libopencore-amrnb.so:audio/opencore-amr PLIST_SUB+= AMRNB="" PLIST_SUB+= AMRWB="" .else CMAKE_ARGS+= -DOPENCORE_AMRNB:BOOL=OFF PLIST_SUB+= AMRNB="@comment " CMAKE_ARGS+= -DOPENCORE_AMRWB:BOOL=OFF PLIST_SUB+= AMRWB="@comment " .endif .include # is this kosher? the result seems to run tho... (see ports/185997) .if $(COMPILER_FEATURES:Mlibc++) LDFLAGS+= -lc++ .endif #.if ${COMPILER_TYPE} == clang USE_GCC= yes #.endif .if ${ARCH} == aarch64 BROKEN= cmake/admDetermineSystem.cmake:78: CPU not supported .elif ${ARCH} == powerpc || ${ARCH} == sparc64 BROKEN= Does not compile on powerpc or sparc64 .endif post-patch: @${MKDIR} ${CONFIGURE_WRKSRC}/config @${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config @${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt post-configure-common: @${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||g' Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp (revision 465663) @@ -0,0 +1,53 @@ +--- avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp +@@ -144,7 +144,7 @@ bool tsPacket::setPos(uint64_t pos) + { + if(!_file->setpos(pos)) + { +- printf("[tsPacket] Cannot seek to %"PRIx64"\n", pos); ++ printf("[tsPacket] Cannot seek to %" PRIx64"\n", pos); + return false; + } + return true; +@@ -387,7 +387,7 @@ nextPack3: + zprintf("[TS Demuxer] Code=0x%x pid=0x%x\n",code,pes->pid); + if((code&0xffffff00)!=0x100) + { +- printf("[Ts Demuxer] No PES startcode at 0x%"PRIx64"\n",pkt.startAt); ++ printf("[Ts Demuxer] No PES startcode at 0x%" PRIx64"\n",pkt.startAt); + printf("0x:%02x %02x %02x %02x\n",pkt.payload[4],pkt.payload[5],pkt.payload[6],pkt.payload[7]); + goto nextPack3; + } +@@ -433,7 +433,7 @@ nextPack3: + /** + \fn decodePesHeader + */ +-#define fail(x) {printf("[Ts Demuxer]*********"x"*******\n");return false;} ++#define fail(x) {printf("[Ts Demuxer]*********" x"*******\n");return false;} + bool tsPacket::decodePesHeader(TS_PESpacket *pes) + { + uint8_t *start=pes->payload+6; +@@ -735,7 +735,7 @@ bool tsPacketLinear::read(uint32_t le + */ + bool tsPacketLinear::getInfo(dmxPacketInfo *info) + { +-#warning FIXME ++//#warning FIXME + if(pesPacket->offset<4) + { + info->startAt=this->oldStartAt; +@@ -780,12 +780,12 @@ bool tsPacketLinear::seek(uint64_t pa + { + if(!_file->setpos(packetStart)) + { +- printf("[tsPacket] Cannot seek to %"PRIx64"\n",packetStart); ++ printf("[tsPacket] Cannot seek to %" PRIx64"\n",packetStart); + return 0; + } + if(!refill()) + { +- printf("[tsPacketLinear] Seek to %"PRIx64":%"PRIx32" failed\n",packetStart,offset); ++ printf("[tsPacketLinear] Seek to %" PRIx64":%" PRIx32" failed\n",packetStart,offset); + return false; + } + ADM_assert(offsetpayloadSize); Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp (revision 465663) @@ -0,0 +1,11 @@ +--- avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp +@@ -44,7 +44,7 @@ typedef struct + + static const dvProfileClass supportedProfiles[]= + { +- {720,480,29.97,dvColor422}, ++ {720,480,30,dvColor422}, + {720,576,25,dvColor420}, + }; + Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h (revision 465663) @@ -0,0 +1,14 @@ +--- avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h +@@ -43,9 +43,9 @@ + 0, /* max_b_frames */ \ + 0, /* mpeg_quant */ \ + 1, /* is_luma_elim_threshold */ \ +- -2, /* luma_elim_threshold */ \ ++ 0, /* luma_elim_threshold */ \ + 1, /* is_chroma_elim_threshold */ \ +- -5, /* chroma_elim_threshold */ \ ++ 0, /* chroma_elim_threshold */ \ + 0.05, /*lumi_masking */ \ + 1, /* is lumi */ \ + 0.01, /*dark_masking */ \ Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h (revision 465663) @@ -0,0 +1,14 @@ +--- avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h +@@ -53,9 +53,9 @@ enum + 2, /* max_b_frames */ \ + 1, /* mpeg_quant */ \ + 1, /* is_luma_elim_threshold */ \ +- -2, /* luma_elim_threshold */ \ ++ 0, /* luma_elim_threshold */ \ + 1, /* is_chroma_elim_threshold */ \ +- -5, /* chroma_elim_threshold */ \ ++ 0, /* chroma_elim_threshold */ \ + 0.05, /*lumi_masking */ \ + 1, /* is lumi */ \ + 0.01, /*dark_masking */ \ Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h (revision 465663) @@ -0,0 +1,14 @@ +--- avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h +@@ -43,9 +43,9 @@ + 2, /* max_b_frames */ \ + 0, /* mpeg_quant */ \ + 1, /* is_luma_elim_threshold */ \ +- -2, /* luma_elim_threshold */ \ ++ 0, /* luma_elim_threshold */ \ + 1, /* is_chroma_elim_threshold */ \ +- -5, /* chroma_elim_threshold */ \ ++ 0, /* chroma_elim_threshold */ \ + 0.05, /*lumi_masking */ \ + 1, /* is lumi */ \ + 0.01, /*dark_masking */ \ Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp (revision 465663) @@ -0,0 +1,34 @@ +--- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp +@@ -173,7 +173,7 @@ again: + //return false; + }else + { +- //printf("[PPPP] x264 Incoming : %"PRIu64"us \n",image->Pts); ++ //printf("[PPPP] x264 Incoming : %" PRIu64"us \n",image->Pts); + // 2-preamble + if(false==preAmble(image)) + { +@@ -289,11 +289,11 @@ bool x264Encoder::postAmble (ADMBitstrea + } + //------ + aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts); +- aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts, ++ aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts, + out->pts-out->dts); + if(out->dts>out->pts) + { +- ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n", ++ ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n", + out->dts,out->pts); + if(picout->i_type!=X264_TYPE_B && picout->i_type!=X264_TYPE_BREF) + { +@@ -341,7 +341,7 @@ bool x264Encoder::postAmble (ADMBitstrea + ADM_error ("[x264] Unknown image type: %d\n", picout->i_type); + //ADM_assert(0); + } +- //printf("[OOOO] x264 Outgoing : %"PRIu64"us \n",out->dts); ++ //printf("[OOOO] x264 Outgoing : %" PRIu64"us \n",out->dts); + out->out_quantizer = picout->i_qpplus1; + return true; + } Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h (revision 465663) @@ -0,0 +1,11 @@ +--- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h +@@ -108,7 +108,7 @@ extern "C" + 1.0, /* float rate_tolerance; */ \ + 0, /* uint32_t vbv_max_bitrate; */ \ + 0, /* uint32_t vbv_buffer_size; */ \ +- 0.9, /* uint32_t vbv_buffer_init; */ \ ++ 1, /* uint32_t vbv_buffer_init; */ \ + 1.4, /* float ip_factor; */ \ + 1.3, /* float pb_factor; */ \ + 1, /* uint32_t aq_mode; */ \ Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp (revision 465663) @@ -0,0 +1,11 @@ +--- avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp +@@ -38,7 +38,7 @@ typedef struct + }idcToken; + + static const idcToken listOfIdc[]={ +- {-1,"Auto"}, ++ {(unsigned int)-1,"Auto"}, + {10,"1"}, + {11,"1.1"}, + {12,"1.2"}, Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp (revision 465663) @@ -0,0 +1,16 @@ +--- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp +@@ -284,11 +284,11 @@ bool x265Encoder::postAmble (ADMBitstrea + } + //------ + aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts); +- aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts, ++ aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts, + out->pts-out->dts); + if(out->dts>out->pts) + { +- ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n", ++ ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n", + out->dts,out->pts); + if(picout->sliceType!=X265_TYPE_B && picout->sliceType!=X265_TYPE_BREF) + { Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h (revision 465663) @@ -0,0 +1,11 @@ +--- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h +@@ -85,7 +85,7 @@ extern "C" + 1.0, /* float rate_tolerance; */ \ + 0, /* uint32_t vbv_max_bitrate; */ \ + 0, /* uint32_t vbv_buffer_size; */ \ +- 0.9, /* uint32_t vbv_buffer_init; */ \ ++ 1, /* uint32_t vbv_buffer_init; */ \ + 1.4, /* float ip_factor; */ \ + 1.3, /* float pb_factor; */ \ + 2, /* uint32_t aq_mode; */ \ Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp (revision 465663) @@ -0,0 +1,11 @@ +--- avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp +@@ -38,7 +38,7 @@ typedef struct + }idcToken; + + static const idcToken listOfIdc[]={ +- {-1,"Auto"}, ++ {(unsigned int)-1,"Auto"}, + {10,"1"}, + {20,"2"}, + {21,"2.1"}, Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp (revision 465663) @@ -0,0 +1,20 @@ +--- avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp +@@ -54,7 +54,7 @@ typedef enum + RD_SQUARE = RD_HPEL_QPEL_8 | XVID_ME_EXTSEARCH_RD + } RateDistortionMode; + +-uint32_t rdMode[5]= ++int32_t rdMode[5]= + { + RD_NONE, + RD_DCT_ME, +@@ -332,7 +332,7 @@ again: + // Store Pts/DTS + ADM_timeMapping map; // Store real PTS <->lav value mapping + map.realTS=image->Pts+getEncoderDelay(); +- aprintf("Pushing fn=%d Time=%"PRIu64"\n",frameNum,map.realTS); ++ aprintf("Pushing fn=%d Time=%" PRIu64"\n",frameNum,map.realTS); + + map.internalTS=frameNum++; + mapper.push_back(map); Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp =================================================================== --- branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp (nonexistent) +++ branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp (revision 465663) @@ -0,0 +1,29 @@ +--- avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp +@@ -240,7 +240,7 @@ teleCide *_param=&configuration; + { + // The chosen frame doesn't match the prediction. + if (predicted_metric == 0) mismatch = 0.0; +- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric; ++ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric; + if (mismatch < gthresh) + { + // It's close enough, so use the predicted one. +@@ -283,7 +283,7 @@ teleCide *_param=&configuration; + { + // The chosen frame doesn't match the prediction. + if (predicted_metric == 0) mismatch = 0.0; +- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric; ++ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric; + if ((int) mismatch <= gthresh) + { + // It's close enough, so use the predicted one. +@@ -394,7 +394,7 @@ teleCide *_param=&configuration; + { + unsigned char *dstpp, *dstpn; + int v1, v2, z; +- #warning blend in place is wrong! ++ //#warning blend in place is wrong! + final=dst; + // MeanX:We should copy here as we blend from source and destination + // for the moment we do it in place, it is wrong. Property changes on: branches/2018Q1/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/multimedia/avidemux-cli/Makefile =================================================================== --- branches/2018Q1/multimedia/avidemux-cli/Makefile (revision 465662) +++ branches/2018Q1/multimedia/avidemux-cli/Makefile (revision 465663) @@ -1,24 +1,25 @@ # $FreeBSD$ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} +PORTREVISION= 6 CATEGORIES= multimedia PKGNAMESUFFIX= -cli MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor (cli) LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux MASTERDIR= ${.CURDIR}/../avidemux PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile.common" CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux/cli CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}" post-configure: post-configure-common .include Index: branches/2018Q1/multimedia/avidemux-plugins/Makefile =================================================================== --- branches/2018Q1/multimedia/avidemux-plugins/Makefile (revision 465662) +++ branches/2018Q1/multimedia/avidemux-plugins/Makefile (revision 465663) @@ -1,44 +1,43 @@ # Created by: Anish Mistry (with help from mean) # $FreeBSD$ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} +PORTREVISION= 6 CATEGORIES= multimedia PKGNAMESUFFIX= -plugins MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor (Plugins) LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux - -BROKEN= fails to build MASTERDIR= ${.CURDIR}/../avidemux PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile.common" CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux_plugins #CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}" -DAVIDEMUX_CORECONFIG_DIR=${CONFIGURE_WRKSRC}/config CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}" CMAKE_ARGS+= -DPLUGIN_UI=ALL .if ${PORT_OPTIONS:MCLI} BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli .endif .if ${PORT_OPTIONS:MQT4} BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/qt4/config.h:multimedia/avidemux-qt4 RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/qt4/config.h:multimedia/avidemux-qt4 .endif .if ${PORT_OPTIONS:MGTK3} BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk .endif post-configure: post-configure-common .include Index: branches/2018Q1/multimedia/avidemux-qt4/Makefile =================================================================== --- branches/2018Q1/multimedia/avidemux-qt4/Makefile (revision 465662) +++ branches/2018Q1/multimedia/avidemux-qt4/Makefile (revision 465663) @@ -1,24 +1,25 @@ # $FreeBSD$ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} +PORTREVISION= 6 CATEGORIES= multimedia PKGNAMESUFFIX= -qt4 MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor (QT4 UI) LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux MASTERDIR= ${.CURDIR}/../avidemux PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile.common" CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux/qt4 CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}" post-configure: post-configure-common .include Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 465662) +++ branches/2018Q1 (revision 465663) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r464215,465620