Attachment #207319 for bug #237320





BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
		${LOCALBASE}/bin/analyseplugin:audio/ladspa
LIB_DEPENDS=	libogg.so:audio/libogg \
		libjack.so:audio/jack \
		libogg.so:audio/libogg \
		libpulse.so:audio/pulseaudio \
		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 \

		lives-plugins/marcos-encoders/README.multi_encoder \
		weed-docs/weedspec.txt weed-docs/weedevents.txt

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




--- configure.ac.orig	2019-01-08 13:49:30 UTC
+++ configure.ac
@@ -522,12 +522,14 @@
 
 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

 
 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)

Lines 111-117 Link Here

(-)multimedia/lives/pkg-plist (-1 / +1 lines)
111	lib/lives/plugins/effects/realtime/weed/palette_test.so	111	lib/lives/plugins/effects/realtime/weed/palette_test.so
112	lib/lives/plugins/effects/realtime/weed/plasma.so	112	lib/lives/plugins/effects/realtime/weed/plasma.so
113	lib/lives/plugins/effects/realtime/weed/posterise.so	113	lib/lives/plugins/effects/realtime/weed/posterise.so
114	lib/lives/plugins/effects/realtime/weed/projectM.so	114	%%PROJECTM%%lib/lives/plugins/effects/realtime/weed/projectM.so
115	lib/lives/plugins/effects/realtime/weed/puretext.so	115	lib/lives/plugins/effects/realtime/weed/puretext.so
116	lib/lives/plugins/effects/realtime/weed/randomiser.so	116	lib/lives/plugins/effects/realtime/weed/randomiser.so
117	lib/lives/plugins/effects/realtime/weed/revTV.so	117	lib/lives/plugins/effects/realtime/weed/revTV.so

Return to bug 237320

Lines 16-27 Link Here

(-)multimedia/lives/Makefile (-6 / +11 lines)
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \	17	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
18	${LOCALBASE}/bin/analyseplugin:audio/ladspa	18	${LOCALBASE}/bin/analyseplugin:audio/ladspa
19	LIB_DEPENDS= libasound.so:audio/alsa-lib \	19	LIB_DEPENDS= libogg.so:audio/libogg \
20	libjack.so:audio/jack \
21	libogg.so:audio/libogg \
22	libpulse.so:audio/pulseaudio \
23	liboil-0.3.so:devel/liboil \	20	liboil-0.3.so:devel/liboil \
24	libprojectM.so:graphics/libprojectm \
25	libvisual-0.4.so:graphics/libvisual04 \	21	libvisual-0.4.so:graphics/libvisual04 \
26	libopencv_calib3d.so:graphics/opencv \	22	libopencv_calib3d.so:graphics/opencv \
27	libopencv_core.so:graphics/opencv-core \	23	libopencv_core.so:graphics/opencv-core \
Lines 73-91 Link Here
73	lives-plugins/marcos-encoders/README.multi_encoder \	69	lives-plugins/marcos-encoders/README.multi_encoder \
74	weed-docs/weedspec.txt weed-docs/weedevents.txt	70	weed-docs/weedspec.txt weed-docs/weedevents.txt
75		71
76	OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA V4L NLS	72	OPTIONS_DEFINE= ALSA DOCS DOXYGEN FREI0R JACK MATROSKA V4L NLS PROJECTM PULSEAUDIO
77	OPTIONS_SUB= yes	73	OPTIONS_SUB= yes
78		74
		75	ALSA_VARS_OFF= --disable-alsa
		76	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
79	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen	77	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
80	DOXYGEN_CONFIGURE_OFF= --disable-doxygen	78	DOXYGEN_CONFIGURE_OFF= --disable-doxygen
81	FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r	79	FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r
82	FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r	80	FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r
83	FREI0R_CONFIGURE_ENV_OFF= ac_cv_header_frei0r_h=no	81	FREI0R_CONFIGURE_ENV_OFF= ac_cv_header_frei0r_h=no
		82	JACK_VARS_OFF= --disable-jack
		83	JACK_LIB_DEPENDS= libjack.so:audio/jack
84	MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix	84	MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix
85	V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat	85	V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
86	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l	86	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
87	NLS_USES= gettext-tools	87	NLS_USES= gettext-tools
88	NLS_CONFIGURE_OFF= --disable-nls	88	NLS_CONFIGURE_OFF= --disable-nls
		89	PROJECTM_DESC= projectM support
		90	PROJECTM_VARS_OFF= --disable-projectM
		91	PROJECTM_LIB_DEPENDS= libprojectM.so:graphics/libprojectm
		92	PULSEAUDIO_VARS_OFF= --disable-pulse
		93	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
89		94
90	post-patch:	95	post-patch:
91	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} \	96	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} \

Lines 1-12 Link Here

(-)multimedia/lives/files/patch-configure.ac (-5 / +36 lines)
1	--- configure.ac.orig 2019-01-08 13:49:30 UTC	1	--- configure.ac.orig 2019-01-08 13:49:30 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -520,14 +520,16 @@ HAVE_OPENCV=false	3	@@ -522,12 +522,14 @@
4		4
5	dnl check for opencv	5	PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
6		6
7	-PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
8	+PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
9
10	-if test "HAVE_OPENCV" = "true" ; then	7	-if test "HAVE_OPENCV" = "true" ; then
11	-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`	8	-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
12	+if test "$HAVE_OPENCV" = "true" ; then	9	+if test "$HAVE_OPENCV" = "true" ; then
Lines 20-22 Link Here
20		17
21	AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)	18	AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
22		19
		20	@@ -734,16 +736,23 @@
		21
		22
		23	HAVE_ALSA=false
		24	+AC_ARG_ENABLE(alsa, [ --disable-alsa Disable alsa support.] , disable_alsa=yes)
		25	+if test "x$disable_alsa" != "xyes" ; then
		26	dnl check for libasound
		27	PKG_CHECK_MODULES(ALSA,alsa,HAVE_ALSA=true,HAVE_ALSA=false)
		28	AC_SUBST(ALSA_CFLAGS)
		29	AC_SUBST(ALSA_LIBS)
		30	+else
		31	+echo not checking for alsa
		32	+fi
		33
		34	AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA)
		35
		36
		37	HAVE_PULSE_AUDIO=false
		38	HAVE_PA_STREAM_BEGIN_WRITE=false
		39	+AC_ARG_ENABLE(pulse, [ --disable-pulse Disable pulseaudio support.] , disable_pulse=yes)
		40	+if test "x$disable_pulse" != "xyes" ; then
		41	dnl check for pulse-audio
		42	PKG_CHECK_MODULES(PULSE,libpulse >= 0.9.14,HAVE_PULSE_AUDIO=true,HAVE_PULSE_AUDIO=false)
		43	if test "$HAVE_PULSE_AUDIO" = "true" ; then
		44	@@ -752,6 +761,9 @@
		45
		46	AC_SUBST(PULSE_CFLAGS)
		47	AC_SUBST(PULSE_LIBS)
		48	+else
		49	+echo not checking for pulse
		50	+fi
		51
		52	AM_CONDITIONAL(HAVE_PULSE_AUDIO,$HAVE_PULSE_AUDIO)
		53	AM_CONDITIONAL(HAVE_PA_STREAM_BEGIN_WRITE,$HAVE_PA_STREAM_BEGIN_WRITE)