Attachment 166707 Details for Bug 206945 – Revised patch addressing the plist issues as well

[patch] Revised patch addressing the plist issues as well

avidemux.svndiff.txt (text/plain), 3.82 KB, created by Thomas Zander on 2016-02-07 14:16:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2016-02-07 14:16:58 UTC

Size: 3.82 KB

patch

obsolete

>Index: avidemux/Makefile.common
>===================================================================
>--- avidemux/Makefile.common	(revision 408293)
>+++ avidemux/Makefile.common	(working copy)
>@@ -32,12 +32,20 @@
> MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
> 
> OPTIONS_DEFINE=	QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \
>-		PULSEAUDIO XVIDEO FAAC \
>+		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 VORBIS
>+OPTIONS_SUB=	yes
> CLI_DESC=	Build CLI tool
> 
>+FRIBIDI_CMAKE_OFF=	-DFRIDIBI:BOOL=OFF
>+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
>+OPUS_CMAKE_OFF=		-DOPUS:BOOL=OFF
>+OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
>+TWOLAME_CMAKE_OFF=	-DTWOLAME:BOOL=OFF
>+TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
>+
> .if !defined(PACKAGE_BUILDING)
> OPTIONS_DEFAULT+=	LAME FAAC AMR X264
> .endif
>Index: avidemux/files/patch-cmake_admCheckX265.cmake
>===================================================================
>--- avidemux/files/patch-cmake_admCheckX265.cmake	(nonexistent)
>+++ avidemux/files/patch-cmake_admCheckX265.cmake	(working copy)
>@@ -0,0 +1,12 @@
>+--- cmake/admCheckX265.cmake.orig	2016-01-29 08:47:25 UTC
>++++ cmake/admCheckX265.cmake
>+@@ -19,9 +19,6 @@ MACRO(checkX265)
>+ 					MESSAGE("WARNING: x265 core version is too old.  At least version 9 is required.")
>+ 					SET(X265_FOUND 0)
>+ 				ELSE (x265_version LESS 9)
>+-                                        IF(NOT WIN32)
>+-                                                SET(DL dl)
>+-                                        ENDIF(NOT WIN32)
>+ 					FIND_HEADER_AND_LIB(X265 x265.h x265 x265_encoder_open_${x265_version} ${DL})
>+ 				ENDIF (x265_version LESS 9)
>+ 			ELSE (_X265_FOUND AND _X265_CONFIG_FOUND)
>
>Property changes on: avidemux/files/patch-cmake_admCheckX265.cmake
>___________________________________________________________________
>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: avidemux-plugins/Makefile
>===================================================================
>--- avidemux-plugins/Makefile	(revision 408293)
>+++ avidemux-plugins/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	avidemux
> PORTVERSION=	${AVIDEMUX_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> PKGNAMESUFFIX=	-plugins
> 
>Index: avidemux-plugins/pkg-plist
>===================================================================
>--- avidemux-plugins/pkg-plist	(revision 408293)
>+++ avidemux-plugins/pkg-plist	(working copy)
>@@ -2,6 +2,7 @@
> lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so
> lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so
> lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so
>+%%OPUS%%lib/ADM_plugins6/audioDecoder/libADM_ad_opus.so
> lib/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so
> lib/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
> lib/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
>@@ -12,6 +13,7 @@
> lib/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so
> lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
> lib/ADM_plugins6/audioEncoders/libADM_ae_pcm.so
>+%%TWOLAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_twolame.so
> lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
> lib/ADM_plugins6/videoEncoders/libADM_ve_png.so
> lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
>@@ -37,6 +39,7 @@
> lib/ADM_plugins6/videoFilters/libADM_vf_median.so
> lib/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
> lib/ADM_plugins6/videoFilters/libADM_vf_separateField.so
>+%%FRIBIDI%%%%FREETYPE%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.so
> lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
> lib/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
> lib/ADM_plugins6/videoFilters/libADM_hf_hflip.so

Actions: View | Diff

Attachments on bug 206945: 166606 | 166707