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)

multimedia/lives/Makefile

@@ -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/ladspa \
 
 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.STARTED README \
 		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>

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

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)
+