Attachment #214533 for bug #246491




# $FreeBSD$

PORTNAME=	lives
PORTVERSION=	3.0.2
PORTREVISION=	6
CATEGORIES=	multimedia
MASTER_SITES=	http://lives-video.com/releases/
DISTNAME=	LiVES-${PORTVERSION}

		mpg123:audio/mpg123 \
		sox:audio/sox \
		ogg123:audio/vorbis-tools \
		convert:graphics/ImageMagick7 \
		sswf:graphics/sswf \
		mencoder:multimedia/mencoder \
		mplayer:multimedia/mplayer \

GNU_CONFIGURE=	yes
USE_XORG=	x11 xrender
USE_GL=		gl glu
USE_SDL=	sdl sdl2
USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
USE_LDCONFIG=	yes


CONFIGURE_ARGS=	--disable-ldvgrab
INSTALL_TARGET=	install-strip

DOC_FILES=	AUTHORS ChangeLog FEATURES GETTING.STARTED README \
		OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
		RFX/RFX.spec docs/clip_format.txt \
		lives-plugins/marcos-encoders/README.multi_encoder \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1547452499	1	TIMESTAMP = 1589558202
2	SHA256 (LiVES-2.10.2.tar.bz2) = 572e6ed613eedb035ceab5f48ba3e7331e40128652af2fbc066fd87594be241c	2	SHA256 (LiVES-3.0.2.tar.bz2) = 390991b73aa162f9475ef8abff29bbfd580c03f2cc14a8628dd1c13c8abbe332
3	SIZE (LiVES-2.10.2.tar.bz2) = 4100348	3	SIZE (LiVES-3.0.2.tar.bz2) = 4202028




 
 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)




--- lives-plugins/weed-plugins/Makefile.am.orig	2020-05-15 18:41:00.714625000 +0200
+++ lives-plugins/weed-plugins/Makefile.am	2020-05-15 18:43:44.335839000 +0200
@@ -81,7 +81,7 @@
 
 if HAVE_OPENCV
 farneback_analyser_libs = farneback_analyser.la
-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video -lopencv_imgproc
+farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_video -lopencv_imgproc
+farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
 farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
 farneback_analyser_la_SOURCES = farneback_analyser.cpp
 




lib/libOSC_client.so.0.0.0
lib/libweed-utils.so
lib/libweed-utils.so.0
lib/libweed-utils.so.0.0.11
lib/libweed-utils_scripting.so
lib/libweed-utils_scripting.so.0
lib/libweed-utils_scripting.so.0.0.11
lib/libweed.so
lib/libweed.so.0
lib/libweed.so.0.0.11
lib/libweed_slice.so
lib/libweed_slice.so.0
lib/libweed_slice.so.0.0.11
lib/libweed_slice_scripting.so
lib/libweed_slice_scripting.so.0
lib/libweed_slice_scripting.so.0.0.11
lib/lives/plugins/decoders/asf_decoder.so
lib/lives/plugins/decoders/dv_decoder.so
lib/lives/plugins/decoders/flv_decoder.so

share/app-install/icons/lives.png
share/applications/LiVES.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/FEATURES
%%PORTDOCS%%%%DOCSDIR%%/GETTING.STARTED

share/icons/hicolor/48x48/apps/lives.png
share/icons/hicolor/64x64/apps/lives.png
%%DATADIR%%/default.keymap
%%DATADIR%%/icons/lives-audio.png
%%DATADIR%%/icons/lives-fullscreen.png
%%DATADIR%%/icons/lives-locked.png
%%DATADIR%%/icons/lives-loop.png
%%DATADIR%%/icons/lives-playsel.png
%%DATADIR%%/icons/lives-pref_decoding.png
%%DATADIR%%/icons/lives-pref_directory.png
%%DATADIR%%/icons/lives-pref_effects.png
%%DATADIR%%/icons/lives-pref_encoding.png
%%DATADIR%%/icons/lives-pref_gui.png
%%DATADIR%%/icons/lives-pref_jack.png
%%DATADIR%%/icons/lives-pref_midi.png
%%DATADIR%%/icons/lives-pref_misc.png
%%DATADIR%%/icons/lives-pref_multitrack.png
%%DATADIR%%/icons/lives-pref_net.png
%%DATADIR%%/icons/lives-pref_playback.png
%%DATADIR%%/icons/lives-pref_record.png
%%DATADIR%%/icons/lives-pref_themes.png
%%DATADIR%%/icons/lives-pref_warning.png
%%DATADIR%%/icons/lives-sepwin.png
%%DATADIR%%/icons/lives-unlocked.png
%%DATADIR%%/icons/lives-volume_mute.png
%%DATADIR%%/icons/lives-zoom-in.png
%%DATADIR%%/icons/lives-zoom-out.png
%%DATADIR%%/mixxx.map
%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script
%%DATADIR%%/plugins/effects/RFXscripts/blur.script

Return to bug 246491

Lines 2-9 Link Here

(-)Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lives	4	PORTNAME= lives
5	PORTVERSION= 2.10.2	5	PORTVERSION= 3.0.2
6	PORTREVISION= 6
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8	MASTER_SITES= http://lives-video.com/releases/	7	MASTER_SITES= http://lives-video.com/releases/
9	DISTNAME= LiVES-${PORTVERSION}	8	DISTNAME= LiVES-${PORTVERSION}
Lines 33-39 Link Here
33	mpg123:audio/mpg123 \	32	mpg123:audio/mpg123 \
34	sox:audio/sox \	33	sox:audio/sox \
35	ogg123:audio/vorbis-tools \	34	ogg123:audio/vorbis-tools \
36	convert:graphics/ImageMagick6 \	35	convert:graphics/ImageMagick7 \
37	sswf:graphics/sswf \	36	sswf:graphics/sswf \
38	mencoder:multimedia/mencoder \	37	mencoder:multimedia/mencoder \
39	mplayer:multimedia/mplayer \	38	mplayer:multimedia/mplayer \
Lines 56-62 Link Here
56	GNU_CONFIGURE= yes	55	GNU_CONFIGURE= yes
57	USE_XORG= x11 xrender	56	USE_XORG= x11 xrender
58	USE_GL= gl glu	57	USE_GL= gl glu
59	USE_SDL= sdl	58	USE_SDL= sdl sdl2
60	USE_GNOME= cairo gdkpixbuf2 gtk30 intltool	59	USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
61	USE_LDCONFIG= yes	60	USE_LDCONFIG= yes
62		61
Lines 63-69 Link Here
63	CONFIGURE_ARGS= --disable-ldvgrab	62	CONFIGURE_ARGS= --disable-ldvgrab
64	INSTALL_TARGET= install-strip	63	INSTALL_TARGET= install-strip
65		64
66	DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \	65	DOC_FILES= AUTHORS ChangeLog FEATURES GETTING.STARTED README \
67	OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \	66	OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
68	RFX/RFX.spec docs/clip_format.txt \	67	RFX/RFX.spec docs/clip_format.txt \
69	lives-plugins/marcos-encoders/README.multi_encoder \	68	lives-plugins/marcos-encoders/README.multi_encoder \

Lines 17-53 Link Here

(-)files/patch-configure.ac (-34 lines)
17		17
18	AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)	18	AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
19		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)

Lines 1-12 Link Here

(-)files/patch-lives-plugins_weed-plugins_Makefile.am (-6 / +5 lines)
1	--- lives-plugins/weed-plugins/Makefile.am.orig 2019-04-14 20:00:14 UTC	1	--- lives-plugins/weed-plugins/Makefile.am.orig 2020-05-15 18:41:00.714625000 +0200
2	+++ lives-plugins/weed-plugins/Makefile.am	2	+++ lives-plugins/weed-plugins/Makefile.am 2020-05-15 18:43:44.335839000 +0200
3	@@ -85,7 +85,8 @@ endif	3	@@ -81,7 +81,7 @@
4		4
5	if HAVE_OPENCV	5	if HAVE_OPENCV
6	farneback_analyser_libs = farneback_analyser.la	6	farneback_analyser_libs = farneback_analyser.la
7	-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video	7	-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video -lopencv_imgproc
8	+farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_core -lopencv_video	8	+farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_video -lopencv_imgproc
9	+farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
10	farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)	9	farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
11	farneback_analyser_la_SOURCES = farneback_analyser.cpp	10	farneback_analyser_la_SOURCES = farneback_analyser.cpp
12		11

Lines 41-59 Link Here

(-)pkg-plist (-28 / +29 lines)
41	lib/libOSC_client.so.0.0.0	41	lib/libOSC_client.so.0.0.0
42	lib/libweed-utils.so	42	lib/libweed-utils.so
43	lib/libweed-utils.so.0	43	lib/libweed-utils.so.0
44	lib/libweed-utils.so.0.0.9	44	lib/libweed-utils.so.0.0.11
45	lib/libweed-utils_scripting.so	45	lib/libweed-utils_scripting.so
46	lib/libweed-utils_scripting.so.0	46	lib/libweed-utils_scripting.so.0
47	lib/libweed-utils_scripting.so.0.0.9	47	lib/libweed-utils_scripting.so.0.0.11
48	lib/libweed.so	48	lib/libweed.so
49	lib/libweed.so.0	49	lib/libweed.so.0
50	lib/libweed.so.0.0.9	50	lib/libweed.so.0.0.11
51	lib/libweed_slice.so	51	lib/libweed_slice.so
52	lib/libweed_slice.so.0	52	lib/libweed_slice.so.0
53	lib/libweed_slice.so.0.0.9	53	lib/libweed_slice.so.0.0.11
54	lib/libweed_slice_scripting.so	54	lib/libweed_slice_scripting.so
55	lib/libweed_slice_scripting.so.0	55	lib/libweed_slice_scripting.so.0
56	lib/libweed_slice_scripting.so.0.0.9	56	lib/libweed_slice_scripting.so.0.0.11
57	lib/lives/plugins/decoders/asf_decoder.so	57	lib/lives/plugins/decoders/asf_decoder.so
58	lib/lives/plugins/decoders/dv_decoder.so	58	lib/lives/plugins/decoders/dv_decoder.so
59	lib/lives/plugins/decoders/flv_decoder.so	59	lib/lives/plugins/decoders/flv_decoder.so
Lines 215-221 Link Here
215	share/app-install/icons/lives.png	215	share/app-install/icons/lives.png
216	share/applications/LiVES.desktop	216	share/applications/LiVES.desktop
217	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	217	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
218	%%PORTDOCS%%%%DOCSDIR%%/BUGS
219	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	218	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
220	%%PORTDOCS%%%%DOCSDIR%%/FEATURES	219	%%PORTDOCS%%%%DOCSDIR%%/FEATURES
221	%%PORTDOCS%%%%DOCSDIR%%/GETTING.STARTED	220	%%PORTDOCS%%%%DOCSDIR%%/GETTING.STARTED
Lines 237-264 Link Here
237	share/icons/hicolor/48x48/apps/lives.png	236	share/icons/hicolor/48x48/apps/lives.png
238	share/icons/hicolor/64x64/apps/lives.png	237	share/icons/hicolor/64x64/apps/lives.png
239	%%DATADIR%%/default.keymap	238	%%DATADIR%%/default.keymap
240	%%DATADIR%%/icons/audio.png	239	%%DATADIR%%/icons/lives-audio.png
241	%%DATADIR%%/icons/fullscreen.png	240	%%DATADIR%%/icons/lives-fullscreen.png
242	%%DATADIR%%/icons/loop.png	241	%%DATADIR%%/icons/lives-locked.png
243	%%DATADIR%%/icons/playsel.png	242	%%DATADIR%%/icons/lives-loop.png
244	%%DATADIR%%/icons/pref_decoding.png	243	%%DATADIR%%/icons/lives-playsel.png
245	%%DATADIR%%/icons/pref_directory.png	244	%%DATADIR%%/icons/lives-pref_decoding.png
246	%%DATADIR%%/icons/pref_effects.png	245	%%DATADIR%%/icons/lives-pref_directory.png
247	%%DATADIR%%/icons/pref_encoding.png	246	%%DATADIR%%/icons/lives-pref_effects.png
248	%%DATADIR%%/icons/pref_gui.png	247	%%DATADIR%%/icons/lives-pref_encoding.png
249	%%DATADIR%%/icons/pref_jack.png	248	%%DATADIR%%/icons/lives-pref_gui.png
250	%%DATADIR%%/icons/pref_midi.png	249	%%DATADIR%%/icons/lives-pref_jack.png
251	%%DATADIR%%/icons/pref_misc.png	250	%%DATADIR%%/icons/lives-pref_midi.png
252	%%DATADIR%%/icons/pref_multitrack.png	251	%%DATADIR%%/icons/lives-pref_misc.png
253	%%DATADIR%%/icons/pref_net.png	252	%%DATADIR%%/icons/lives-pref_multitrack.png
254	%%DATADIR%%/icons/pref_playback.png	253	%%DATADIR%%/icons/lives-pref_net.png
255	%%DATADIR%%/icons/pref_record.png	254	%%DATADIR%%/icons/lives-pref_playback.png
256	%%DATADIR%%/icons/pref_themes.png	255	%%DATADIR%%/icons/lives-pref_record.png
257	%%DATADIR%%/icons/pref_warning.png	256	%%DATADIR%%/icons/lives-pref_themes.png
258	%%DATADIR%%/icons/sepwin.png	257	%%DATADIR%%/icons/lives-pref_warning.png
259	%%DATADIR%%/icons/volume_mute.png	258	%%DATADIR%%/icons/lives-sepwin.png
260	%%DATADIR%%/icons/zoom-in.png	259	%%DATADIR%%/icons/lives-unlocked.png
261	%%DATADIR%%/icons/zoom-out.png	260	%%DATADIR%%/icons/lives-volume_mute.png
		261	%%DATADIR%%/icons/lives-zoom-in.png
		262	%%DATADIR%%/icons/lives-zoom-out.png
262	%%DATADIR%%/mixxx.map	263	%%DATADIR%%/mixxx.map
263	%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script	264	%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script
264	%%DATADIR%%/plugins/effects/RFXscripts/blur.script	265	%%DATADIR%%/plugins/effects/RFXscripts/blur.script