Attachment 217538 Details for Bug 246491 – Update to 3.0.2 + refactoring

[patch] Update to 3.0.2 + refactoring

lives.diff (text/plain), 11.26 KB, created by Vladimir Druzenko on 2020-08-26 12:06:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-08-26 12:06:31 UTC

Size: 11.26 KB

patch

obsolete

>diff -ur multimedia/lives.orig/Makefile multimedia/lives/Makefile
>--- multimedia/lives.orig/Makefile
>+++ multimedia/lives/Makefile
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/multimedia/lives/Makefile 512078 2019-09-14 21:30:54Z tobik $
> 
> PORTNAME=	lives
>-PORTVERSION=	2.10.2
>-PORTREVISION=	6
>+PORTVERSION=	3.0.2
>+PORTREVISION=	0
> CATEGORIES=	multimedia
> MASTER_SITES=	http://lives-video.com/releases/
> DISTNAME=	LiVES-${PORTVERSION}
>@@ -33,12 +33,10 @@
> 		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
> 
>@@ -56,41 +54,48 @@
> GNU_CONFIGURE=	yes
> USE_XORG=	x11 xrender
> USE_GL=		gl glu
>-USE_SDL=	sdl
>+USE_SDL=	sdl sdl2
> USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
> USE_LDCONFIG=	yes
> 
>-CONFIGURE_ARGS=	--disable-ldvgrab
>+CONFIGURE_ARGS=	--disable-ldvgrab --disable-system-weed
> INSTALL_TARGET=	install-strip
> 
>-DOC_FILES=	AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
>+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_SUB=	yes
>+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_OFF=	--disable-alsa
>-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
>-DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
>-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_OFF=	--disable-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_OFF=	--disable-nls
>-PROJECTM_DESC=		projectM support
>-PROJECTM_CONFIGURE_OFF=	--disable-projectM
>-PROJECTM_LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
>-PULSEAUDIO_CONFIGURE_OFF=--disable-pulse
>-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
>+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} \
>diff -ur multimedia/lives.orig/distinfo multimedia/lives/distinfo
>--- multimedia/lives.orig/distinfo
>+++ multimedia/lives/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1547452499
>-SHA256 (LiVES-2.10.2.tar.bz2) = 572e6ed613eedb035ceab5f48ba3e7331e40128652af2fbc066fd87594be241c
>-SIZE (LiVES-2.10.2.tar.bz2) = 4100348
>+TIMESTAMP = 1598425069
>+SHA256 (LiVES-3.0.2.tar.bz2) = 390991b73aa162f9475ef8abff29bbfd580c03f2cc14a8628dd1c13c8abbe332
>+SIZE (LiVES-3.0.2.tar.bz2) = 4202028
>diff -ur multimedia/lives.orig/files/patch-configure.ac multimedia/lives/files/patch-configure.ac
>--- multimedia/lives.orig/files/patch-configure.ac
>+++ multimedia/lives/files/patch-configure.ac
>@@ -1,25 +1,25 @@
>---- configure.ac.orig	2019-01-08 13:49:30 UTC
>+--- configure.ac.orig
> +++ configure.ac
>-@@ -522,12 +522,14 @@
>+@@ -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`
>++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
>@@ -30,9 +30,8 @@
> +else
> +echo not checking for alsa
> +fi
>-
>+ 
>  AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA)
>-
>  
>  HAVE_PULSE_AUDIO=false
>  HAVE_PA_STREAM_BEGIN_WRITE=false
>@@ -41,7 +40,7 @@
>  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
>-@@ -752,6 +761,9 @@
>+@@ -759,6 +768,9 @@
>  
>  AC_SUBST(PULSE_CFLAGS)
>  AC_SUBST(PULSE_LIBS)
>@@ -51,3 +50,14 @@
>  
>  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)
>+ 
>diff -ur multimedia/lives.orig/files/patch-lives-plugins_weed-plugins_Makefile.am multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am
>--- multimedia/lives.orig/files/patch-lives-plugins_weed-plugins_Makefile.am
>+++ multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am
>@@ -1,11 +1,11 @@
>---- lives-plugins/weed-plugins/Makefile.am.orig	2019-04-14 20:00:14 UTC
>+--- lives-plugins/weed-plugins/Makefile.am.orig
> +++ lives-plugins/weed-plugins/Makefile.am
>-@@ -85,7 +85,8 @@ endif
>- 
>+@@ -81,7 +81,8 @@
>+
>  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_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video -lopencv_imgproc
>++farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_core -lopencv_video -lopencv_imgproc
> +farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS)
>  farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS)
>  farneback_analyser_la_SOURCES = farneback_analyser.cpp
>diff -ur multimedia/lives.orig/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am
>--- multimedia/lives.orig/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am
>+++ multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am
>@@ -1,4 +1,4 @@
>---- lives-plugins/weed-plugins/gdk/Makefile.am.orig	2019-04-15 10:55:37 UTC
>+--- lives-plugins/weed-plugins/gdk/Makefile.am.orig
> +++ lives-plugins/weed-plugins/gdk/Makefile.am
> @@ -59,8 +59,8 @@ EXTRA_DIST=data icons
>  
>diff -ur multimedia/lives.orig/pkg-plist multimedia/lives/pkg-plist
>--- multimedia/lives.orig/pkg-plist
>+++ multimedia/lives/pkg-plist
>@@ -41,19 +41,19 @@
> lib/libOSC_client.so.0.0.0
> lib/libweed-utils.so
> lib/libweed-utils.so.0
>-lib/libweed-utils.so.0.0.9
>+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.9
>+lib/libweed-utils_scripting.so.0.0.11
> lib/libweed.so
> lib/libweed.so.0
>-lib/libweed.so.0.0.9
>+lib/libweed.so.0.0.11
> lib/libweed_slice.so
> lib/libweed_slice.so.0
>-lib/libweed_slice.so.0.0.9
>+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.9
>+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
>@@ -215,11 +215,11 @@
> 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
>@@ -237,28 +237,30 @@
> 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
>-%%DATADIR%%/icons/loop.png
>-%%DATADIR%%/icons/playsel.png
>-%%DATADIR%%/icons/pref_decoding.png
>-%%DATADIR%%/icons/pref_directory.png
>-%%DATADIR%%/icons/pref_effects.png
>-%%DATADIR%%/icons/pref_encoding.png
>-%%DATADIR%%/icons/pref_gui.png
>-%%DATADIR%%/icons/pref_jack.png
>-%%DATADIR%%/icons/pref_midi.png
>-%%DATADIR%%/icons/pref_misc.png
>-%%DATADIR%%/icons/pref_multitrack.png
>-%%DATADIR%%/icons/pref_net.png
>-%%DATADIR%%/icons/pref_playback.png
>-%%DATADIR%%/icons/pref_record.png
>-%%DATADIR%%/icons/pref_themes.png
>-%%DATADIR%%/icons/pref_warning.png
>-%%DATADIR%%/icons/sepwin.png
>-%%DATADIR%%/icons/volume_mute.png
>-%%DATADIR%%/icons/zoom-in.png
>-%%DATADIR%%/icons/zoom-out.png
>+%%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

Actions: View | Diff

Attachments on bug 246491: 214533 | 217538 | 219479 | 219557 | 219656 | 219668 | 219679