--- Makefile (revision 535259) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lives -PORTVERSION= 2.10.2 -PORTREVISION= 6 +PORTVERSION= 3.0.2 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -33,7 +32,7 @@ mpg123:audio/mpg123 \ sox:audio/sox \ ogg123:audio/vorbis-tools \ - convert:graphics/ImageMagick6 \ + convert:graphics/ImageMagick7 \ sswf:graphics/sswf \ mencoder:multimedia/mencoder \ mplayer:multimedia/mplayer \ @@ -56,7 +55,7 @@ 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 @@ -63,7 +62,7 @@ CONFIGURE_ARGS= --disable-ldvgrab INSTALL_TARGET= install-strip -DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \ +DOC_FILES= AUTHORS ChangeLog FEATURES GETTING.STARTED 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 \ --- distinfo (revision 535259) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547452499 -SHA256 (LiVES-2.10.2.tar.bz2) = 572e6ed613eedb035ceab5f48ba3e7331e40128652af2fbc066fd87594be241c -SIZE (LiVES-2.10.2.tar.bz2) = 4100348 +TIMESTAMP = 1589558202 +SHA256 (LiVES-3.0.2.tar.bz2) = 390991b73aa162f9475ef8abff29bbfd580c03f2cc14a8628dd1c13c8abbe332 +SIZE (LiVES-3.0.2.tar.bz2) = 4202028 --- files/patch-configure.ac (revision 535259) +++ files/patch-configure.ac (working copy) @@ -17,37 +17,3 @@ AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV) -@@ -734,16 +736,23 @@ - - - HAVE_ALSA=false -+AC_ARG_ENABLE(alsa, [ --disable-alsa Disable alsa support.] , disable_alsa=yes) -+if test "x$disable_alsa" != "xyes" ; then - dnl check for libasound - PKG_CHECK_MODULES(ALSA,alsa,HAVE_ALSA=true,HAVE_ALSA=false) - AC_SUBST(ALSA_CFLAGS) - AC_SUBST(ALSA_LIBS) -+else -+echo not checking for alsa -+fi - - AM_CONDITIONAL(HAVE_ALSA,$HAVE_ALSA) - - - HAVE_PULSE_AUDIO=false - HAVE_PA_STREAM_BEGIN_WRITE=false -+AC_ARG_ENABLE(pulse, [ --disable-pulse Disable pulseaudio support.] , disable_pulse=yes) -+if test "x$disable_pulse" != "xyes" ; then - 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 @@ - - AC_SUBST(PULSE_CFLAGS) - AC_SUBST(PULSE_LIBS) -+else -+echo not checking for pulse -+fi - - AM_CONDITIONAL(HAVE_PULSE_AUDIO,$HAVE_PULSE_AUDIO) - AM_CONDITIONAL(HAVE_PA_STREAM_BEGIN_WRITE,$HAVE_PA_STREAM_BEGIN_WRITE) --- files/patch-lives-plugins_weed-plugins_Makefile.am (revision 535259) +++ files/patch-lives-plugins_weed-plugins_Makefile.am (working copy) @@ -1,12 +1,11 @@ ---- 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 +--- lives-plugins/weed-plugins/Makefile.am.orig 2020-05-15 18:41:00.714625000 +0200 ++++ lives-plugins/weed-plugins/Makefile.am 2020-05-15 18:43:44.335839000 +0200 +@@ -81,7 +81,7 @@ 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_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_video -lopencv_imgproc farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS) farneback_analyser_la_SOURCES = farneback_analyser.cpp --- pkg-plist (revision 535259) +++ pkg-plist (working copy) @@ -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,7 +215,6 @@ 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 @@ -237,28 +236,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