svn commit: r511739 - in branches/2019Q3/multimedia/lives: . files
Rene Ladan
rene at FreeBSD.org
Tue Sep 10 06:33:49 UTC 2019
Author: rene
Date: Tue Sep 10 06:33:47 2019
New Revision: 511739
URL: https://svnweb.freebsd.org/changeset/ports/511739
Log:
MFH: r511598 r511599
multimedia/lives: fix build and some pkg-plist issues
PR: 237320
Submitted by: Hiroo Ono
multimedia/lives: set missing SVN keywords.
Approved by: ports-secteam (joneum)
Added:
- copied unchanged from r511598, head/multimedia/lives/files/patch-Makefile.am
- copied unchanged from r511598, head/multimedia/lives/files/patch-configure.ac
- copied unchanged from r511598, head/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am
- copied unchanged from r511598, head/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am
Directory Properties:
branches/2019Q3/multimedia/lives/files/patch-Makefile.am (props changed)
branches/2019Q3/multimedia/lives/files/patch-configure.ac (props changed)
branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (props changed)
branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (props changed)
Deleted:
branches/2019Q3/multimedia/lives/files/patch-configure
branches/2019Q3/multimedia/lives/files/patch-ffmpeg4
Modified:
branches/2019Q3/multimedia/lives/Makefile
branches/2019Q3/multimedia/lives/pkg-plist
Directory Properties:
branches/2019Q3/ (props changed)
Modified: branches/2019Q3/multimedia/lives/Makefile
==============================================================================
--- branches/2019Q3/multimedia/lives/Makefile Tue Sep 10 05:56:38 2019 (r511738)
+++ branches/2019Q3/multimedia/lives/Makefile Tue Sep 10 06:33:47 2019 (r511739)
@@ -14,8 +14,6 @@ COMMENT= Video editing system
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN= fails to patch
-
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
${LOCALBASE}/bin/analyseplugin:audio/ladspa
LIB_DEPENDS= libasound.so:audio/alsa-lib \
@@ -50,8 +48,10 @@ RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:audio/lads
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= compiler:c++11-lib gettext-runtime ghostscript:run libtool \
- localbase pathfix perl5 pkgconfig python shebangfix tar:bzip2
+USES= autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
+ ghostscript:run gl gnome \
+ libtool localbase pathfix perl5 pkgconfig python sdl \
+ shebangfix tar:bzip2 xorg
SHEBANG_FILES= build-lives-rfx-plugin build-lives-rfx-plugin-multi \
smogrify tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
lives-plugins/marcos-encoders/*encoder* \
@@ -73,7 +73,7 @@ DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STA
lives-plugins/marcos-encoders/README.multi_encoder \
weed-docs/weedspec.txt weed-docs/weedevents.txt
-OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA NLS
+OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA V4L NLS
OPTIONS_SUB= yes
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
@@ -82,6 +82,8 @@ FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r
FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r
FREI0R_CONFIGURE_ENV_OFF= ac_cv_header_frei0r_h=no
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
@@ -111,7 +113,7 @@ post-install-DOCS-on:
${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
post-install-DOXYGEN-on:
- @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||}/html \
- ! -type d >> ${TMPPLIST})
+ @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \
+ -not -type d >> ${TMPPLIST})
.include <bsd.port.mk>
Copied: branches/2019Q3/multimedia/lives/files/patch-Makefile.am (from r511598, head/multimedia/lives/files/patch-Makefile.am)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q3/multimedia/lives/files/patch-Makefile.am Tue Sep 10 06:33:47 2019 (r511739, copy of r511598, head/multimedia/lives/files/patch-Makefile.am)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig 2019-04-16 07:43:04 UTC
++++ Makefile.am
+@@ -35,7 +35,7 @@ endif
+ SUBDIRS = $(OSC_SUBDIRS) intl $(WEED_SUBDIRS) src m4 lives-plugins po resources
+ PACKAGE_CAPITALISED = LiVES
+
+-docdir = "$(prefix)/share/doc/$(PACKAGE)-$(VERSION)"
++docdir = "$(prefix)/share/doc/$(PACKAGE)"
+ sharedir = "$(prefix)/share"
+
+ if HAVE_DOXYGEN
Copied: branches/2019Q3/multimedia/lives/files/patch-configure.ac (from r511598, head/multimedia/lives/files/patch-configure.ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q3/multimedia/lives/files/patch-configure.ac Tue Sep 10 06:33:47 2019 (r511739, copy of r511598, head/multimedia/lives/files/patch-configure.ac)
@@ -0,0 +1,22 @@
+--- configure.ac.orig 2019-01-08 13:49:30 UTC
++++ configure.ac
+@@ -520,14 +520,16 @@ HAVE_OPENCV=false
+
+ 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)
+
+-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)
+
Copied: branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (from r511598, head/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am Tue Sep 10 06:33:47 2019 (r511739, copy of r511598, head/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am)
@@ -0,0 +1,12 @@
+--- lives-plugins/weed-plugins/Makefile.am.orig 2019-04-14 20:00:14 UTC
++++ lives-plugins/weed-plugins/Makefile.am
+@@ -85,7 +85,8 @@ endif
+
+ if HAVE_OPENCV
+ farneback_analyser_libs = farneback_analyser.la
+-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
++farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_core -lopencv_video
++farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
+ farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
+ farneback_analyser_la_SOURCES = farneback_analyser.cpp
+
Copied: branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (from r511598, head/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am Tue Sep 10 06:33:47 2019 (r511739, copy of r511598, head/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am)
@@ -0,0 +1,13 @@
+--- lives-plugins/weed-plugins/gdk/Makefile.am.orig 2019-04-15 10:55:37 UTC
++++ lives-plugins/weed-plugins/gdk/Makefile.am
+@@ -59,8 +59,8 @@ EXTRA_DIST=data icons
+
+ install-data-local:
+ mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
+- cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+- cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
++ cp -rf data "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data"
++ cp -rf icons "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons"
+ $(MAKE) -i install-data-local-remove-vcs-files
+
+ install-data-local-remove-vcs-files:
Modified: branches/2019Q3/multimedia/lives/pkg-plist
==============================================================================
--- branches/2019Q3/multimedia/lives/pkg-plist Tue Sep 10 05:56:38 2019 (r511738)
+++ branches/2019Q3/multimedia/lives/pkg-plist Tue Sep 10 06:33:47 2019 (r511739)
@@ -76,11 +76,6 @@ lib/lives/plugins/effects/realtime/weed/ccorrect.so
lib/lives/plugins/effects/realtime/weed/colorkey.so
lib/lives/plugins/effects/realtime/weed/comic.so
lib/lives/plugins/effects/realtime/weed/compositor.so
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/examples.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/modulations.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/newlives.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/regrlives.txt
-lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/roselives.txt
lib/lives/plugins/effects/realtime/weed/data_processor.so
lib/lives/plugins/effects/realtime/weed/data_unpacker.so
lib/lives/plugins/effects/realtime/weed/deinterlace.so
@@ -88,8 +83,13 @@ lib/lives/plugins/effects/realtime/weed/edge.so
lib/lives/plugins/effects/realtime/weed/farneback_analyser.so
lib/lives/plugins/effects/realtime/weed/fg_bg_removal.so
lib/lives/plugins/effects/realtime/weed/fireTV.so
-lib/lives/plugins/effects/realtime/weed/fourKlives.so
%%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
+lib/lives/plugins/effects/realtime/weed/fourKlives.so
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/examples.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/modulations.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/newlives.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/regrlives.txt
+lib/lives/plugins/effects/realtime/weed/fourKlives/songs/roselives.txt
lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
lib/lives/plugins/effects/realtime/weed/haar_analyser.so
lib/lives/plugins/effects/realtime/weed/haip.so
@@ -200,12 +200,12 @@ lib/lives/plugins/encoders/x264_encoder
lib/lives/plugins/playback/audiostream/audiostreamer.pl
lib/lives/plugins/playback/video/SDL.so
lib/lives/plugins/playback/video/icecast_output.so
-lib/lives/plugins/playback/video/lives2lives_stream.so
lib/lives/plugins/playback/video/libav_stream.so
+lib/lives/plugins/playback/video/lives2lives_stream.so
lib/lives/plugins/playback/video/oggstream.so
lib/lives/plugins/playback/video/openGL.so
lib/lives/plugins/playback/video/vloopback.so
-lib/lives/plugins/playback/video/vloopback2.so
+%%V4L%%lib/lives/plugins/playback/video/vloopback2.so
lib/lives/plugins/playback/video/yuv4mpeg_stream.so
libdata/pkgconfig/libweed-compat.pc
libdata/pkgconfig/libweed-plugin.pc
@@ -214,13 +214,6 @@ libdata/pkgconfig/libweed.pc
libdata/pkgconfig/libweed_slice.pc
share/app-install/icons/lives.png
share/applications/LiVES.desktop
-share/icons/hicolor/128x128/apps/lives.png
-share/icons/hicolor/16x16/apps/lives.png
-share/icons/hicolor/22x22/apps/lives.png
-share/icons/hicolor/256x256/apps/lives.png
-share/icons/hicolor/32x32/apps/lives.png
-share/icons/hicolor/64x64/apps/lives.png
-share/pixmaps/lives.png
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -231,11 +224,18 @@ share/pixmaps/lives.png
%%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder
%%PORTDOCS%%%%DOCSDIR%%/RFX.spec
%%PORTDOCS%%%%DOCSDIR%%/clip_format.txt
+%%PORTDOCS%%%%DOCSDIR%%/c++-bindings.odt
%%PORTDOCS%%%%DOCSDIR%%/lives-OMC.txt
%%PORTDOCS%%%%DOCSDIR%%/rfxbuilder.odt
%%PORTDOCS%%%%DOCSDIR%%/weedevents.txt
%%PORTDOCS%%%%DOCSDIR%%/weedspec.txt
+share/icons/hicolor/128x128/apps/lives.png
+share/icons/hicolor/16x16/apps/lives.png
+share/icons/hicolor/22x22/apps/lives.png
+share/icons/hicolor/256x256/apps/lives.png
+share/icons/hicolor/32x32/apps/lives.png
share/icons/hicolor/48x48/apps/lives.png
+share/icons/hicolor/64x64/apps/lives.png
%%DATADIR%%/default.keymap
%%DATADIR%%/icons/audio.png
%%DATADIR%%/icons/fullscreen.png
@@ -372,6 +372,8 @@ share/icons/hicolor/48x48/apps/lives.png
%%NLS%%share/locale/uk/LC_MESSAGES/lives.mo
%%NLS%%share/locale/uz/LC_MESSAGES/lives.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/lives.mo
+share/pixmaps/lives.png
share/pixmaps/lives.xpm
- at dir %%DATADIR%%/devicemaps
+ at dir lib/lives/plugins/effects/realtime/weed/data
@dir lib/lives/plugins/effects/realtime/weed/icons
+ at dir %%DATADIR%%/devicemaps
More information about the svn-ports-all
mailing list