Attachment #217538 for bug #246491




# $FreeBSD: head/multimedia/lives/Makefile 512078 2019-09-14 21:30:54Z tobik $

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

		mpg123:audio/mpg123 \
		sox:audio/sox \
		ogg123:audio/vorbis-tools \
		convert:graphics/ImageMagick6 \
		sswf:graphics/sswf \
		mencoder:multimedia/mencoder \
		mplayer:multimedia/mplayer \
		ogmmerge:multimedia/ogmtools \
		transcode:multimedia/transcode \
		x264:multimedia/x264 \
		cdrecord:sysutils/cdrtools


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 --disable-system-weed
INSTALL_TARGET=	install-strip

DOC_FILES=	AUTHORS ChangeLog FEATURES GETTING.STARTED NEWS 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 \
		weed-docs/weedspec.txt weed-docs/weedevents.txt

OPTIONS_DEFINE=			ALSA DOCS DOXYGEN FREI0R JACK MATROSKA V4L NLS PROJECTM PULSEAUDIO
OPTIONS_SINGLE=			IMAGEMAGICK
OPTIONS_SINGLE_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
OPTIONS_DEFAULT=		DOCS IMAGEMAGICK7 MATROSKA NLS
OPTIONS_SUB=			yes

ALSA_CONFIGURE_ENABLE=		alsa
ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
DOXYGEN_CONFIGURE_ENABLE=	doxygen
IMAGEMAGICK6_DESC=		${IMAGEMAGICK_DESC} version 6.x
IMAGEMAGICK6_RUN_DEPENDS=	convert:graphics/ImageMagick6
IMAGEMAGICK7_DESC=		${IMAGEMAGICK_DESC} version 7.x
IMAGEMAGICK7_RUN_DEPENDS=	convert:graphics/ImageMagick7
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_CONFIGURE_ENABLE=		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_ENABLE=		nls
PROJECTM_DESC=			projectM support
PROJECTM_CONFIGURE_ENABLE=	projectM
PROJECTM_LIB_DEPENDS=		libprojectM.so:graphics/libprojectm
PULSEAUDIO_CONFIGURE_ENABLE=	pulse
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio

post-patch:
	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \

Lines 1-3 Link Here

(-)multimedia/lives/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1547452499	1	TIMESTAMP = 1598425069
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




--- configure.ac.orig
+++ configure.ac
@@ -544,12 +544,14 @@
 
 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
+OPENCV_LIBS_ONLY_L=`pkg-config opencv --libs-only-L`
+OPENCV_LIBS_ONLY_OTHER=`pkg-config opencv --libs-only-other`
 fi
 
 AC_SUBST(OPENCV_CFLAGS)
 AC_SUBST(OPENCV_LIBS_ONLY_L)
+AC_SUBST(OPENCV_LIBS_ONLY_OTHER)

 AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
 
@@ -734,16 +736,23 @@

@@ -742,15 +744,22 @@
 AM_CONDITIONAL(HAVE_DIRAC,$HAVE_DIRAC)
 
 HAVE_ALSA=false
+AC_ARG_ENABLE(alsa, [  --disable-alsa     Disable alsa support.] , disable_alsa=yes)
+if test "x$disable_alsa" != "xyes" ; then

+else
+echo not checking for alsa
+fi
 
 AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA)

 
 HAVE_PULSE_AUDIO=false
 HAVE_PA_STREAM_BEGIN_WRITE=false

 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
@@ -759,6 +768,9 @@
 
 AC_SUBST(PULSE_CFLAGS)
 AC_SUBST(PULSE_LIBS)

 
 AM_CONDITIONAL(HAVE_PULSE_AUDIO,$HAVE_PULSE_AUDIO)
 AM_CONDITIONAL(HAVE_PA_STREAM_BEGIN_WRITE,$HAVE_PA_STREAM_BEGIN_WRITE)
@@ -865,7 +877,9 @@
 HAVE_SYSTEM_WEED_COMPAT=false
 HAVE_SYSTEM_WEED_PLUGIN=false
 
-if test "$IS_MINGW" = "false"; then
+AC_ARG_ENABLE(weed, [  --disable-system-weed Disable check system weed.] , disable_system_weed=yes)
+
+if test "$IS_MINGW" = "false" && "x$disable_system_weed" != "xyes"; then
 
 PKG_CHECK_MODULES(WEED, libweed >= 0.11.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
 

Lines 1-11 Link Here

(-)multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (-5 / +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
2	+++ lives-plugins/weed-plugins/Makefile.am	2	+++ lives-plugins/weed-plugins/Makefile.am
3	@@ -85,7 +85,8 @@ endif	3	@@ -81,7 +81,8 @@
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_core -lopencv_video -lopencv_imgproc
9	+farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)	9	+farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
10	farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)	10	farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
11	farneback_analyser_la_SOURCES = farneback_analyser.cpp	11	farneback_analyser_la_SOURCES = farneback_analyser.cpp

Lines 1-4 Link Here

(-)multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (-1 / +1 lines)
1	--- lives-plugins/weed-plugins/gdk/Makefile.am.orig 2019-04-15 10:55:37 UTC	1	--- lives-plugins/weed-plugins/gdk/Makefile.am.orig
2	+++ lives-plugins/weed-plugins/gdk/Makefile.am	2	+++ lives-plugins/weed-plugins/gdk/Makefile.am
3	@@ -59,8 +59,8 @@ EXTRA_DIST=data icons	3	@@ -59,8 +59,8 @@ EXTRA_DIST=data icons
4		4




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
%%PORTDOCS%%%%DOCSDIR%%/LiVES-Perl.odt
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder
%%PORTDOCS%%%%DOCSDIR%%/RFX.spec

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

(-)multimedia/lives/Makefile (-28 / +33 lines)
2	# $FreeBSD: head/multimedia/lives/Makefile 512078 2019-09-14 21:30:54Z tobik $	2	# $FreeBSD: head/multimedia/lives/Makefile 512078 2019-09-14 21:30:54Z tobik $
3		3
4	PORTNAME= lives	4	PORTNAME= lives
5	PORTVERSION= 2.10.2	5	PORTVERSION= 3.0.2
6	PORTREVISION= 6	6	PORTREVISION= 0
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	MASTER_SITES= http://lives-video.com/releases/	8	MASTER_SITES= http://lives-video.com/releases/
9	DISTNAME= LiVES-${PORTVERSION}	9	DISTNAME= LiVES-${PORTVERSION}
Lines 33-44 Link Here
33	mpg123:audio/mpg123 \	33	mpg123:audio/mpg123 \
34	sox:audio/sox \	34	sox:audio/sox \
35	ogg123:audio/vorbis-tools \	35	ogg123:audio/vorbis-tools \
36	convert:graphics/ImageMagick6 \
37	sswf:graphics/sswf \	36	sswf:graphics/sswf \
38	mencoder:multimedia/mencoder \	37	mencoder:multimedia/mencoder \
39	mplayer:multimedia/mplayer \	38	mplayer:multimedia/mplayer \
40	ogmmerge:multimedia/ogmtools \	39	ogmmerge:multimedia/ogmtools \
41	transcode:multimedia/transcode \
42	x264:multimedia/x264 \	40	x264:multimedia/x264 \
43	cdrecord:sysutils/cdrtools	41	cdrecord:sysutils/cdrtools
44		42
Lines 56-96 Link Here
56	GNU_CONFIGURE= yes	54	GNU_CONFIGURE= yes
57	USE_XORG= x11 xrender	55	USE_XORG= x11 xrender
58	USE_GL= gl glu	56	USE_GL= gl glu
59	USE_SDL= sdl	57	USE_SDL= sdl sdl2
60	USE_GNOME= cairo gdkpixbuf2 gtk30 intltool	58	USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
61	USE_LDCONFIG= yes	59	USE_LDCONFIG= yes
62		60
63	CONFIGURE_ARGS= --disable-ldvgrab	61	CONFIGURE_ARGS= --disable-ldvgrab --disable-system-weed
64	INSTALL_TARGET= install-strip	62	INSTALL_TARGET= install-strip
65		63
66	DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \	64	DOC_FILES= AUTHORS ChangeLog FEATURES GETTING.STARTED NEWS README \
67	OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \	65	OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
68	RFX/RFX.spec docs/clip_format.txt \	66	RFX/RFX.spec docs/clip_format.txt \
69	lives-plugins/marcos-encoders/README.multi_encoder \	67	lives-plugins/marcos-encoders/README.multi_encoder \
70	weed-docs/weedspec.txt weed-docs/weedevents.txt	68	weed-docs/weedspec.txt weed-docs/weedevents.txt
71		69
72	OPTIONS_DEFINE= ALSA DOCS DOXYGEN FREI0R JACK MATROSKA V4L NLS PROJECTM PULSEAUDIO	70	OPTIONS_DEFINE= ALSA DOCS DOXYGEN FREI0R JACK MATROSKA V4L NLS PROJECTM PULSEAUDIO
73	OPTIONS_SUB= yes	71	OPTIONS_SINGLE= IMAGEMAGICK
		72	OPTIONS_SINGLE_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7
		73	OPTIONS_DEFAULT= DOCS IMAGEMAGICK7 MATROSKA NLS
		74	OPTIONS_SUB= yes
74		75
75	ALSA_CONFIGURE_OFF= --disable-alsa	76	ALSA_CONFIGURE_ENABLE= alsa
76	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	77	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
77	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen	78	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
78	DOXYGEN_CONFIGURE_OFF= --disable-doxygen	79	DOXYGEN_CONFIGURE_ENABLE= doxygen
79	FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r	80	IMAGEMAGICK6_DESC= ${IMAGEMAGICK_DESC} version 6.x
80	FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r	81	IMAGEMAGICK6_RUN_DEPENDS= convert:graphics/ImageMagick6
81	FREI0R_CONFIGURE_ENV_OFF=ac_cv_header_frei0r_h=no	82	IMAGEMAGICK7_DESC= ${IMAGEMAGICK_DESC} version 7.x
82	JACK_CONFIGURE_OFF= --disable-jack	83	IMAGEMAGICK7_RUN_DEPENDS= convert:graphics/ImageMagick7
83	JACK_LIB_DEPENDS= libjack.so:audio/jack	84	FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r
84	MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix	85	FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r
85	V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat	86	FREI0R_CONFIGURE_ENV_OFF= ac_cv_header_frei0r_h=no
86	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l	87	JACK_CONFIGURE_ENABLE= jack
87	NLS_USES= gettext-tools	88	JACK_LIB_DEPENDS= libjack.so:audio/jack
88	NLS_CONFIGURE_OFF= --disable-nls	89	MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix
89	PROJECTM_DESC= projectM support	90	V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
90	PROJECTM_CONFIGURE_OFF= --disable-projectM	91	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
91	PROJECTM_LIB_DEPENDS= libprojectM.so:graphics/libprojectm	92	NLS_USES= gettext-tools
92	PULSEAUDIO_CONFIGURE_OFF=--disable-pulse	93	NLS_CONFIGURE_ENABLE= nls
93	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	94	PROJECTM_DESC= projectM support
		95	PROJECTM_CONFIGURE_ENABLE= projectM
		96	PROJECTM_LIB_DEPENDS= libprojectM.so:graphics/libprojectm
		97	PULSEAUDIO_CONFIGURE_ENABLE= pulse
		98	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
94		99
95	post-patch:	100	post-patch:
96	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} \	101	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} \

Lines 1-25 Link Here

(-)multimedia/lives/files/patch-configure.ac (-11 / +21 lines)
1	--- configure.ac.orig 2019-01-08 13:49:30 UTC	1	--- configure.ac.orig
2	+++ configure.ac	2	+++ configure.ac
3	@@ -522,12 +522,14 @@	3	@@ -544,12 +544,14 @@
4		4
5	PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)	5	PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
6		6
7	-if test "HAVE_OPENCV" = "true" ; then	7	-if test "HAVE_OPENCV" = "true" ; then
8	-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`	8	-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
9	+if test "$HAVE_OPENCV" = "true" ; then	9	+if test "$HAVE_OPENCV" = "true" ; then
10	+OPENCV_LIBS_ONLY_L=`$PKG_CONFIG opencv --libs-only-L`	10	+OPENCV_LIBS_ONLY_L=`pkg-config opencv --libs-only-L`
11	+OPENCV_LIBS_ONLY_OTHER=`$PKG_CONFIG opencv --libs-only-other`	11	+OPENCV_LIBS_ONLY_OTHER=`pkg-config opencv --libs-only-other`
12	fi	12	fi
13		13
14	AC_SUBST(OPENCV_CFLAGS)	14	AC_SUBST(OPENCV_CFLAGS)
15	AC_SUBST(OPENCV_LIBS_ONLY_L)	15	AC_SUBST(OPENCV_LIBS_ONLY_L)
16	+AC_SUBST(OPENCV_LIBS_ONLY_OTHER)	16	+AC_SUBST(OPENCV_LIBS_ONLY_OTHER)
17		17
18	AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)	18	AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
19
20	@@ -734,16 +736,23 @@
21		19
22		20	@@ -742,15 +744,22 @@
		21	AM_CONDITIONAL(HAVE_DIRAC,$HAVE_DIRAC)
		22
23	HAVE_ALSA=false	23	HAVE_ALSA=false
24	+AC_ARG_ENABLE(alsa, [ --disable-alsa Disable alsa support.] , disable_alsa=yes)	24	+AC_ARG_ENABLE(alsa, [ --disable-alsa Disable alsa support.] , disable_alsa=yes)
25	+if test "x$disable_alsa" != "xyes" ; then	25	+if test "x$disable_alsa" != "xyes" ; then
Lines 30-38 Link Here
30	+else	30	+else
31	+echo not checking for alsa	31	+echo not checking for alsa
32	+fi	32	+fi
33		33
34	AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA)	34	AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA)
35
36		35
37	HAVE_PULSE_AUDIO=false	36	HAVE_PULSE_AUDIO=false
38	HAVE_PA_STREAM_BEGIN_WRITE=false	37	HAVE_PA_STREAM_BEGIN_WRITE=false
Lines 41-47 Link Here
41	dnl check for pulse-audio	40	dnl check for pulse-audio
42	PKG_CHECK_MODULES(PULSE,libpulse >= 0.9.14,HAVE_PULSE_AUDIO=true,HAVE_PULSE_AUDIO=false)	41	PKG_CHECK_MODULES(PULSE,libpulse >= 0.9.14,HAVE_PULSE_AUDIO=true,HAVE_PULSE_AUDIO=false)
43	if test "$HAVE_PULSE_AUDIO" = "true" ; then	42	if test "$HAVE_PULSE_AUDIO" = "true" ; then
44	@@ -752,6 +761,9 @@	43	@@ -759,6 +768,9 @@
45		44
46	AC_SUBST(PULSE_CFLAGS)	45	AC_SUBST(PULSE_CFLAGS)
47	AC_SUBST(PULSE_LIBS)	46	AC_SUBST(PULSE_LIBS)
Lines 51-53 Link Here
51		50
52	AM_CONDITIONAL(HAVE_PULSE_AUDIO,$HAVE_PULSE_AUDIO)	51	AM_CONDITIONAL(HAVE_PULSE_AUDIO,$HAVE_PULSE_AUDIO)
53	AM_CONDITIONAL(HAVE_PA_STREAM_BEGIN_WRITE,$HAVE_PA_STREAM_BEGIN_WRITE)	52	AM_CONDITIONAL(HAVE_PA_STREAM_BEGIN_WRITE,$HAVE_PA_STREAM_BEGIN_WRITE)
		53	@@ -865,7 +877,9 @@
		54	HAVE_SYSTEM_WEED_COMPAT=false
		55	HAVE_SYSTEM_WEED_PLUGIN=false
		56
		57	-if test "$IS_MINGW" = "false"; then
		58	+AC_ARG_ENABLE(weed, [ --disable-system-weed Disable check system weed.] , disable_system_weed=yes)
		59	+
		60	+if test "$IS_MINGW" = "false" && "x$disable_system_weed" != "xyes"; then
		61
		62	PKG_CHECK_MODULES(WEED, libweed >= 0.11.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
		63

Lines 41-59 Link Here

(-)multimedia/lives/pkg-plist (-28 / +30 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-225 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
222	%%PORTDOCS%%%%DOCSDIR%%/LiVES-Perl.odt	221	%%PORTDOCS%%%%DOCSDIR%%/LiVES-Perl.odt
		222	%%PORTDOCS%%%%DOCSDIR%%/NEWS
223	%%PORTDOCS%%%%DOCSDIR%%/README	223	%%PORTDOCS%%%%DOCSDIR%%/README
224	%%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder	224	%%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder
225	%%PORTDOCS%%%%DOCSDIR%%/RFX.spec	225	%%PORTDOCS%%%%DOCSDIR%%/RFX.spec
Lines 237-264 Link Here
237	share/icons/hicolor/48x48/apps/lives.png	237	share/icons/hicolor/48x48/apps/lives.png
238	share/icons/hicolor/64x64/apps/lives.png	238	share/icons/hicolor/64x64/apps/lives.png
239	%%DATADIR%%/default.keymap	239	%%DATADIR%%/default.keymap
240	%%DATADIR%%/icons/audio.png	240	%%DATADIR%%/icons/lives-audio.png
241	%%DATADIR%%/icons/fullscreen.png	241	%%DATADIR%%/icons/lives-fullscreen.png
242	%%DATADIR%%/icons/loop.png	242	%%DATADIR%%/icons/lives-locked.png
243	%%DATADIR%%/icons/playsel.png	243	%%DATADIR%%/icons/lives-loop.png
244	%%DATADIR%%/icons/pref_decoding.png	244	%%DATADIR%%/icons/lives-playsel.png
245	%%DATADIR%%/icons/pref_directory.png	245	%%DATADIR%%/icons/lives-pref_decoding.png
246	%%DATADIR%%/icons/pref_effects.png	246	%%DATADIR%%/icons/lives-pref_directory.png
247	%%DATADIR%%/icons/pref_encoding.png	247	%%DATADIR%%/icons/lives-pref_effects.png
248	%%DATADIR%%/icons/pref_gui.png	248	%%DATADIR%%/icons/lives-pref_encoding.png
249	%%DATADIR%%/icons/pref_jack.png	249	%%DATADIR%%/icons/lives-pref_gui.png
250	%%DATADIR%%/icons/pref_midi.png	250	%%DATADIR%%/icons/lives-pref_jack.png
251	%%DATADIR%%/icons/pref_misc.png	251	%%DATADIR%%/icons/lives-pref_midi.png
252	%%DATADIR%%/icons/pref_multitrack.png	252	%%DATADIR%%/icons/lives-pref_misc.png
253	%%DATADIR%%/icons/pref_net.png	253	%%DATADIR%%/icons/lives-pref_multitrack.png
254	%%DATADIR%%/icons/pref_playback.png	254	%%DATADIR%%/icons/lives-pref_net.png
255	%%DATADIR%%/icons/pref_record.png	255	%%DATADIR%%/icons/lives-pref_playback.png
256	%%DATADIR%%/icons/pref_themes.png	256	%%DATADIR%%/icons/lives-pref_record.png
257	%%DATADIR%%/icons/pref_warning.png	257	%%DATADIR%%/icons/lives-pref_themes.png
258	%%DATADIR%%/icons/sepwin.png	258	%%DATADIR%%/icons/lives-pref_warning.png
259	%%DATADIR%%/icons/volume_mute.png	259	%%DATADIR%%/icons/lives-sepwin.png
260	%%DATADIR%%/icons/zoom-in.png	260	%%DATADIR%%/icons/lives-unlocked.png
261	%%DATADIR%%/icons/zoom-out.png	261	%%DATADIR%%/icons/lives-volume_mute.png
		262	%%DATADIR%%/icons/lives-zoom-in.png
		263	%%DATADIR%%/icons/lives-zoom-out.png
262	%%DATADIR%%/mixxx.map	264	%%DATADIR%%/mixxx.map
263	%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script	265	%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script
264	%%DATADIR%%/plugins/effects/RFXscripts/blur.script	266	%%DATADIR%%/plugins/effects/RFXscripts/blur.script