View | Details | Raw Unified | Return to bug 246491 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/lives/Makefile (-72 / +125 lines)
Lines 2-112 Link Here
2
# $FreeBSD: head/multimedia/lives/Makefile 550443 2020-09-28 19:59:57Z zeising $
2
# $FreeBSD: head/multimedia/lives/Makefile 550443 2020-09-28 19:59:57Z zeising $
3
3
4
PORTNAME=	lives
4
PORTNAME=	lives
5
PORTVERSION=	2.10.2
5
DISTVERSION=	3.2.0
6
PORTREVISION=	7
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}
10
10
11
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	vvd@unislabs.com
12
COMMENT=	Video editing system
12
COMMENT=	Video editing system
13
13
14
LICENSE=	GPLv3+
14
LICENSE=		GPLv3+ LGPL3+
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_COMB=		multi
16
LICENSE_FILE_GPLv3+=	${WRKSRC}/COPYING
17
LICENSE_FILE_LGPL3+=	${WRKSRC}/COPYING.LGPL
16
18
17
BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
19
BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
18
		${LOCALBASE}/bin/analyseplugin:audio/ladspa
20
		analyseplugin:audio/ladspa
19
LIB_DEPENDS=	libogg.so:audio/libogg \
21
LIB_DEPENDS=	liboil-0.3.so:devel/liboil \
20
		liboil-0.3.so:devel/liboil \
21
		libvisual-0.4.so:graphics/libvisual04 \
22
		libopencv_calib3d.so:graphics/opencv \
23
		libopencv_core.so:graphics/opencv-core \
24
		libpng.so:graphics/png \
22
		libpng.so:graphics/png \
25
		libfftw3.so:math/fftw3 \
26
		libfftw3f.so:math/fftw3-float \
27
		libavcodec.so:multimedia/ffmpeg \
23
		libavcodec.so:multimedia/ffmpeg \
28
		libdv.so:multimedia/libdv \
24
		libmjpegutils.so:multimedia/mjpegtools
29
		libtheora.so:multimedia/libtheora \
25
RUN_DEPENDS=	analyseplugin:audio/ladspa \
30
		libmjpegutils.so:multimedia/mjpegtools \
26
		ffprobe:multimedia/ffmpeg \
31
		libschroedinger-1.0.so:multimedia/schroedinger
27
		sox:audio/sox
32
RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:audio/ladspa \
33
		mpg123:audio/mpg123 \
34
		sox:audio/sox \
35
		ogg123:audio/vorbis-tools \
36
		convert:graphics/ImageMagick6 \
37
		sswf:graphics/sswf \
38
		mencoder:multimedia/mencoder \
39
		mplayer:multimedia/mplayer \
40
		ogmmerge:multimedia/ogmtools \
41
		transcode:multimedia/transcode \
42
		x264:multimedia/x264 \
43
		cdrecord:sysutils/cdrtools
44
28
45
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
29
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
46
30
47
USES=		autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
31
USES=		autoreconf compiler:c++11-lib gettext-runtime gettext-tools gl gnome \
48
		ghostscript:run gl gnome \
32
		libtool localbase pathfix perl5 pkgconfig python sdl shebangfix xorg
49
		libtool localbase pathfix perl5 pkgconfig python sdl \
33
SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi smogrify \
50
		shebangfix tar:bzip2 xorg
34
		tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
51
SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi \
52
		smogrify tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
53
		lives-plugins/marcos-encoders/*encoder* \
35
		lives-plugins/marcos-encoders/*encoder* \
54
		lives-plugins/plugins/encoders/multi_encoder3 \
36
		lives-plugins/plugins/encoders/multi_encoder3 \
55
		lives-plugins/plugins/playback/audiostream/audiostreamer.pl
37
		lives-plugins/plugins/playback/audiostream/audiostreamer.pl
56
GNU_CONFIGURE=	yes
38
GNU_CONFIGURE=	yes
57
USE_XORG=	x11 xrender
39
USE_XORG=	x11 xrender
58
USE_GL=		gl glu
40
USE_GL=		gl glu
59
USE_SDL=	sdl
41
USE_SDL=	sdl sdl2
60
USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
42
USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
61
USE_LDCONFIG=	yes
43
USE_LDCONFIG=	yes
62
44
63
CONFIGURE_ARGS=	--disable-ldvgrab
45
CONFIGURE_ARGS=	--disable-ldvgrab --disable-prctl --disable-system-weed
64
INSTALL_TARGET=	install-strip
46
INSTALL_TARGET=	install-strip
65
47
66
DOC_FILES=	AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
48
DOC_FILES=	AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS README \
67
		OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
49
		OMC/lives-OMC.txt OMC/pdlives.odt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
68
		RFX/RFX.spec docs/clip_format.txt \
50
		RFX/RFX.spec docs/c++-bindings.odt docs/clip_format.txt docs/smogrify.html \
69
		lives-plugins/marcos-encoders/README.multi_encoder \
51
		lives-plugins/marcos-encoders/README.multi_encoder \
70
		weed-docs/weedspec.txt weed-docs/weedevents.txt
52
		weed-docs/weed-plugin-utils.txt weed-docs/weed-utils.txt \
53
		weed-docs/weedaudio.txt weed-docs/weedspec.txt weed-docs/weedevents.txt
71
54
72
OPTIONS_DEFINE=	ALSA DOCS DOXYGEN FREI0R JACK MATROSKA V4L NLS PROJECTM PULSEAUDIO
55
OPTIONS_DEFINE=			ALSA DOCS DOXYGEN DV FFTW FREI0R JACK LIBEXPLAIN LIBVISUAL \
73
OPTIONS_SUB=	yes
56
				OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \
57
				SCHROEDINGER THEORA V4L WAYLAND
58
OPTIONS_GROUP=			RUNTIME
59
OPTIONS_GROUP_RUNTIME=		CDDA2WAV GCONF GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
60
				SSWF X264 XDG_SCREENSAVER XWININFO
61
OPTIONS_MULTI=			EXT_WIN_CAPTURE MP3 MPLAYERS YOUTUBE_DLX
62
OPTIONS_MULTI_EXT_WIN_CAPTURE=	WMCTRL XDOTOOL
63
OPTIONS_MULTI_MP3=		MPG123 MPG321
64
OPTIONS_MULTI_MPLAYERS=		MPLAYER MPV
65
OPTIONS_MULTI_YOUTUBE_DLX=	YOUTUBE_DL YOUTUBE_DLC
66
OPTIONS_RADIO=			IMAGEMAGICK
67
OPTIONS_RADIO_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
68
OPTIONS_DEFAULT=		CDDA2WAV DOCS DV FFTW GCONF GHOSTSCRIPT IMAGEMAGICK7 LAME \
69
				MATROSKA MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV \
70
				SCHROEDINGER THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO
71
OPTIONS_SUB=			yes
74
72
75
ALSA_CONFIGURE_OFF=	--disable-alsa
73
ALSA_CONFIGURE_OFF=		--disable-alsa
76
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
74
ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
77
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
75
CDDA2WAV_RUN_DEPENDS=		cdda2wav:sysutils/cdrtools
78
DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
76
DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
79
FREI0R_BUILD_DEPENDS=	frei0r>0:graphics/frei0r
77
DOXYGEN_CONFIGURE_OFF=		--disable-doxygen
80
FREI0R_RUN_DEPENDS=	frei0r>0:graphics/frei0r
78
DV_CONFIGURE_OFF=		--disable-libdv
81
FREI0R_CONFIGURE_ENV_OFF=ac_cv_header_frei0r_h=no
79
DV_LIB_DEPENDS=			libdv.so:multimedia/libdv
82
JACK_CONFIGURE_OFF=	--disable-jack
80
DV_RUN_DEPENDS=			encodedv:multimedia/libdv
83
JACK_LIB_DEPENDS=	libjack.so:audio/jack
81
EXT_WIN_CAPTURE_DESC=		Allows external window capture via xdotool or wmctrl
84
MATROSKA_RUN_DEPENDS=	mkvmerge:multimedia/mkvtoolnix
82
FFTW_CONFIGURE_OFF=		--disable-fftw3f
85
V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
83
FFTW_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
86
V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
84
				libfftw3f.so:math/fftw3-float
87
NLS_USES=		gettext-tools
85
FREI0R_BUILD_DEPENDS=		frei0r>0:graphics/frei0r
88
NLS_CONFIGURE_OFF=	--disable-nls
86
FREI0R_CONFIGURE_OFF=		--disable-frei0r
89
PROJECTM_DESC=		projectM support
87
FREI0R_RUN_DEPENDS=		frei0r>0:graphics/frei0r
90
PROJECTM_CONFIGURE_OFF=	--disable-projectM
88
GCONF_USE=			GNOME=gconf2
91
PROJECTM_LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
89
GHOSTSCRIPT_USES=		ghostscript:run
92
PULSEAUDIO_CONFIGURE_OFF=--disable-pulse
90
IMAGEMAGICK6_DESC=		${IMAGEMAGICK_DESC} version 6.x
93
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
91
IMAGEMAGICK6_RUN_DEPENDS=	convert:graphics/ImageMagick6 \
92
				composite:graphics/ImageMagick6
93
IMAGEMAGICK7_DESC=		${IMAGEMAGICK_DESC} version 7.x
94
IMAGEMAGICK7_RUN_DEPENDS=	convert:graphics/ImageMagick7 \
95
				composite:graphics/ImageMagick7
96
JACK_CONFIGURE_OFF=		--disable-jack
97
JACK_LIB_DEPENDS=		libjack.so:audio/jack
98
LAME_RUN_DEPENDS=		lame:audio/lame
99
LIBEXPLAIN_CONFIGURE_OFF=	--disable-libexplain
100
LIBEXPLAIN_DESC=		Used to explain Unix and Linux system call errors
101
LIBEXPLAIN_LIB_DEPENDS=		libexplain.so:devel/libexplain
102
LIBVISUAL_CONFIGURE_OFF=	--disable-libvisual
103
LIBVISUAL_LIB_DEPENDS=		libvisual-0.4.so:graphics/libvisual04
104
MATROSKA_RUN_DEPENDS=		mkvmerge:multimedia/mkvtoolnix
105
MENCODER_RUN_DEPENDS=		mencoder:multimedia/mencoder
106
MENCODER_DESC=			Use mencoder as video file and movie encoder
107
MP3_DESC=			Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
108
MPG123_RUN_DEPENDS=		mpg123:audio/mpg123
109
MPG321_DESC=			MP3 decoding support via mpg321
110
MPG321_RUN_DEPENDS=		mpg321:audio/mpg321
111
MPLAYER_RUN_DEPENDS=		mplayer:multimedia/mplayer
112
MPLAYERS_DESC=			Install mplayer/mpv (runtime check)
113
MPV_DESC=			MPV media player support
114
MPV_RUN_DEPENDS=		mpv:multimedia/mpv
115
NLS_USES=			gettext-tools
116
OGG_CONFIGURE_OFF=		--disable-ogg
117
OGG_LIB_DEPENDS=		libogg.so:audio/libogg
118
OGG123_DESC=			Use ogg123 from vorbis-tools
119
OGG123_RUN_DEPENDS=		ogg123:audio/vorbis-tools
120
OGM_DESC=			Use ogmtools for manipulating with OGM files
121
OGM_RUN_DEPENDS=		ogmmerge:multimedia/ogmtools
122
OPENCV_CONFIGURE_OFF=		--disable-opencv
123
OPENCV_LIB_DEPENDS=		libopencv_calib3d.so:graphics/opencv \
124
				libopencv_core.so:graphics/opencv-core
125
SCHROEDINGER_CONFIGURE_OFF=	--disable-dirac
126
SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
127
SSWF_DESC=			Use sswf for manipulating with Flash movies
128
SSWF_RUN_DEPENDS=		sswf:graphics/sswf
129
THEORA_CONFIGURE_OFF=		--disable-theora
130
THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
131
OPTIMIZED_CFLAGS_CONFIGURE_ON=	--enable-turbo
132
PROJECTM_CONFIGURE_OFF=		--disable-projectM
133
PROJECTM_DESC=			projectM support
134
PROJECTM_LIB_DEPENDS=		libprojectM.so:graphics/libprojectm
135
PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
136
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
137
RUNTIME_DESC=			Runtime detected utilities
138
V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
139
V4L_CONFIGURE_OFF=		--disable-v4l
140
V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
141
WAYLAND_CONFIGURE_OFF=		--disable-wayland
142
WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
143
				libwayland-egl.so:graphics/wayland \
144
				libwayland-cursor.so:graphics/wayland
145
WMCTRL_RUN_DEPENDS=		wmctrl:x11/wmctrl
146
YOUTUBE_DL_DESC=		Install youtube-dl
147
YOUTUBE_DL_RUN_DEPENDS=		youtube-dl:www/youtube_dl
148
YOUTUBE_DLC_DESC=		Install youtube-dlc
149
YOUTUBE_DLC_RUN_DEPENDS=	www/youtube_dlc
150
YOUTUBE_DLX_DESC=		Install youtube-dl (runtime check)
151
X264_RUN_DEPENDS=		x264:multimedia/x264
152
XDG_SCREENSAVER_DESC=		Used to disable screensaver during playback
153
XDG_SCREENSAVER_RUN_DEPENDS=	xdg-screensaver:devel/xdg-utils
154
XDOTOOL_RUN_DEPENDS=		xdotool:x11/xdotool
155
XWININFO_DESC=			Used for external window capture
156
XWININFO_RUN_DEPENDS=		xwininfo:x11/xwininfo
94
157
95
post-patch:
158
post-patch:
96
	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
159
	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
97
		's/^LIBS = $$/&@LIBS@/'
160
		's/^LIBS = $$/&@LIBS@/'
98
	@${REINPLACE_CMD} -e 's| install-docDATA||g; s|-$$(VERSION)||g' \
99
		${WRKSRC}/Makefile.in
100
	@${REINPLACE_CMD} -e 's|: install-data-local |: |g; s|-ldl||' \
101
		${WRKSRC}/lives-plugins/weed-plugins/gdk/Makefile.in \
102
		${WRKSRC}/lives-plugins/weed-plugins/Makefile.in
103
	@${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \
161
	@${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \
104
		${WRKSRC}/lives-plugins/weed-plugins/frei0r.c
162
		${WRKSRC}/lives-plugins/weed-plugins/frei0r.c
105
	@${REINPLACE_CMD} '/cp -rf/ s|data/|data|g; /cp -rf/ s|icons/|icons|g' \
106
		${WRKSRC}/lives-plugins/weed-plugins/cairo/Makefile.in \
107
		${WRKSRC}/lives-plugins/weed-plugins/Makefile.in
108
	@${REINPLACE_CMD} '/selectRandom/d' \
109
		${WRKSRC}/lives-plugins/weed-plugins/projectM.cpp
110
	@${REINPLACE_CMD} 's|/usr/bin/perl|${perl_CMD}|' \
163
	@${REINPLACE_CMD} 's|/usr/bin/perl|${perl_CMD}|' \
111
		${WRKSRC}/build-lives-rfx-plugin
164
		${WRKSRC}/build-lives-rfx-plugin
112
165
(-)multimedia/lives/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1547452499
1
TIMESTAMP = 1604882135
2
SHA256 (LiVES-2.10.2.tar.bz2) = 572e6ed613eedb035ceab5f48ba3e7331e40128652af2fbc066fd87594be241c
2
SHA256 (LiVES-3.2.0.tar.gz) = b3ed086d6548d51389e84223e7127818dcc79b2155ed9d73292a0aa3a13b88b5
3
SIZE (LiVES-2.10.2.tar.bz2) = 4100348
3
SIZE (LiVES-3.2.0.tar.gz) = 6496691
(-)multimedia/lives/files/patch-Makefile.am (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.am.orig	2019-04-16 07:43:04 UTC
2
+++ Makefile.am
3
@@ -35,7 +35,7 @@ endif
4
 SUBDIRS = $(OSC_SUBDIRS) intl $(WEED_SUBDIRS) src m4 lives-plugins po resources
5
 PACKAGE_CAPITALISED = LiVES
6
 
7
-docdir = "$(prefix)/share/doc/$(PACKAGE)-$(VERSION)"
8
+docdir = "$(prefix)/share/doc/$(PACKAGE)"
9
 sharedir = "$(prefix)/share"
10
 
11
 if HAVE_DOXYGEN
(-)multimedia/lives/files/patch-configure.ac (-53 lines)
Lines 1-53 Link Here
1
--- configure.ac.orig	2019-01-08 13:49:30 UTC
2
+++ configure.ac
3
@@ -522,12 +522,14 @@
4
 
5
 PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
6
 
7
-if test "HAVE_OPENCV" = "true" ; then
8
-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
9
+if test "$HAVE_OPENCV" = "true" ; then
10
+OPENCV_LIBS_ONLY_L=`$PKG_CONFIG opencv --libs-only-L`
11
+OPENCV_LIBS_ONLY_OTHER=`$PKG_CONFIG opencv --libs-only-other`
12
 fi
13
 
14
 AC_SUBST(OPENCV_CFLAGS)
15
 AC_SUBST(OPENCV_LIBS_ONLY_L)
16
+AC_SUBST(OPENCV_LIBS_ONLY_OTHER)
17
 
18
 AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
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)
(-)multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (-12 lines)
Lines 1-12 Link Here
1
--- lives-plugins/weed-plugins/Makefile.am.orig	2019-04-14 20:00:14 UTC
2
+++ lives-plugins/weed-plugins/Makefile.am
3
@@ -85,7 +85,8 @@ endif
4
 
5
 if HAVE_OPENCV
6
 farneback_analyser_libs = farneback_analyser.la
7
-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
8
+farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_core -lopencv_video
9
+farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
10
 farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
11
 farneback_analyser_la_SOURCES = farneback_analyser.cpp
12
 
(-)multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (-13 lines)
Lines 1-13 Link Here
1
--- lives-plugins/weed-plugins/gdk/Makefile.am.orig	2019-04-15 10:55:37 UTC
2
+++ lives-plugins/weed-plugins/gdk/Makefile.am
3
@@ -59,8 +59,8 @@ EXTRA_DIST=data icons
4
 
5
 install-data-local:
6
 	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
7
-	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
8
-	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
9
+	cp -rf data "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data"
10
+	cp -rf icons "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons"
11
 	$(MAKE) -i install-data-local-remove-vcs-files
12
 
13
 install-data-local-remove-vcs-files:
(-)multimedia/lives/pkg-plist (-45 / +62 lines)
Lines 3-8 Link Here
3
bin/build-lives-rfx-plugin-multi
3
bin/build-lives-rfx-plugin-multi
4
bin/lives
4
bin/lives
5
bin/lives-exe
5
bin/lives-exe
6
bin/lives-midistart
7
bin/lives-midistop
6
bin/lives_avi_encoder
8
bin/lives_avi_encoder
7
bin/lives_avi_encoder3
9
bin/lives_avi_encoder3
8
bin/lives_dirac_encoder
10
bin/lives_dirac_encoder
Lines 19-26 Link Here
19
bin/lives_ogm_encoder3
21
bin/lives_ogm_encoder3
20
bin/lives_theora_encoder
22
bin/lives_theora_encoder
21
bin/lives_theora_encoder3
23
bin/lives_theora_encoder3
22
bin/midistart
23
bin/midistop
24
bin/sendOSC
24
bin/sendOSC
25
bin/smogrify
25
bin/smogrify
26
include/weed/weed-compat.h
26
include/weed/weed-compat.h
Lines 28-33 Link Here
28
include/weed/weed-events.h
28
include/weed/weed-events.h
29
include/weed/weed-host.h
29
include/weed/weed-host.h
30
include/weed/weed-palettes.h
30
include/weed/weed-palettes.h
31
include/weed/weed-plugin-utils.h
31
include/weed/weed-plugin.h
32
include/weed/weed-plugin.h
32
include/weed/weed-utils.h
33
include/weed/weed-utils.h
33
include/weed/weed.h
34
include/weed/weed.h
Lines 39-59 Link Here
39
lib/libOSC_client.so
40
lib/libOSC_client.so
40
lib/libOSC_client.so.0
41
lib/libOSC_client.so.0
41
lib/libOSC_client.so.0.0.0
42
lib/libOSC_client.so.0.0.0
43
lib/libweed-utils.a
42
lib/libweed-utils.so
44
lib/libweed-utils.so
43
lib/libweed-utils.so.0
45
lib/libweed-utils.so.0
44
lib/libweed-utils.so.0.0.9
46
lib/libweed-utils.so.0.1.13
45
lib/libweed-utils_scripting.so
47
lib/libweed-utils_scripting.so
46
lib/libweed-utils_scripting.so.0
48
lib/libweed-utils_scripting.so.0
47
lib/libweed-utils_scripting.so.0.0.9
49
lib/libweed-utils_scripting.so.0.1.13
50
lib/libweed.a
48
lib/libweed.so
51
lib/libweed.so
49
lib/libweed.so.0
52
lib/libweed.so.0
50
lib/libweed.so.0.0.9
53
lib/libweed.so.0.1.13
51
lib/libweed_slice.so
54
lib/libweed_gslice.a
52
lib/libweed_slice.so.0
55
lib/libweed_gslice.so
53
lib/libweed_slice.so.0.0.9
56
lib/libweed_gslice.so.0
54
lib/libweed_slice_scripting.so
57
lib/libweed_gslice.so.0.1.13
55
lib/libweed_slice_scripting.so.0
58
lib/libweed_gslice_scripting.so
56
lib/libweed_slice_scripting.so.0.0.9
59
lib/libweed_gslice_scripting.so.0
60
lib/libweed_gslice_scripting.so.0.1.13
57
lib/lives/plugins/decoders/asf_decoder.so
61
lib/lives/plugins/decoders/asf_decoder.so
58
lib/lives/plugins/decoders/dv_decoder.so
62
lib/lives/plugins/decoders/dv_decoder.so
59
lib/lives/plugins/decoders/flv_decoder.so
63
lib/lives/plugins/decoders/flv_decoder.so
Lines 64-69 Link Here
64
lib/lives/plugins/effects/realtime/weed/RGBdelay.so
68
lib/lives/plugins/effects/realtime/weed/RGBdelay.so
65
lib/lives/plugins/effects/realtime/weed/alien_overlay.so
69
lib/lives/plugins/effects/realtime/weed/alien_overlay.so
66
lib/lives/plugins/effects/realtime/weed/alpha_means.so
70
lib/lives/plugins/effects/realtime/weed/alpha_means.so
71
lib/lives/plugins/effects/realtime/weed/alpha_to_grey.so
67
lib/lives/plugins/effects/realtime/weed/alpha_visualizer.so
72
lib/lives/plugins/effects/realtime/weed/alpha_visualizer.so
68
lib/lives/plugins/effects/realtime/weed/audio_fft.so
73
lib/lives/plugins/effects/realtime/weed/audio_fft.so
69
lib/lives/plugins/effects/realtime/weed/audio_transition.so
74
lib/lives/plugins/effects/realtime/weed/audio_transition.so
Lines 78-83 Link Here
78
lib/lives/plugins/effects/realtime/weed/compositor.so
83
lib/lives/plugins/effects/realtime/weed/compositor.so
79
lib/lives/plugins/effects/realtime/weed/data_processor.so
84
lib/lives/plugins/effects/realtime/weed/data_processor.so
80
lib/lives/plugins/effects/realtime/weed/data_unpacker.so
85
lib/lives/plugins/effects/realtime/weed/data_unpacker.so
86
lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/examples.txt
87
lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/modulations.txt
88
lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/newlives.txt
89
lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/regrlives.txt
90
lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/roselives.txt
81
lib/lives/plugins/effects/realtime/weed/deinterlace.so
91
lib/lives/plugins/effects/realtime/weed/deinterlace.so
82
lib/lives/plugins/effects/realtime/weed/edge.so
92
lib/lives/plugins/effects/realtime/weed/edge.so
83
lib/lives/plugins/effects/realtime/weed/farneback_analyser.so
93
lib/lives/plugins/effects/realtime/weed/farneback_analyser.so
Lines 85-95 Link Here
85
lib/lives/plugins/effects/realtime/weed/fireTV.so
95
lib/lives/plugins/effects/realtime/weed/fireTV.so
86
%%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
96
%%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
87
lib/lives/plugins/effects/realtime/weed/fourKlives.so
97
lib/lives/plugins/effects/realtime/weed/fourKlives.so
88
lib/lives/plugins/effects/realtime/weed/fourKlives/songs/examples.txt
89
lib/lives/plugins/effects/realtime/weed/fourKlives/songs/modulations.txt
90
lib/lives/plugins/effects/realtime/weed/fourKlives/songs/newlives.txt
91
lib/lives/plugins/effects/realtime/weed/fourKlives/songs/regrlives.txt
92
lib/lives/plugins/effects/realtime/weed/fourKlives/songs/roselives.txt
93
lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
98
lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
94
lib/lives/plugins/effects/realtime/weed/haar_analyser.so
99
lib/lives/plugins/effects/realtime/weed/haar_analyser.so
95
lib/lives/plugins/effects/realtime/weed/haip.so
100
lib/lives/plugins/effects/realtime/weed/haip.so
Lines 155-160 Link Here
155
lib/lives/plugins/effects/rendered/gen_clip_from_image
160
lib/lives/plugins/effects/rendered/gen_clip_from_image
156
lib/lives/plugins/effects/rendered/gen_coloured_frames
161
lib/lives/plugins/effects/rendered/gen_coloured_frames
157
lib/lives/plugins/effects/rendered/gen_text
162
lib/lives/plugins/effects/rendered/gen_text
163
lib/lives/plugins/effects/rendered/gmic
158
lib/lives/plugins/effects/rendered/hue_change
164
lib/lives/plugins/effects/rendered/hue_change
159
lib/lives/plugins/effects/rendered/image_overlay
165
lib/lives/plugins/effects/rendered/image_overlay
160
lib/lives/plugins/effects/rendered/jumble
166
lib/lives/plugins/effects/rendered/jumble
Lines 189-195 Link Here
189
lib/lives/plugins/effects/rendered/wave
195
lib/lives/plugins/effects/rendered/wave
190
lib/lives/plugins/encoders/encodedv_encoder
196
lib/lives/plugins/encoders/encodedv_encoder
191
lib/lives/plugins/encoders/ffmpeg_encoder
197
lib/lives/plugins/encoders/ffmpeg_encoder
192
lib/lives/plugins/encoders/mencoder_encoder
193
lib/lives/plugins/encoders/mjpegtools_encoder
198
lib/lives/plugins/encoders/mjpegtools_encoder
194
lib/lives/plugins/encoders/multi_encoder
199
lib/lives/plugins/encoders/multi_encoder
195
lib/lives/plugins/encoders/multi_encoder3
200
lib/lives/plugins/encoders/multi_encoder3
Lines 198-232 Link Here
198
lib/lives/plugins/encoders/sswf_encoder
203
lib/lives/plugins/encoders/sswf_encoder
199
lib/lives/plugins/encoders/x264_encoder
204
lib/lives/plugins/encoders/x264_encoder
200
lib/lives/plugins/playback/audiostream/audiostreamer.pl
205
lib/lives/plugins/playback/audiostream/audiostreamer.pl
201
lib/lives/plugins/playback/video/SDL.so
202
lib/lives/plugins/playback/video/icecast_output.so
206
lib/lives/plugins/playback/video/icecast_output.so
203
lib/lives/plugins/playback/video/libav_stream.so
207
lib/lives/plugins/playback/video/libav_stream.so
204
lib/lives/plugins/playback/video/lives2lives_stream.so
208
lib/lives/plugins/playback/video/lives2lives_stream.so
205
lib/lives/plugins/playback/video/oggstream.so
209
lib/lives/plugins/playback/video/oggstream.so
206
lib/lives/plugins/playback/video/openGL.so
210
lib/lives/plugins/playback/video/openGL.so
207
lib/lives/plugins/playback/video/vloopback.so
208
%%V4L%%lib/lives/plugins/playback/video/vloopback2.so
211
%%V4L%%lib/lives/plugins/playback/video/vloopback2.so
209
lib/lives/plugins/playback/video/yuv4mpeg_stream.so
212
lib/lives/plugins/playback/video/yuv4mpeg_stream.so
210
libdata/pkgconfig/libweed-compat.pc
213
libdata/pkgconfig/libweed-compat.pc
211
libdata/pkgconfig/libweed-plugin.pc
214
libdata/pkgconfig/libweed-plugin.pc
212
libdata/pkgconfig/libweed-utils.pc
215
libdata/pkgconfig/libweed-utils.pc
213
libdata/pkgconfig/libweed.pc
216
libdata/pkgconfig/libweed.pc
214
libdata/pkgconfig/libweed_slice.pc
217
libdata/pkgconfig/libweed_gslice.pc
215
share/app-install/icons/lives.png
218
share/app-install/icons/lives.png
216
share/applications/LiVES.desktop
219
share/applications/LiVES.desktop
217
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
220
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
218
%%PORTDOCS%%%%DOCSDIR%%/BUGS
221
%%PORTDOCS%%%%DOCSDIR%%/COPYING
222
%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
219
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
223
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
220
%%PORTDOCS%%%%DOCSDIR%%/FEATURES
224
%%PORTDOCS%%%%DOCSDIR%%/FEATURES
221
%%PORTDOCS%%%%DOCSDIR%%/GETTING.STARTED
225
%%PORTDOCS%%%%DOCSDIR%%/GETTING.STARTED
222
%%PORTDOCS%%%%DOCSDIR%%/LiVES-Perl.odt
226
%%PORTDOCS%%%%DOCSDIR%%/LiVES-Perl.odt
227
%%PORTDOCS%%%%DOCSDIR%%/NEWS
223
%%PORTDOCS%%%%DOCSDIR%%/README
228
%%PORTDOCS%%%%DOCSDIR%%/README
224
%%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder
229
%%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder
225
%%PORTDOCS%%%%DOCSDIR%%/RFX.spec
230
%%PORTDOCS%%%%DOCSDIR%%/RFX.spec
226
%%PORTDOCS%%%%DOCSDIR%%/clip_format.txt
231
%%PORTDOCS%%%%DOCSDIR%%/clip_format.txt
227
%%PORTDOCS%%%%DOCSDIR%%/c++-bindings.odt
232
%%PORTDOCS%%%%DOCSDIR%%/c++-bindings.odt
228
%%PORTDOCS%%%%DOCSDIR%%/lives-OMC.txt
233
%%PORTDOCS%%%%DOCSDIR%%/lives-OMC.txt
234
%%PORTDOCS%%%%DOCSDIR%%/pdlives.odt
229
%%PORTDOCS%%%%DOCSDIR%%/rfxbuilder.odt
235
%%PORTDOCS%%%%DOCSDIR%%/rfxbuilder.odt
236
%%PORTDOCS%%%%DOCSDIR%%/smogrify.html
237
%%PORTDOCS%%%%DOCSDIR%%/version
238
%%PORTDOCS%%%%DOCSDIR%%/weed-plugin-utils.txt
239
%%PORTDOCS%%%%DOCSDIR%%/weed-utils.txt
240
%%PORTDOCS%%%%DOCSDIR%%/weedaudio.txt
230
%%PORTDOCS%%%%DOCSDIR%%/weedevents.txt
241
%%PORTDOCS%%%%DOCSDIR%%/weedevents.txt
231
%%PORTDOCS%%%%DOCSDIR%%/weedspec.txt
242
%%PORTDOCS%%%%DOCSDIR%%/weedspec.txt
232
share/icons/hicolor/128x128/apps/lives.png
243
share/icons/hicolor/128x128/apps/lives.png
Lines 236-265 Link Here
236
share/icons/hicolor/32x32/apps/lives.png
247
share/icons/hicolor/32x32/apps/lives.png
237
share/icons/hicolor/48x48/apps/lives.png
248
share/icons/hicolor/48x48/apps/lives.png
238
share/icons/hicolor/64x64/apps/lives.png
249
share/icons/hicolor/64x64/apps/lives.png
250
%%DATADIR%%/datacons.map
239
%%DATADIR%%/default.keymap
251
%%DATADIR%%/default.keymap
240
%%DATADIR%%/icons/audio.png
252
%%DATADIR%%/devicemaps/mixxx.map
241
%%DATADIR%%/icons/fullscreen.png
253
%%DATADIR%%/fxdefs.perkey
242
%%DATADIR%%/icons/loop.png
254
%%DATADIR%%/icons/lives-audio.png
243
%%DATADIR%%/icons/playsel.png
255
%%DATADIR%%/icons/lives-fullscreen.png
244
%%DATADIR%%/icons/pref_decoding.png
256
%%DATADIR%%/icons/lives-locked.png
245
%%DATADIR%%/icons/pref_directory.png
257
%%DATADIR%%/icons/lives-loop.png
246
%%DATADIR%%/icons/pref_effects.png
258
%%DATADIR%%/icons/lives-playsel.png
247
%%DATADIR%%/icons/pref_encoding.png
259
%%DATADIR%%/icons/lives-pref_decoding.png
248
%%DATADIR%%/icons/pref_gui.png
260
%%DATADIR%%/icons/lives-pref_directory.png
249
%%DATADIR%%/icons/pref_jack.png
261
%%DATADIR%%/icons/lives-pref_effects.png
250
%%DATADIR%%/icons/pref_midi.png
262
%%DATADIR%%/icons/lives-pref_encoding.png
251
%%DATADIR%%/icons/pref_misc.png
263
%%DATADIR%%/icons/lives-pref_gui.png
252
%%DATADIR%%/icons/pref_multitrack.png
264
%%DATADIR%%/icons/lives-pref_jack.png
253
%%DATADIR%%/icons/pref_net.png
265
%%DATADIR%%/icons/lives-pref_midi.png
254
%%DATADIR%%/icons/pref_playback.png
266
%%DATADIR%%/icons/lives-pref_misc.png
255
%%DATADIR%%/icons/pref_record.png
267
%%DATADIR%%/icons/lives-pref_multitrack.png
256
%%DATADIR%%/icons/pref_themes.png
268
%%DATADIR%%/icons/lives-pref_net.png
257
%%DATADIR%%/icons/pref_warning.png
269
%%DATADIR%%/icons/lives-pref_playback.png
258
%%DATADIR%%/icons/sepwin.png
270
%%DATADIR%%/icons/lives-pref_record.png
259
%%DATADIR%%/icons/volume_mute.png
271
%%DATADIR%%/icons/lives-pref_themes.png
260
%%DATADIR%%/icons/zoom-in.png
272
%%DATADIR%%/icons/lives-pref_warning.png
261
%%DATADIR%%/icons/zoom-out.png
273
%%DATADIR%%/icons/lives-sepwin.png
262
%%DATADIR%%/mixxx.map
274
%%DATADIR%%/icons/lives-unlocked.png
275
%%DATADIR%%/icons/lives-volume_mute.png
276
%%DATADIR%%/icons/lives-zoom-in.png
277
%%DATADIR%%/icons/lives-zoom-out.png
263
%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script
278
%%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script
264
%%DATADIR%%/plugins/effects/RFXscripts/blur.script
279
%%DATADIR%%/plugins/effects/RFXscripts/blur.script
265
%%DATADIR%%/plugins/effects/RFXscripts/brightness_change.script
280
%%DATADIR%%/plugins/effects/RFXscripts/brightness_change.script
Lines 284-289 Link Here
284
%%DATADIR%%/plugins/effects/RFXscripts/gen_clip_from_image.script
299
%%DATADIR%%/plugins/effects/RFXscripts/gen_clip_from_image.script
285
%%DATADIR%%/plugins/effects/RFXscripts/gen_coloured_frames.script
300
%%DATADIR%%/plugins/effects/RFXscripts/gen_coloured_frames.script
286
%%DATADIR%%/plugins/effects/RFXscripts/gen_text.script
301
%%DATADIR%%/plugins/effects/RFXscripts/gen_text.script
302
%%DATADIR%%/plugins/effects/RFXscripts/gmic.script
287
%%DATADIR%%/plugins/effects/RFXscripts/hue_change.script
303
%%DATADIR%%/plugins/effects/RFXscripts/hue_change.script
288
%%DATADIR%%/plugins/effects/RFXscripts/image_overlay.script
304
%%DATADIR%%/plugins/effects/RFXscripts/image_overlay.script
289
%%DATADIR%%/plugins/effects/RFXscripts/jumble.script
305
%%DATADIR%%/plugins/effects/RFXscripts/jumble.script
Lines 320-325 Link Here
320
%%DATADIR%%/plugins/effects/compound/motion_analyser
336
%%DATADIR%%/plugins/effects/compound/motion_analyser
321
%%DATADIR%%/plugins/effects/compound/neural_net
337
%%DATADIR%%/plugins/effects/compound/neural_net
322
%%DATADIR%%/resources/vidtest.avi
338
%%DATADIR%%/resources/vidtest.avi
339
%%DATADIR%%/stock-icons/livestock-help-info.svg
323
%%DATADIR%%/themes/camera/frame.jpg
340
%%DATADIR%%/themes/camera/frame.jpg
324
%%DATADIR%%/themes/camera/header.theme
341
%%DATADIR%%/themes/camera/header.theme
325
%%DATADIR%%/themes/camera/main.jpg
342
%%DATADIR%%/themes/camera/main.jpg
Lines 376-379 Link Here
376
share/pixmaps/lives.xpm
393
share/pixmaps/lives.xpm
377
@dir lib/lives/plugins/effects/realtime/weed/data
394
@dir lib/lives/plugins/effects/realtime/weed/data
378
@dir lib/lives/plugins/effects/realtime/weed/icons
395
@dir lib/lives/plugins/effects/realtime/weed/icons
379
@dir %%DATADIR%%/devicemaps
396
@dir %%DATADIR%%/plugins/effects/compound/icons

Return to bug 246491