multimedia/avidemux: update to 2.7.8

Changelog:
	http://avidemux.sourceforge.net/news.html#2021-03-09

- Cleanup of option handling is planned for the near future.

PR:		258720

multimedia/avidemux-cli/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-cli
 

multimedia/avidemux-plugins/Makefile

@@ -2,7 +2,6 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	7
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
@@ -23,14 +22,14 @@ CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${P
 PLUGIN_UI=	COMMON SETTINGS
 
 .if ${PORT_OPTIONS:MCLI}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.7/cli/config.h:multimedia/avidemux-cli
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.7/cli/config.h:multimedia/avidemux-cli
+BUILD_DEPENDS+=	avidemux-cli>0:multimedia/avidemux-cli
+RUN_DEPENDS+=	avidemux-cli>0:multimedia/avidemux-cli
 PLUGIN_UI+=	CLI
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.7/qt5/config.h:multimedia/avidemux-qt5 	 
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.7/qt5/config.h:multimedia/avidemux-qt5 	 
+BUILD_DEPENDS+=	avidemux-qt5>0:multimedia/avidemux-qt5
+RUN_DEPENDS+=	avidemux-qt5>0:multimedia/avidemux-qt5
 PLUGIN_UI+=	QT4
 .endif
 

multimedia/avidemux-plugins/pkg-plist

@@ -44,16 +44,18 @@ lib/ADM_plugins6/demuxers/libADM_dm_pic.so
 lib/ADM_plugins6/demuxers/libADM_dm_ps.so
 lib/ADM_plugins6/demuxers/libADM_dm_ts.so
 %%VAPOURSYNTH%%lib/ADM_plugins6/demuxers/libADM_dm_vapoursynth.so
-lib/ADM_plugins6/muxers/libADM_mx_Mkv.so
-lib/ADM_plugins6/muxers/libADM_mx_Webm.so
 lib/ADM_plugins6/muxers/libADM_mx_avi.so
 lib/ADM_plugins6/muxers/libADM_mx_dummy.so
 lib/ADM_plugins6/muxers/libADM_mx_ffPS.so
 lib/ADM_plugins6/muxers/libADM_mx_ffTS.so
 lib/ADM_plugins6/muxers/libADM_mx_flv.so
+lib/ADM_plugins6/muxers/libADM_mx_mkv.so
+lib/ADM_plugins6/muxers/libADM_mx_mov.so
 lib/ADM_plugins6/muxers/libADM_mx_mp4.so
 lib/ADM_plugins6/muxers/libADM_mx_mp4v2.so
 lib/ADM_plugins6/muxers/libADM_mx_raw.so
+lib/ADM_plugins6/muxers/libADM_mx_webm.so
+%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/Mezzanine.json
 %%X264%%lib/ADM_plugins6/pluginSettings/x264/3/PSP.json
 %%X264%%lib/ADM_plugins6/pluginSettings/x264/3/fast.json
 %%X264%%lib/ADM_plugins6/pluginSettings/x264/3/iPhone.json
@@ -75,6 +77,7 @@ lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
 %%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_libva.so
 lib/ADM_plugins6/videoEncoders/libADM_ve_null.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_utvideo.so
 %%VPX%%lib/ADM_plugins6/videoEncoders/libADM_ve_vp9.so
 %%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
 %%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so
@@ -84,6 +87,12 @@ lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
 %%X265%%%%QT5%%lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_artCharcoalCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_artColorEffectCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_artPixelizeCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_artVHSCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_artVignetteCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_colorTempCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_blackenBordersCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
 %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
@@ -118,6 +127,7 @@ lib/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
 lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
 lib/ADM_plugins6/videoFilters/libADM_vf_median.so
 lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_negative.so
 lib/ADM_plugins6/videoFilters/libADM_vf_printInfo.so
 lib/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
 lib/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
@@ -137,9 +147,15 @@ lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
 lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 lib/ADM_plugins6/videoFilters/libADM_vf_yadif.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so
+%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_artCharcoalQT5.so
+%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_artColorEffectQT5.so
+%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_artPixelizeQT5.so
+%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_artVHSQT5.so
+%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_artVignetteQT5.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so
+%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_colorTempQT5.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so
 %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so

multimedia/avidemux-qt5/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-qt5
 
@@ -15,6 +14,8 @@ PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"
 
+USES+=	desktop-file-utils
+
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux/qt4
 
 CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"

multimedia/avidemux-qt5/pkg-plist

@@ -33,6 +33,7 @@ share/avidemux6/qt5/i18n/avidemux_sk.qm
 share/avidemux6/qt5/i18n/avidemux_sr.qm
 share/avidemux6/qt5/i18n/avidemux_sr@latin.qm
 share/avidemux6/qt5/i18n/avidemux_tr.qm
+share/avidemux6/qt5/i18n/avidemux_uk.qm
 share/avidemux6/qt5/i18n/avidemux_zh_CN.qm
 share/avidemux6/qt5/i18n/avidemux_zh_TW.qm
 share/avidemux6/qt5/i18n/qtbase_ar.qm
@@ -54,6 +55,7 @@ share/avidemux6/qt5/i18n/qtbase_lv.qm
 share/avidemux6/qt5/i18n/qtbase_pl.qm
 share/avidemux6/qt5/i18n/qtbase_ru.qm
 share/avidemux6/qt5/i18n/qtbase_sk.qm
+share/avidemux6/qt5/i18n/qtbase_tr.qm
 share/avidemux6/qt5/i18n/qtbase_uk.qm
 share/avidemux6/qt5/i18n/qtbase_zh_CN.qm
 share/avidemux6/qt5/i18n/qtbase_zh_TW.qm

multimedia/avidemux/Makefile

@@ -5,7 +5,6 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
@@ -17,4 +16,9 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_core
 
 post-configure: post-configure-common
 
+post-install:
+.for l in swscale.so.5 postproc.so.55 avutil.so.56 avcodec.so.58 avformat.so.58
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libADM6${l}
+.endfor
+
 .include <bsd.port.post.mk>

multimedia/avidemux/Makefile.common

@@ -1,10 +1,16 @@
-AVIDEMUX_VERSION=	2.7.6
+AVIDEMUX_VERSION=	2.7.8
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
 
-BUILD_DEPENDS+=	yasm:devel/yasm \
-		bash:shells/bash
+PATCH_SITES=	https://github.com/mean00/avidemux2/commit/
+PATCHFILES=		76f72e226684d68953de60c6d097f22c1c2f8ef1.patch
+PATCH_DIST_STRIP=	-p1
+
+BUILD_DEPENDS+=	${BUILD_DEPENDS_${ARCH}}
+BUILD_DEPENDS_amd64=	yasm:devel/yasm
+BUILD_DEPENDS_i386=	yasm:devel/yasm
+BUILD_DEPENDS+=	bash:shells/bash
 LIB_DEPENDS+=	libmad.so:audio/libmad \
 		libpng.so:graphics/png
 
@@ -27,7 +33,6 @@ 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
 
@@ -46,6 +51,8 @@ FDK_DESC=	FDK AAC codec support
 TINYPY_DESC=	Python scripting support via TinyPy
 VAPOURSYNTH_DESC=	VapourSynth video manipulation support
 
+NLS_USES=	gettext-runtime
+NLS_CMAKE_BOOL=	GETTEXT
 FRIBIDI_CMAKE_OFF=	-DFRIBIDI:BOOL=OFF
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 OPUS_CMAKE_OFF=		-DOPUS:BOOL=OFF -DOPUS_ENCODER:BOOL=OFF
@@ -59,12 +66,6 @@ OPTIONS_DEFAULT+=	LAME FAAC AMR X264
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-.else
-CMAKE_ARGS+=	-DNO_NLS:BOOL=ON
-.endif
-
 # for libexecinfo: (so that __builtin_frame_address() finds the top
 # of the stack)
 .if ${ARCH} == amd64
@@ -85,7 +86,7 @@ USE_GNOME+=	libxslt
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
-USES+=		desktop-file-utils gl qt:5 xorg
+USES+=		gl qt:5 xorg
 USE_GL=		gl glu
 USE_QT=		core gui network widgets \
 		qmake_build buildtools_build linguist_build
@@ -146,9 +147,8 @@ CMAKE_ARGS+=	-DFONTCONFIG:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MXVIDEO}
-#LIB_DEPENDS+=	Xv:x11/libXv
 USES+=		xorg
-USE_XORG+=	xv
+USE_XORG+=	xv xext
 .else
 CMAKE_ARGS+=	-DXVIDEO:BOOL=OFF
 .endif
@@ -233,7 +233,10 @@ PLIST_SUB+=	DCA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVAPOURSYNTH}
-LIB_DEPENDS+=	libvapoursynth.so:multimedia/vapoursynth
+LIB_DEPENDS+=	libva.so:multimedia/libva \
+				libvdpau.so:multimedia/libvdpau \
+				libvapoursynth.so:multimedia/vapoursynth
+USE_XORG+=	x11
 PLIST_SUB+=	VAPOURSYNTH=""
 .else
 CMAKE_ARGS+=	-DVAPOURSYNTH:BOOL=OFF
@@ -282,17 +285,14 @@ PLIST_SUB+=	AMRWB="@comment "
 LDFLAGS+=	-lc++
 .endif
 
-#.if ${COMPILER_TYPE} == clang
 USE_GCC=	yes
-#.endif
 
-NOT_FOR_ARCHS=		aarch64 powerpc powerpc64 powerpcspe sparc64
+NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe sparc64
 NOT_FOR_ARCHS_REASON=	cmake/admDetermineSystem.cmake:78: CPU not supported
 
 post-patch:
 	@${MKDIR} ${CONFIGURE_WRKSRC}/config
 	@${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config
-	@${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt
 	@${FIND} ${WRKSRC}/cmake -name '*.cmake.orig' -delete
 
 post-configure-common:

multimedia/avidemux/distinfo

@@ -1,3 +1,5 @@
-TIMESTAMP = 1599091359
-SHA256 (avidemux_2.7.6.tar.gz) = 9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf
-SIZE (avidemux_2.7.6.tar.gz) = 24372770
+TIMESTAMP = 1651083964
+SHA256 (avidemux_2.7.8.tar.gz) = 628a404f521ff2812760700ae3e2aa78e5816b0ff3fb6fd05ac3e75248d97401
+SIZE (avidemux_2.7.8.tar.gz) = 24692898
+SHA256 (76f72e226684d68953de60c6d097f22c1c2f8ef1.patch) = 11a2759c70c946992e7693609f67db5394b56145b078d561d18896cfa84280e8
+SIZE (76f72e226684d68953de60c6d097f22c1c2f8ef1.patch) = 1011

multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp

@@ -1,4 +1,4 @@
---- avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig	2019-12-14 18:28:33 UTC
+--- avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig	2021-03-07 06:18:22 UTC
 +++ avidemux_core/ADM_core/src/ADM_folder_linux.cpp
 @@ -39,7 +39,7 @@ static std::string ADM_i18nDir;
  static std::string canonize(const std::string &in)
@@ -8,4 +8,4 @@
 +    char *simple2=realpath(in.c_str(),nullptr);
      if(simple2)
      {
-         out=std::string(simple2)+std::string("/");
+         out=std::string(simple2);

multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt

@@ -1,6 +1,6 @@
---- avidemux_plugins/CMakeLists.txt.orig	2019-08-15 09:25:40.000000000 +0200
-+++ avidemux_plugins/CMakeLists.txt	2020-01-10 15:07:57.924344000 +0100
-@@ -265,7 +265,9 @@
+--- avidemux_plugins/CMakeLists.txt.orig	2021-03-07 06:18:22 UTC
++++ avidemux_plugins/CMakeLists.txt
+@@ -266,7 +266,9 @@ ENDIF(DO_COMMON)
  ADD_SUBDIRECTORY(ADM_videoEncoder)
  ADD_SUBDIRECTORY(ADM_videoFilters6)
  IF(DO_QT4)

multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch

@@ -1,7 +1,7 @@
---- avidemux_core/ffmpeg_package/patches/configure.patch.orig
+--- avidemux_core/ffmpeg_package/patches/configure.patch.orig	2021-11-29 16:28:06 UTC
 +++ avidemux_core/ffmpeg_package/patches/configure.patch
-@@ -0,0 +1,11 @@
-+--- configure.orig
+@@ -0,0 +1,24 @@
++--- configure.orig	2020-07-09 11:17:46.000000000 +0200
 ++++ configure
 +@@ -3671,6 +3671,8 @@
 +     arch_default=$(uname -p)
@@ -12,3 +12,16 @@
 + else
 +     arch_default=$(uname -m)
 + fi
++@@ -4861,9 +4863,11 @@
++         fi
++     }
++ 
++-    [ "$cpu" = generic ] && cpu=$(probe_arm_arch)
++ 
++     case $cpu in
+++        generic)
+++            subarch=$(probe_arm_arch | sed 's/[^a-z0-9]//g')
+++        ;;
++         armv*)
++             cpuflags="-march=$cpu"
++             subarch=$(echo $cpu | sed 's/[^a-z0-9]//g')

multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake

@@ -1,6 +1,6 @@
---- cmake/admCheckAudioDeviceLibs.cmake.orig
+--- cmake/admCheckAudioDeviceLibs.cmake.orig	2021-09-06 18:24:25 UTC
 +++ cmake/admCheckAudioDeviceLibs.cmake
-@@ -158,6 +158,8 @@
+@@ -158,6 +158,8 @@ IF (UNIX AND NOT APPLE)
 
  	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
  	MESSAGE(STATUS "*****************************")
@@ -9,7 +9,7 @@
          IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
          # in cache already
           SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
-@@ -189,7 +191,11 @@
+@@ -189,7 +191,11 @@ IF (UNIX AND NOT APPLE)
          ENDIF (PULSEAUDIOSIMPLE_FOUND)
 
          MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)

multimedia/avidemux/pkg-plist

@@ -84,7 +84,6 @@ include/avidemux/2.7/cmake/FindTar.cmake
 include/avidemux/2.7/cmake/FindThreads.cmake
 include/avidemux/2.7/cmake/Po.cmake
 include/avidemux/2.7/cmake/_CMakeParseArguments.cmake
-include/avidemux/2.7/cmake/_GenerateExportHeader.cmake
 include/avidemux/2.7/cmake/ad_plugin.cmake
 include/avidemux/2.7/cmake/admAsNeeded.cmake
 include/avidemux/2.7/cmake/admCPack.cmake