Attachment 218329 Details for Bug 249241 – patch for 2.7.6

[patch] patch for 2.7.6

avidemux_2.7.6.diff (text/plain), 8.78 KB, created by Lars Herschke on 2020-09-26 15:26:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Herschke

Created: 2020-09-26 15:26:21 UTC

Size: 8.78 KB

patch

obsolete

>Index: multimedia/avidemux/Makefile
>===================================================================
>--- multimedia/avidemux/Makefile	(Revision 550190)
>+++ multimedia/avidemux/Makefile	(Arbeitskopie)
>@@ -6,7 +6,6 @@
> 
> PORTNAME=	avidemux
> PORTVERSION=	${AVIDEMUX_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	multimedia@FreeBSD.org
>Index: multimedia/avidemux/Makefile.common
>===================================================================
>--- multimedia/avidemux/Makefile.common	(Revision 550190)
>+++ multimedia/avidemux/Makefile.common	(Arbeitskopie)
>@@ -1,6 +1,6 @@
> # $FreeBSD$
> 
>-AVIDEMUX_VERSION=	2.7.4
>+AVIDEMUX_VERSION=	2.7.6
> MASTER_SITES=	\
> 		SF/avidemux/avidemux/${PORTVERSION}
> DISTNAME=	avidemux_${PORTVERSION}
>@@ -35,7 +35,7 @@
> 
> OPTIONS_DEFINE=	CLI FREETYPE FONTCONFIG OSS JACK PULSEAUDIO \
> 		XVIDEO FAAC FRIBIDI OPUS TWOLAME \
>-		FAAD X264 X265 VPX XVID AMR VORBIS NLS LAME VAAPI VDPAU \
>+		FAAD X264 X265 VPX AOM XVID AMR VORBIS NLS LAME VAAPI VDPAU \
> 		DCA FDK QT5 TINYPY VAPOURSYNTH
> OPTIONS_DEFAULT=	FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
> 			FAAD VDPAU VORBIS DCA FDK QT5 TINYPY VAPOURSYNTH \
>@@ -42,6 +42,7 @@
> 			PULSEAUDIO
> 
> OPTIONS_SUB=	yes
>+AOM_DESC=	AOM AV1 decoder support
> CLI_DESC=	Build CLI tool
> FDK_DESC=	FDK AAC codec support
> TINYPY_DESC=	Python scripting support via TinyPy
>@@ -196,10 +197,20 @@
> 
> .if ${PORT_OPTIONS:MVPX}
> LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
>+PLIST_SUB+=	VPX=""
> .else
>-CMAKE_ARGS+=	-DVPXDEC:BOOL=OFF
>+CMAKE_ARGS+=	-DVPXDEC:BOOL=OFF -DVPXENC:BOOL=OFF
>+PLIST_SUB+=	VPX="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MAOM}
>+LIB_DEPENDS+=	libaom.so:multimedia/aom
>+PLIST_SUB+=	AOM=""
>+.else
>+CMAKE_ARGS+=	-DAOMDEC:BOOL=OFF
>+PLIST_SUB+=	AOM="@comment "
>+.endif
>+
> .if ${PORT_OPTIONS:MXVID}
> LIB_DEPENDS+=	libxvidcore.so:multimedia/xvid
> PLIST_SUB+=	XVID=""
>Index: multimedia/avidemux/distinfo
>===================================================================
>--- multimedia/avidemux/distinfo	(Revision 550190)
>+++ multimedia/avidemux/distinfo	(Arbeitskopie)
>@@ -1,5 +1,3 @@
> TIMESTAMP = 1592902649
>-SHA256 (avidemux_2.7.4.tar.gz) = 7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9
>-SIZE (avidemux_2.7.4.tar.gz) = 23946276
>-SHA256 (1a8bb36c5a03.patch) = 46e03497445281b11a405fa446f0021c4a9eadeaa5b1e4970fda689d9b4160fc
>-SIZE (1a8bb36c5a03.patch) = 753
>+SHA256 (avidemux_2.7.6.tar.gz) = 9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf
>+SIZE (avidemux_2.7.6.tar.gz) = 24372770 
>Index: multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
>===================================================================
>--- multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch	(Revision 550190)
>+++ multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch	(nicht existent)
>@@ -1,19 +0,0 @@
>---- avidemux_core/ffmpeg_package/patches/configure.patch.orig	2015-06-01 05:59:45 UTC
>-+++ avidemux_core/ffmpeg_package/patches/configure.patch
>-@@ -0,0 +1,16 @@
>-+--- configure.orig	2015-03-16 20:26:04.000000000 +0100
>-++++ configure
>-+@@ -2733,12 +2733,7 @@
>-+ host_os=$target_os_default
>-+ 
>-+ # machine
>-+-if test "$target_os_default" = aix; then
>-+-    arch_default=$(uname -p)
>-+-    strip_default="strip -X32_64"
>-+-else
>-+-    arch_default=$(uname -m)
>-+-fi
>-++arch_default=$(uname -p)
>-+ cpu="generic"
>-+ intrinsics="none"
>-+ 
>Index: multimedia/avidemux/pkg-plist
>===================================================================
>--- multimedia/avidemux/pkg-plist	(Revision 550190)
>+++ multimedia/avidemux/pkg-plist	(Arbeitskopie)
>@@ -83,11 +83,11 @@
> 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/Ts.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/admCheckAom.cmake
> include/avidemux/2.7/cmake/admCPack.cmake
> include/avidemux/2.7/cmake/admCPackRpm.cmake
> include/avidemux/2.7/cmake/admCheckAudioDeviceLibs.cmake
>@@ -105,7 +105,6 @@
> include/avidemux/2.7/cmake/admCheckLibVA.cmake
> include/avidemux/2.7/cmake/admCheckLibxml2.cmake
> include/avidemux/2.7/cmake/admCheckMiscLibs.cmake
>-include/avidemux/2.7/cmake/admCheckMiscLibs.cmake.orig
> include/avidemux/2.7/cmake/admCheckNvEnc.cmake
> include/avidemux/2.7/cmake/admCheckOpenGl.cmake
> include/avidemux/2.7/cmake/admCheckOpencore.cmake
>@@ -115,6 +114,7 @@
> include/avidemux/2.7/cmake/admCheckQt5.cmake
> include/avidemux/2.7/cmake/admCheckRequiredLibs.cmake
> include/avidemux/2.7/cmake/admCheckSpiderMonkey.cmake
>+include/avidemux/2.7/cmake/admCheckSqlLite.cmake
> include/avidemux/2.7/cmake/admCheckVDPAU.cmake
> include/avidemux/2.7/cmake/admCheckVapourSynth.cmake
> include/avidemux/2.7/cmake/admCheckVideoToolbox.cmake
>@@ -148,7 +148,6 @@
> include/avidemux/2.7/cmake/admGetRevision.cmake
> include/avidemux/2.7/cmake/admInstallDir.cmake
> include/avidemux/2.7/cmake/admMainChecks.cmake
>-include/avidemux/2.7/cmake/admMainChecks.cmake.orig
> include/avidemux/2.7/cmake/admOpenGl.cmake
> include/avidemux/2.7/cmake/admPackager.cmake
> include/avidemux/2.7/cmake/admPluginLocation.cmake
>@@ -181,6 +180,9 @@
> include/avidemux/2.7/cmake/cmake_compile_check/libva_hevcdec.cpp
> include/avidemux/2.7/cmake/cmake_compile_check/libva_vp9dec.cpp
> include/avidemux/2.7/cmake/cmake_compile_check/os_bsd_check.cpp
>+include/avidemux/2.7/cmake/cmake_win32_rc/generate_product_version.cmake
>+include/avidemux/2.7/cmake/cmake_win32_rc/VersionInfo.in
>+include/avidemux/2.7/cmake/cmake_win32_rc/VersionResource.rc
> include/avidemux/2.7/cmake/commonCmakeApplication.cmake
> include/avidemux/2.7/cmake/config.h.cmake
> include/avidemux/2.7/cmake/debianArch.cmake
>@@ -338,7 +340,6 @@
> %%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_encodingContext.h
> %%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_h264Encoding.h
> %%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_hevcEncoding.h
>-include/avidemux/2.7/ADM_coreMuxer/.ADM_muxer.h.swp
> include/avidemux/2.7/ADM_coreMuxer/ADM_coreMuxer6_export.h
> include/avidemux/2.7/ADM_coreMuxer/ADM_coreMuxerFfmpeg.h
> include/avidemux/2.7/ADM_coreMuxer/ADM_muxer.h
>Index: multimedia/avidemux-qt5/Makefile
>===================================================================
>--- multimedia/avidemux-qt5/Makefile	(Revision 550190)
>+++ multimedia/avidemux-qt5/Makefile	(Arbeitskopie)
>@@ -5,10 +5,6 @@
> CATEGORIES=	multimedia
> PKGNAMESUFFIX=	-qt5
> 
>-# Prepare for Qt5.15
>-PATCH_SITES=    https://github.com/mean00/${PORTNAME}2/commit/
>-PATCHFILES=     1a8bb36c5a03.patch:-p1
>-
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Simple GUI based video editor (QT5 UI)
> 
>Index: multimedia/avidemux-qt5/pkg-plist
>===================================================================
>--- multimedia/avidemux-qt5/pkg-plist	(Revision 550190)
>+++ multimedia/avidemux-qt5/pkg-plist	(Arbeitskopie)
>@@ -29,6 +29,7 @@
> share/avidemux6/qt5/i18n/avidemux_pl.qm
> share/avidemux6/qt5/i18n/avidemux_pt_BR.qm
> share/avidemux6/qt5/i18n/avidemux_ru.qm
>+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
>Index: multimedia/avidemux-plugins/pkg-plist
>===================================================================
>--- multimedia/avidemux-plugins/pkg-plist	(Revision 550190)
>+++ multimedia/avidemux-plugins/pkg-plist	(Arbeitskopie)
>@@ -32,6 +32,7 @@
> lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
> lib/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
> lib/ADM_plugins6/videoFilters/libADM_vf_black.so
>+lib/ADM_plugins6/videoFilters/libADM_vf_blend.so
> lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
> lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
> lib/ADM_plugins6/videoFilters/libADM_vf_ascii.so
>@@ -110,6 +111,8 @@
> %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
> %%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
> %%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so
>+%%VPX%%lib/ADM_plugins6/videoEncoders/libADM_ve_vp9.so
>+%%AOM%%lib/ADM_plugins6/videoDecoders/libADM_vd_aom.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_chromaShiftCli.so
>@@ -121,6 +124,7 @@
> %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
> %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
> %%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
>+%%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.so
> %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so
> %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so
> %%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so

Actions: View | Diff

Attachments on bug 249241: 218329 | 218339