FreeBSD Bugzilla – Attachment 207303 Details for
Bug 237320
multimedia/lives: Fix build and packaging failure
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Build lives without alsa, jack and pulse
lives.diff (text/plain), 4.09 KB, created by
Vladimir Druzenko
on 2019-09-09 00:40:11 UTC
(
hide
)
Description:
Build lives without alsa, jack and pulse
Filename:
MIME Type:
Creator:
Vladimir Druzenko
Created:
2019-09-09 00:40:11 UTC
Size:
4.09 KB
patch
obsolete
>diff -ur multimedia/lives.orig/Makefile multimedia/lives/Makefile >--- multimedia/lives.orig/Makefile >+++ multimedia/lives/Makefile >@@ -16,12 +16,8 @@ > > 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,25 @@ > 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 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 >+PULSEAUDIO_VARS_OFF= --disable-pulse >+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio libprojectM.so:graphics/libprojectm > > post-patch: > @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ >diff -ur multimedia/lives.orig/files/patch-configure.ac multimedia/lives/files/patch-configure.ac >--- multimedia/lives.orig/files/patch-configure.ac >+++ multimedia/lives/files/patch-configure.ac >@@ -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) >diff -ur multimedia/lives.orig/pkg-plist multimedia/lives/pkg-plist >--- multimedia/lives.orig/pkg-plist >+++ multimedia/lives/pkg-plist >@@ -111,7 +111,7 @@ > 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 >+%%PULSEAUDIO%%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 237320
:
203725
|
203813
|
207303
|
207305
|
207319