diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-02-23 16:05:15 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-02-23 16:05:15 +0000 |
| commit | 9ecd883211e06267d10fc2f2d84305036c3cde9a (patch) | |
| tree | 2663e8693153ea450e6c7c3ebb0eb6f7964978ed /multimedia | |
| parent | eb78b29bd7559395b2cff9b490091be33c5a9d5b (diff) | |
| download | freebsd-ports-9ecd883211e06267d10fc2f2d84305036c3cde9a.zip | |
multimedia/avidemux: make PULSEAUDIO an optional dependency
PR: 244337
Submitted by: VVD <vvd@unislabs.com>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/avidemux-plugins/pkg-plist | 2 | ||||
| -rw-r--r-- | multimedia/avidemux/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/avidemux/Makefile.common | 14 | ||||
| -rw-r--r-- | multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake | 23 |
4 files changed, 36 insertions, 4 deletions
diff --git a/multimedia/avidemux-plugins/pkg-plist b/multimedia/avidemux-plugins/pkg-plist index 7e019404fb5b..16dd02c57dc0 100644 --- a/multimedia/avidemux-plugins/pkg-plist +++ b/multimedia/avidemux-plugins/pkg-plist @@ -101,7 +101,7 @@ lib/ADM_plugins6/autoScripts/lib/ADM_image.py %%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so %%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so %%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so -lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so +%%PULSEAUDIO%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so %%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so %%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so %%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index eaa0feccce22..8314bb06cb0e 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -6,6 +6,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common index 2bbd8bf37dad..859100f0e373 100644 --- a/multimedia/avidemux/Makefile.common +++ b/multimedia/avidemux/Makefile.common @@ -8,7 +8,6 @@ DISTNAME= avidemux_${PORTVERSION} BUILD_DEPENDS+= yasm:devel/yasm \ bash:shells/bash LIB_DEPENDS+= libmad.so:audio/libmad \ - libpulse.so:audio/pulseaudio \ libpng.so:graphics/png LICENSE= GPLv2 @@ -34,12 +33,13 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK \ +OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK PULSEAUDIO \ XVIDEO FAAC FRIBIDI OPUS TWOLAME \ FAAD X264 X265 VPX 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 + FAAD VDPAU VORBIS DCA FDK QT5 TINYPY VAPOURSYNTH \ + PULSEAUDIO OPTIONS_SUB= yes CLI_DESC= Build CLI tool @@ -118,6 +118,14 @@ CMAKE_ARGS+= -DJACK:BOOL=OFF PLIST_SUB+= JACK="@comment " .endif +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= libpulse.so:audio/pulseaudio +PLIST_SUB+= PULSEAUDIO="" +.else +CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF +PLIST_SUB+= PULSEAUDIO="@comment " +.endif + .if ${PORT_OPTIONS:MFDK} LIB_DEPENDS+= libfdk-aac.so:audio/fdk-aac PLIST_SUB+= FDK="" diff --git a/multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake b/multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake new file mode 100644 index 000000000000..59bb9ec92258 --- /dev/null +++ b/multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake @@ -0,0 +1,23 @@ +--- cmake/admCheckAudioDeviceLibs.cmake.orig ++++ cmake/admCheckAudioDeviceLibs.cmake +@@ -158,6 +158,8 @@ + + MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE") + MESSAGE(STATUS "*****************************") ++ ++ IF (PULSEAUDIOSIMPLE) + IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES) + # in cache already + SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE) +@@ -189,7 +191,11 @@ + ENDIF (PULSEAUDIOSIMPLE_FOUND) + + MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES) ++ ELSE (PULSEAUDIOSIMPLE) ++ MESSAGE("${MSG_DISABLE_OPTION}") ++ ENDIF (PULSEAUDIOSIMPLE) + ++ MESSAGE("") + APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}") + ELSE (UNIX AND NOT APPLE) + SET(PULSEAUDIOSIMPLE_CAPABLE FALSE) |