svn commit: r526927 - in head/multimedia: avidemux avidemux-plugins avidemux/files

[Tobias C. Berner]

Author: tcberner
Date: Sun Feb 23 16:05:15 2020
New Revision: 526927
URL: https://svnweb.freebsd.org/changeset/ports/526927

Log:
  multimedia/avidemux: make PULSEAUDIO an optional dependency
  
  PR:		244337
  Submitted by:	VVD <vvd at unislabs.com>

Added:
  head/multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake   (contents, props changed)
Modified:
  head/multimedia/avidemux-plugins/pkg-plist
  head/multimedia/avidemux/Makefile
  head/multimedia/avidemux/Makefile.common

Modified: head/multimedia/avidemux-plugins/pkg-plist
==============================================================================
--- head/multimedia/avidemux-plugins/pkg-plist	Sun Feb 23 16:01:55 2020	(r526926)
+++ head/multimedia/avidemux-plugins/pkg-plist	Sun Feb 23 16:05:15 2020	(r526927)
@@ -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

Modified: head/multimedia/avidemux/Makefile
==============================================================================
--- head/multimedia/avidemux/Makefile	Sun Feb 23 16:01:55 2020	(r526926)
+++ head/multimedia/avidemux/Makefile	Sun Feb 23 16:05:15 2020	(r526927)
@@ -6,6 +6,7 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia at FreeBSD.org

Modified: head/multimedia/avidemux/Makefile.common
==============================================================================
--- head/multimedia/avidemux/Makefile.common	Sun Feb 23 16:01:55 2020	(r526926)
+++ head/multimedia/avidemux/Makefile.common	Sun Feb 23 16:05:15 2020	(r526927)
@@ -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
@@ -116,6 +116,14 @@ 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+=     PULSEAUDIO=""
+.else
+CMAKE_ARGS+=    -DPULSEAUDIOSIMPLE:BOOL=OFF
+PLIST_SUB+=     PULSEAUDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFDK}

Added: head/multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake	Sun Feb 23 16:05:15 2020	(r526927)
@@ -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)