From owner-svn-ports-all@freebsd.org Sat Sep 14 16:47:26 2019 Return-Path: Delivered-To: svn-ports-all@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 04635F9562; Sat, 14 Sep 2019 16:47:26 +0000 (UTC) (envelope-from rene@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 46Vz256K7vz4BSm; Sat, 14 Sep 2019 16:47:25 +0000 (UTC) (envelope-from rene@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 BBF8722957; Sat, 14 Sep 2019 16:47:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8EGlPC0054576; Sat, 14 Sep 2019 16:47:25 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8EGlPmi054572; Sat, 14 Sep 2019 16:47:25 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201909141647.x8EGlPmi054572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 14 Sep 2019 16:47:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512036 - in head/multimedia/lives: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/multimedia/lives: . files X-SVN-Commit-Revision: 512036 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2019 16:47:26 -0000 Author: rene Date: Sat Sep 14 16:47:24 2019 New Revision: 512036 URL: https://svnweb.freebsd.org/changeset/ports/512036 Log: multimedia/lives: make ALSA, Jack, PulseAudio and ProjectM optional. PR: 237320 Submitted by: vvd Modified: head/multimedia/lives/Makefile head/multimedia/lives/files/patch-configure.ac head/multimedia/lives/pkg-plist Modified: head/multimedia/lives/Makefile ============================================================================== --- head/multimedia/lives/Makefile Sat Sep 14 16:29:22 2019 (r512035) +++ head/multimedia/lives/Makefile Sat Sep 14 16:47:24 2019 (r512036) @@ -16,12 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/bin/analyseplugin:audio/ladspa -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libjack.so:audio/jack \ - libogg.so:audio/libogg \ - libpulse.so:audio/pulseaudio \ +LIB_DEPENDS= libogg.so:audio/libogg \ liboil-0.3.so:devel/liboil \ - libprojectM.so:graphics/libprojectm \ libvisual-0.4.so:graphics/libvisual04 \ libopencv_calib3d.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ @@ -73,19 +69,28 @@ DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STA lives-plugins/marcos-encoders/README.multi_encoder \ weed-docs/weedspec.txt weed-docs/weedevents.txt -OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA V4L NLS +OPTIONS_DEFINE= ALSA DOCS DOXYGEN FREI0R JACK MATROSKA V4L NLS PROJECTM PULSEAUDIO OPTIONS_SUB= yes +ALSA_VARS_OFF= --disable-alsa +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_OFF= --disable-doxygen FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r FREI0R_CONFIGURE_ENV_OFF= ac_cv_header_frei0r_h=no +JACK_VARS_OFF= --disable-jack +JACK_LIB_DEPENDS= libjack.so:audio/jack MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l NLS_USES= gettext-tools NLS_CONFIGURE_OFF= --disable-nls +PROJECTM_DESC= projectM support +PROJECTM_VARS_OFF= --disable-projectM +PROJECTM_LIB_DEPENDS= libprojectM.so:graphics/libprojectm +PULSEAUDIO_VARS_OFF= --disable-pulse +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ Modified: head/multimedia/lives/files/patch-configure.ac ============================================================================== --- head/multimedia/lives/files/patch-configure.ac Sat Sep 14 16:29:22 2019 (r512035) +++ head/multimedia/lives/files/patch-configure.ac Sat Sep 14 16:47:24 2019 (r512036) @@ -1,12 +1,9 @@ --- configure.ac.orig 2019-01-08 13:49:30 UTC +++ configure.ac -@@ -520,14 +520,16 @@ HAVE_OPENCV=false +@@ -522,12 +522,14 @@ - dnl check for opencv + PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false) --PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false) -+PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false) - -if test "HAVE_OPENCV" = "true" ; then -OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L` +if test "$HAVE_OPENCV" = "true" ; then @@ -20,3 +17,37 @@ AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV) +@@ -734,16 +736,23 @@ + + + HAVE_ALSA=false ++AC_ARG_ENABLE(alsa, [ --disable-alsa Disable alsa support.] , disable_alsa=yes) ++if test "x$disable_alsa" != "xyes" ; then + dnl check for libasound + PKG_CHECK_MODULES(ALSA,alsa,HAVE_ALSA=true,HAVE_ALSA=false) + AC_SUBST(ALSA_CFLAGS) + AC_SUBST(ALSA_LIBS) ++else ++echo not checking for alsa ++fi + + AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA) + + + HAVE_PULSE_AUDIO=false + HAVE_PA_STREAM_BEGIN_WRITE=false ++AC_ARG_ENABLE(pulse, [ --disable-pulse Disable pulseaudio support.] , disable_pulse=yes) ++if test "x$disable_pulse" != "xyes" ; then + dnl check for pulse-audio + PKG_CHECK_MODULES(PULSE,libpulse >= 0.9.14,HAVE_PULSE_AUDIO=true,HAVE_PULSE_AUDIO=false) + if test "$HAVE_PULSE_AUDIO" = "true" ; then +@@ -752,6 +761,9 @@ + + AC_SUBST(PULSE_CFLAGS) + AC_SUBST(PULSE_LIBS) ++else ++echo not checking for pulse ++fi + + AM_CONDITIONAL(HAVE_PULSE_AUDIO,$HAVE_PULSE_AUDIO) + AM_CONDITIONAL(HAVE_PA_STREAM_BEGIN_WRITE,$HAVE_PA_STREAM_BEGIN_WRITE) Modified: head/multimedia/lives/pkg-plist ============================================================================== --- head/multimedia/lives/pkg-plist Sat Sep 14 16:29:22 2019 (r512035) +++ head/multimedia/lives/pkg-plist Sat Sep 14 16:47:24 2019 (r512036) @@ -111,7 +111,7 @@ lib/lives/plugins/effects/realtime/weed/onedTV.so lib/lives/plugins/effects/realtime/weed/palette_test.so lib/lives/plugins/effects/realtime/weed/plasma.so lib/lives/plugins/effects/realtime/weed/posterise.so -lib/lives/plugins/effects/realtime/weed/projectM.so +%%PROJECTM%%lib/lives/plugins/effects/realtime/weed/projectM.so lib/lives/plugins/effects/realtime/weed/puretext.so lib/lives/plugins/effects/realtime/weed/randomiser.so lib/lives/plugins/effects/realtime/weed/revTV.so