Attachment 211858 Details for Bug 244337 – Added option PULSEAUDIO

[patch] Added option PULSEAUDIO

avidemux.diff (text/plain), 6.15 KB, created by Vladimir Druzenko on 2020-02-23 15:07:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-02-23 15:07:14 UTC

Size: 6.15 KB

patch

obsolete

>diff -urN multimedia/avidemux.orig/Makefile.common multimedia/avidemux/Makefile.common
>--- multimedia/avidemux.orig/Makefile.common
>+++ multimedia/avidemux/Makefile.common
>@@ -8,7 +8,6 @@
> 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,7 +33,7 @@
> 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
>@@ -116,6 +115,14 @@
> .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}
>diff -urN multimedia/avidemux.orig/files/patch-cmake_admCheckAudioDeviceLibs.cmake multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake
>--- multimedia/avidemux.orig/files/patch-cmake_admCheckAudioDeviceLibs.cmake
>+++ multimedia/avidemux/files/patch-cmake_admCheckAudioDeviceLibs.cmake
>@@ -0,0 +1,76 @@
>+--- 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)
>diff -urN multimedia/avidemux-plugins.orig/pkg-plist multimedia/avidemux-plugins/pkg-plist
>--- multimedia/avidemux-plugins.orig/pkg-plist
>+++ multimedia/avidemux-plugins/pkg-plist
>@@ -101,7 +101,7 @@
> %%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

Actions: View | Diff

Attachments on bug 244337: 211858 | 211859