From owner-svn-ports-head@freebsd.org Sun Sep 8 21:39:12 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 317F1E3E8C; Sun, 8 Sep 2019 21:39:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46RPnX0VdWz48nx; Sun, 8 Sep 2019 21:39:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEA5636C8; Sun, 8 Sep 2019 21:39:11 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x88LdB97070437; Sun, 8 Sep 2019 21:39:11 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x88LdA1i070431; Sun, 8 Sep 2019 21:39:10 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201909082139.x88LdA1i070431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 8 Sep 2019 21:39:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511598 - in head/multimedia/lives: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/multimedia/lives: . files X-SVN-Commit-Revision: 511598 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2019 21:39:12 -0000 Author: rene Date: Sun Sep 8 21:39:10 2019 New Revision: 511598 URL: https://svnweb.freebsd.org/changeset/ports/511598 Log: multimedia/lives: fix build and some pkg-plist issues PR: 237320 Submitted by: Hiroo Ono MFH: 2019Q3 Added: head/multimedia/lives/files/patch-Makefile.am (contents, props changed) head/multimedia/lives/files/patch-configure.ac (contents, props changed) head/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (contents, props changed) head/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (contents, props changed) Deleted: head/multimedia/lives/files/patch-configure head/multimedia/lives/files/patch-ffmpeg4 Modified: head/multimedia/lives/Makefile head/multimedia/lives/pkg-plist Modified: head/multimedia/lives/Makefile ============================================================================== --- head/multimedia/lives/Makefile Sun Sep 8 20:47:57 2019 (r511597) +++ head/multimedia/lives/Makefile Sun Sep 8 21:39:10 2019 (r511598) @@ -14,10 +14,6 @@ COMMENT= Video editing system LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to patch -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/bin/analyseplugin:audio/ladspa LIB_DEPENDS= libasound.so:audio/alsa-lib \ @@ -52,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* \ @@ -75,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 @@ -84,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 @@ -113,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 Added: head/multimedia/lives/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/lives/files/patch-Makefile.am Sun Sep 8 21:39:10 2019 (r511598) @@ -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 Added: head/multimedia/lives/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/lives/files/patch-configure.ac Sun Sep 8 21:39:10 2019 (r511598) @@ -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) + Added: head/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am Sun Sep 8 21:39:10 2019 (r511598) @@ -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 + Added: head/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am Sun Sep 8 21:39:10 2019 (r511598) @@ -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: head/multimedia/lives/pkg-plist ============================================================================== --- head/multimedia/lives/pkg-plist Sun Sep 8 20:47:57 2019 (r511597) +++ head/multimedia/lives/pkg-plist Sun Sep 8 21:39:10 2019 (r511598) @@ -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 -@dir %%DATADIR%%/devicemaps +@dir lib/lives/plugins/effects/realtime/weed/data @dir lib/lives/plugins/effects/realtime/weed/icons +@dir %%DATADIR%%/devicemaps