Attachment #211858 for bug #244337




BUILD_DEPENDS+=	yasm:devel/yasm \
		bash:shells/bash
LIB_DEPENDS+=	libmad.so:audio/libmad \
#		libpulse.so:audio/pulseaudio \
		libpng.so:graphics/png

LICENSE=	GPLv2

CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin

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

.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}




--- cmake/admCheckAudioDeviceLibs.cmake.orig
+++ cmake/admCheckAudioDeviceLibs.cmake
@@ -158,39 +158,45 @@
 
 	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
 	MESSAGE(STATUS "*****************************")
-        IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
-        # in cache already
-         SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
-        ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
 
-           # use pkg-config to get the directories and then use these values
-        # in the FIND_PATH() and FIND_LIBRARY() calls
-        include(FindPkgConfig)
-        pkg_check_modules(PULSEAUDIOSIMPLE libpulse-simple)
-        IF (PULSEAUDIOSIMPLE_FOUND)
-          SET(PULSEAUDIOSIMPLE_DEFINITIONS ${PULSEAUDIOSIMPLE_CFLAGS})
-          FIND_PATH(PULSEAUDIOSIMPLE_INCLUDE_DIR pulse/simple.h PATHS ${PULSEAUDIOSIMPLE_INCLUDE_DIRS} PATH_SUFFIXES pulse)
-          FIND_LIBRARY(PULSEAUDIOSIMPLE_LIBRARIES NAMES pulse-simple libpulse-simple PATHS ${PULSEAUDIOSIMPLE_LIBRARY_DIRS})
-        ENDIF (PULSEAUDIOSIMPLE_FOUND)
+        IF (PULSEAUDIOSIMPLE)
+                IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
+                # in cache already
+                 SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
+                ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
 
-        IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
-         SET(PULSEAUDIOSIMPLE_FOUND TRUE)
-        ELSE (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
-         SET(PULSEAUDIOSIMPLE_FOUND FALSE)
-        ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
+                   # use pkg-config to get the directories and then use these values
+                # in the FIND_PATH() and FIND_LIBRARY() calls
+                include(FindPkgConfig)
+                pkg_check_modules(PULSEAUDIOSIMPLE libpulse-simple)
+                IF (PULSEAUDIOSIMPLE_FOUND)
+                  SET(PULSEAUDIOSIMPLE_DEFINITIONS ${PULSEAUDIOSIMPLE_CFLAGS})
+                  FIND_PATH(PULSEAUDIOSIMPLE_INCLUDE_DIR pulse/simple.h PATHS ${PULSEAUDIOSIMPLE_INCLUDE_DIRS} PATH_SUFFIXES pulse)
+                  FIND_LIBRARY(PULSEAUDIOSIMPLE_LIBRARIES NAMES pulse-simple libpulse-simple PATHS ${PULSEAUDIOSIMPLE_LIBRARY_DIRS})
+                ENDIF (PULSEAUDIOSIMPLE_FOUND)
 
-        IF (PULSEAUDIOSIMPLE_FOUND)
-         IF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
-          MESSAGE(STATUS "Found PulseAudio Simple: ${PULSEAUDIOSIMPLE_LIBRARIES}")
-        ENDIF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
-        SET(USE_PULSE_SIMPLE 1)
-        ELSE (PULSEAUDIOSIMPLE_FOUND)
-         MESSAGE(STATUS "Could NOT find PulseAudioSimple\n")
-        ENDIF (PULSEAUDIOSIMPLE_FOUND)
+                IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
+                 SET(PULSEAUDIOSIMPLE_FOUND TRUE)
+                ELSE (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
+                 SET(PULSEAUDIOSIMPLE_FOUND FALSE)
+                ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
 
-        MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
+                IF (PULSEAUDIOSIMPLE_FOUND)
+                 IF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
+                  MESSAGE(STATUS "Found PulseAudio Simple: ${PULSEAUDIOSIMPLE_LIBRARIES}")
+                ENDIF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
+                SET(USE_PULSE_SIMPLE 1)
+                ELSE (PULSEAUDIOSIMPLE_FOUND)
+                 MESSAGE(STATUS "Could NOT find PulseAudioSimple\n")
+                ENDIF (PULSEAUDIOSIMPLE_FOUND)
 
-		APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
+                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)
 ENDIF (UNIX AND NOT APPLE)

Lines 101-107 Link Here

(-)multimedia/avidemux-plugins/pkg-plist (-1 / +1 lines)
101	%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so	101	%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so
102	%%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so	102	%%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so
103	%%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so	103	%%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so
104	lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so	104	%%PULSEAUDIO%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
105	%%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so	105	%%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
106	%%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so	106	%%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
107	%%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so	107	%%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so

Return to bug 244337

Lines 8-14 Link Here

(-)multimedia/avidemux/Makefile.common (-2 / +9 lines)
8	BUILD_DEPENDS+= yasm:devel/yasm \	8	BUILD_DEPENDS+= yasm:devel/yasm \
9	bash:shells/bash	9	bash:shells/bash
10	LIB_DEPENDS+= libmad.so:audio/libmad \	10	LIB_DEPENDS+= libmad.so:audio/libmad \
11	# libpulse.so:audio/pulseaudio \
12	libpng.so:graphics/png	11	libpng.so:graphics/png
13		12
14	LICENSE= GPLv2	13	LICENSE= GPLv2
Lines 34-40 Link Here
34	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin	33	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
35	MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin	34	MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
36		35
37	OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK \	36	OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK PULSEAUDIO \
38	XVIDEO FAAC FRIBIDI OPUS TWOLAME \	37	XVIDEO FAAC FRIBIDI OPUS TWOLAME \
39	FAAD X264 X265 VPX XVID AMR VORBIS NLS LAME VAAPI VDPAU \	38	FAAD X264 X265 VPX XVID AMR VORBIS NLS LAME VAAPI VDPAU \
40	DCA FDK QT5 TINYPY VAPOURSYNTH	39	DCA FDK QT5 TINYPY VAPOURSYNTH
Lines 116-121 Link Here
116	.else	115	.else
117	CMAKE_ARGS+= -DJACK:BOOL=OFF	116	CMAKE_ARGS+= -DJACK:BOOL=OFF
118	PLIST_SUB+= JACK="@comment "	117	PLIST_SUB+= JACK="@comment "
		118	.endif
		119
		120	.if ${PORT_OPTIONS:MPULSEAUDIO}
		121	LIB_DEPENDS+= libpulse.so:audio/pulseaudio
		122	PLIST_SUB+= PULSEAUDIO=""
		123	.else
		124	CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF
		125	PLIST_SUB+= PULSEAUDIO="@comment "
119	.endif	126	.endif
120		127
121	.if ${PORT_OPTIONS:MFDK}	128	.if ${PORT_OPTIONS:MFDK}

Line 0 Link Here

(-)multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake (+76 lines)
		1	--- cmake/admCheckAudioDeviceLibs.cmake.orig
		2	+++ cmake/admCheckAudioDeviceLibs.cmake
		3	@@ -158,39 +158,45 @@
		4
		5	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
		6	MESSAGE(STATUS "*****************************")
		7	- IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		8	- # in cache already
		9	- SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
		10	- ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		11
		12	- # use pkg-config to get the directories and then use these values
		13	- # in the FIND_PATH() and FIND_LIBRARY() calls
		14	- include(FindPkgConfig)
		15	- pkg_check_modules(PULSEAUDIOSIMPLE libpulse-simple)
		16	- IF (PULSEAUDIOSIMPLE_FOUND)
		17	- SET(PULSEAUDIOSIMPLE_DEFINITIONS ${PULSEAUDIOSIMPLE_CFLAGS})
		18	- FIND_PATH(PULSEAUDIOSIMPLE_INCLUDE_DIR pulse/simple.h PATHS ${PULSEAUDIOSIMPLE_INCLUDE_DIRS} PATH_SUFFIXES pulse)
		19	- FIND_LIBRARY(PULSEAUDIOSIMPLE_LIBRARIES NAMES pulse-simple libpulse-simple PATHS ${PULSEAUDIOSIMPLE_LIBRARY_DIRS})
		20	- ENDIF (PULSEAUDIOSIMPLE_FOUND)
		21	+ IF (PULSEAUDIOSIMPLE)
		22	+ IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		23	+ # in cache already
		24	+ SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
		25	+ ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		26
		27	- IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		28	- SET(PULSEAUDIOSIMPLE_FOUND TRUE)
		29	- ELSE (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		30	- SET(PULSEAUDIOSIMPLE_FOUND FALSE)
		31	- ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		32	+ # use pkg-config to get the directories and then use these values
		33	+ # in the FIND_PATH() and FIND_LIBRARY() calls
		34	+ include(FindPkgConfig)
		35	+ pkg_check_modules(PULSEAUDIOSIMPLE libpulse-simple)
		36	+ IF (PULSEAUDIOSIMPLE_FOUND)
		37	+ SET(PULSEAUDIOSIMPLE_DEFINITIONS ${PULSEAUDIOSIMPLE_CFLAGS})
		38	+ FIND_PATH(PULSEAUDIOSIMPLE_INCLUDE_DIR pulse/simple.h PATHS ${PULSEAUDIOSIMPLE_INCLUDE_DIRS} PATH_SUFFIXES pulse)
		39	+ FIND_LIBRARY(PULSEAUDIOSIMPLE_LIBRARIES NAMES pulse-simple libpulse-simple PATHS ${PULSEAUDIOSIMPLE_LIBRARY_DIRS})
		40	+ ENDIF (PULSEAUDIOSIMPLE_FOUND)
		41
		42	- IF (PULSEAUDIOSIMPLE_FOUND)
		43	- IF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
		44	- MESSAGE(STATUS "Found PulseAudio Simple: ${PULSEAUDIOSIMPLE_LIBRARIES}")
		45	- ENDIF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
		46	- SET(USE_PULSE_SIMPLE 1)
		47	- ELSE (PULSEAUDIOSIMPLE_FOUND)
		48	- MESSAGE(STATUS "Could NOT find PulseAudioSimple\n")
		49	- ENDIF (PULSEAUDIOSIMPLE_FOUND)
		50	+ IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		51	+ SET(PULSEAUDIOSIMPLE_FOUND TRUE)
		52	+ ELSE (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		53	+ SET(PULSEAUDIOSIMPLE_FOUND FALSE)
		54	+ ENDIF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
		55
		56	- MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
		57	+ IF (PULSEAUDIOSIMPLE_FOUND)
		58	+ IF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
		59	+ MESSAGE(STATUS "Found PulseAudio Simple: ${PULSEAUDIOSIMPLE_LIBRARIES}")
		60	+ ENDIF (NOT PULSEAUDIOSIMPLE_FIND_QUIETLY)
		61	+ SET(USE_PULSE_SIMPLE 1)
		62	+ ELSE (PULSEAUDIOSIMPLE_FOUND)
		63	+ MESSAGE(STATUS "Could NOT find PulseAudioSimple\n")
		64	+ ENDIF (PULSEAUDIOSIMPLE_FOUND)
65
66	- APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
67	+ MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
68	+ ELSE (PULSEAUDIOSIMPLE)
69	+ MESSAGE("${MSG_DISABLE_OPTION}")
70	+ ENDIF (PULSEAUDIOSIMPLE)
71	+
72	+ MESSAGE("")
73	+ APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
74	ELSE (UNIX AND NOT APPLE)
75	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
76	ENDIF (UNIX AND NOT APPLE)