From owner-svn-ports-head@freebsd.org Sun Feb 23 16:05:17 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0EC8E240CE4; Sun, 23 Feb 2020 16:05:17 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48QVQh6jPsz3HS8; Sun, 23 Feb 2020 16:05:16 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBE24EF71; Sun, 23 Feb 2020 16:05:16 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01NG5G5F039436; Sun, 23 Feb 2020 16:05:16 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01NG5Gdc039433; Sun, 23 Feb 2020 16:05:16 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202002231605.01NG5Gdc039433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 23 Feb 2020 16:05:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526927 - in head/multimedia: avidemux avidemux-plugins avidemux/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/multimedia: avidemux avidemux-plugins avidemux/files X-SVN-Commit-Revision: 526927 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2020 16:05:17 -0000 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 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@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)