Index: branches/2019Q3/multimedia/lives/Makefile =================================================================== --- branches/2019Q3/multimedia/lives/Makefile (revision 511857) +++ branches/2019Q3/multimedia/lives/Makefile (revision 511858) @@ -1,119 +1,117 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= lives PORTVERSION= 2.10.2 PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} MAINTAINER= ports@FreeBSD.org 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 \ libjack.so:audio/jack \ libogg.so:audio/libogg \ libpulse.so:audio/pulseaudio \ liboil-0.3.so:devel/liboil \ libprojectM.so:graphics/libprojectm \ libvisual-0.4.so:graphics/libvisual04 \ libopencv_calib3d.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ libpng.so:graphics/png \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libavcodec.so:multimedia/ffmpeg \ libdv.so:multimedia/libdv \ libtheora.so:multimedia/libtheora \ libmjpegutils.so:multimedia/mjpegtools \ libschroedinger-1.0.so:multimedia/schroedinger RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:audio/ladspa \ 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 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -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 +USES= compiler:c++11-lib gettext-runtime ghostscript:run libtool \ + localbase pathfix perl5 pkgconfig python shebangfix tar:bzip2 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* \ lives-plugins/plugins/encoders/multi_encoder3 \ lives-plugins/plugins/playback/audiostream/audiostreamer.pl GNU_CONFIGURE= yes USE_XORG= x11 xrender USE_GL= gl glu USE_SDL= sdl USE_GNOME= cairo gdkpixbuf2 gtk30 intltool USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-ldvgrab INSTALL_TARGET= install-strip DOC_FILES= AUTHORS BUGS 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 \ weed-docs/weedspec.txt weed-docs/weedevents.txt -OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA V4L NLS +OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA NLS OPTIONS_SUB= yes 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 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 post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ 's/^LIBS = $$/&@LIBS@/' @${REINPLACE_CMD} -e 's| install-docDATA||g; s|-$$(VERSION)||g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|: install-data-local |: |g; s|-ldl||' \ ${WRKSRC}/lives-plugins/weed-plugins/gdk/Makefile.in \ ${WRKSRC}/lives-plugins/weed-plugins/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \ ${WRKSRC}/lives-plugins/weed-plugins/frei0r.c @${REINPLACE_CMD} '/cp -rf/ s|data/|data|g; /cp -rf/ s|icons/|icons|g' \ ${WRKSRC}/lives-plugins/weed-plugins/cairo/Makefile.in \ ${WRKSRC}/lives-plugins/weed-plugins/Makefile.in @${REINPLACE_CMD} '/selectRandom/d' \ ${WRKSRC}/lives-plugins/weed-plugins/projectM.cpp @${REINPLACE_CMD} 's|/usr/bin/perl|${perl_CMD}|' \ ${WRKSRC}/build-lives-rfx-plugin pre-build-NLS-on: @(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} update-po) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-DOXYGEN-on: - @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \ - -not -type d >> ${TMPPLIST}) + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||}/html \ + ! -type d >> ${TMPPLIST}) .include Index: branches/2019Q3/multimedia/lives/files/patch-configure.ac =================================================================== --- branches/2019Q3/multimedia/lives/files/patch-configure.ac (revision 511857) +++ branches/2019Q3/multimedia/lives/files/patch-configure.ac (nonexistent) @@ -1,22 +0,0 @@ ---- 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) - Property changes on: branches/2019Q3/multimedia/lives/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q3/multimedia/lives/files/patch-Makefile.am =================================================================== --- branches/2019Q3/multimedia/lives/files/patch-Makefile.am (revision 511857) +++ branches/2019Q3/multimedia/lives/files/patch-Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- 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 Property changes on: branches/2019Q3/multimedia/lives/files/patch-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am =================================================================== --- branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (revision 511857) +++ branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am (nonexistent) @@ -1,12 +0,0 @@ ---- 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 - Property changes on: branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am =================================================================== --- branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (revision 511857) +++ branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am (nonexistent) @@ -1,13 +0,0 @@ ---- 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: Property changes on: branches/2019Q3/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q3/multimedia/lives/files/patch-configure =================================================================== --- branches/2019Q3/multimedia/lives/files/patch-configure (nonexistent) +++ branches/2019Q3/multimedia/lives/files/patch-configure (revision 511858) @@ -0,0 +1,42 @@ +--- configure.orig 2015-12-23 17:59:14 UTC ++++ configure +@@ -28352,7 +28352,6 @@ if test -n "$WEED_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_WEED_CFLAGS=`$PKG_CONFIG --cflags "libweed >= 0.8.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +-else + pkg_failed=yes + fi + else +@@ -28441,7 +28440,6 @@ if test -n "$WEED_SLICE_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_WEED_SLICE_CFLAGS=`$PKG_CONFIG --cflags "libweed_slice >= 0.8.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +-else + pkg_failed=yes + fi + else +@@ -28531,7 +28529,6 @@ if test -n "$WEED_UTILS_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_WEED_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-utils >= 0.8.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +-else + pkg_failed=yes + fi + else +@@ -28620,7 +28617,6 @@ if test -n "$WEED_COMPAT_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_WEED_COMPAT_CFLAGS=`$PKG_CONFIG --cflags "libweed-compat >= 0.9.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +-else + pkg_failed=yes + fi + else +@@ -28709,7 +28705,6 @@ if test -n "$WEED_PLUGIN_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_WEED_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "libweed-plugin >= 0.13.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +-else + pkg_failed=yes + fi + else Property changes on: branches/2019Q3/multimedia/lives/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q3/multimedia/lives/files/patch-ffmpeg4 =================================================================== --- branches/2019Q3/multimedia/lives/files/patch-ffmpeg4 (nonexistent) +++ branches/2019Q3/multimedia/lives/files/patch-ffmpeg4 (revision 511858) @@ -0,0 +1,343 @@ +https://sourceforge.net/p/lives/code/2742/ +https://sourceforge.net/p/lives/code/2745/ + +--- configure.orig 2017-06-29 01:44:43 UTC ++++ configure +@@ -787,6 +787,8 @@ HAVE_AVFORMAT_NEW_STREAM_FALSE + HAVE_AVFORMAT_NEW_STREAM_TRUE + HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE + HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE ++HAVE_AVCODEC_GET_NAME_FALSE ++HAVE_AVCODEC_GET_NAME_TRUE + HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE + HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE + HAVE_AVCODEC_OPEN2_FALSE +@@ -26007,6 +26009,7 @@ fi + + HAVE_AVCODEC_OPEN2=false + HAVE_AVCODEC_ALLOC_CONTEXT3=false ++HAVE_AVCODEC_GET_NAME=false + HAVE_AV_CODEC_SET_PKT_TIMEBASE=false + HAVE_AVFORMAT_NEW_STREAM=false + HAVE_AVFORMAT_FIND_STREAM_INFO=false +@@ -26103,6 +26106,48 @@ else + HAVE_AVCODEC_ALLOC_COBTEXT3=false + fi + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_get_name in -lavcodec" >&5 ++$as_echo_n "checking for avcodec_get_name in -lavcodec... " >&6; } ++if ${ac_cv_lib_avcodec_avcodec_get_name+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lavcodec $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char avcodec_get_name (); ++int ++main () ++{ ++return avcodec_get_name (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_avcodec_avcodec_get_name=yes ++else ++ ac_cv_lib_avcodec_avcodec_get_name=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_get_name" >&5 ++$as_echo "$ac_cv_lib_avcodec_avcodec_get_name" >&6; } ++if test "x$ac_cv_lib_avcodec_avcodec_get_name" = xyes; then : ++ HAVE_AVCODEC_GET_NAME=true ++else ++ HAVE_AVCODEC_GET_NAME=false ++fi ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_codec_set_pkt_timebase in -lavcodec" >&5 + $as_echo_n "checking for av_codec_set_pkt_timebase in -lavcodec... " >&6; } + if ${ac_cv_lib_avcodec_av_codec_set_pkt_timebase+:} false; then : +@@ -26525,6 +26570,14 @@ else + HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE= + fi + ++ if $HAVE_AVCODEC_GET_NAME; then ++ HAVE_AVCODEC_GET_NAME_TRUE= ++ HAVE_AVCODEC_GET_NAME_FALSE='#' ++else ++ HAVE_AVCODEC_GET_NAME_TRUE='#' ++ HAVE_AVCODEC_GET_NAME_FALSE= ++fi ++ + if $HAVE_AV_CODEC_SET_PKT_TIMEBASE; then + HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE= + HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE='#' +@@ -29545,6 +29598,10 @@ Usually this means the macro was only invoked conditio + fi + if test -z "${HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE}" && test -z "${HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE}"; then + as_fn_error $? "conditional \"HAVE_AVCODEC_ALLOC_CONTEXT3\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_AVCODEC_GET_NAME_TRUE}" && test -z "${HAVE_AVCODEC_GET_NAME_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_AVCODEC_GET_NAME\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE}" && test -z "${HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE}"; then +--- lives-plugins/plugins/decoders/asf_decoder.c.orig 2017-05-24 02:07:10 UTC ++++ lives-plugins/plugins/decoders/asf_decoder.c +@@ -439,7 +439,7 @@ static int get_next_video_packet(const lives_clip_data + + + if (tdts == -1) { +- priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE; ++ priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE; + priv->avpkt.data = malloc(priv->avpkt.size); + memset(priv->avpkt.data, 0, priv->avpkt.size); + } +@@ -714,10 +714,10 @@ static int get_next_video_packet(const lives_clip_data + fprintf(stderr, "asf_decoder: buffer overflow reading vid packet (%d + %d > %d),\n increasing buffer size\n", + asf->packet_frag_offset, asf->packet_frag_size, priv->avpkt.size); + +- priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + FF_INPUT_BUFFER_PADDING_SIZE); ++ priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + AV_INPUT_BUFFER_PADDING_SIZE); + memset(priv->avpkt.data + priv->avpkt.size, 0, priv->def_packet_size); + priv->def_packet_size *= 2; +- priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE; ++ priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE; + } + + if (read(priv->fd, priv->avpkt.data + asf->packet_frag_offset, asf->packet_frag_size) +@@ -1436,8 +1436,8 @@ seek_skip: + if (!got_vidst) { + priv->st->codec->extradata_size = size - 40; + +- priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); +- memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); ++ memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + + if (read(priv->fd, priv->st->codec->extradata, + priv->st->codec->extradata_size) < priv->st->codec->extradata_size) { +--- lives-plugins/plugins/decoders/avformat_decoder.c.orig 2017-05-12 12:35:30 UTC ++++ lives-plugins/plugins/decoders/avformat_decoder.c +@@ -368,8 +368,12 @@ skip_init: + + get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned); + +- sprintf(cdata->audio_name, "%s", cc->codec_name); +- ++#ifdef HAVE_AVCODEC_GET_NAME ++ sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id)); ++#else ++ sprintf(cdata->audio_name, "%s", cc->codec->name); ++#endif ++ + priv->astream = i; + break; + +@@ -408,7 +412,11 @@ skip_init: + return FALSE; + } + +- sprintf(cdata->video_name, "%s", cc->codec_name); ++#ifdef HAVE_AVCODEC_GET_NAME ++ sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id)); ++#else ++ sprintf(cdata->video_name, "%s", cc->codec->name); ++#endif + + cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den; + if (cdata->par == 0) cdata->par = 1; +--- lives-plugins/plugins/decoders/flv_decoder.c.orig 2017-05-11 22:46:57 UTC ++++ lives-plugins/plugins/decoders/flv_decoder.c +@@ -465,7 +465,7 @@ static int flv_get_extradata(lives_clip_data_t *cdata, + lives_flv_priv_t *priv = cdata->priv; + + av_free(priv->ctx->extradata); +- priv->ctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); ++ priv->ctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); + if (priv->ctx->extradata == NULL) return AVERROR(ENOMEM); + priv->ctx->extradata_size = size; + dummy = read(priv->fd, priv->ctx->extradata, priv->ctx->extradata_size); +@@ -1143,12 +1143,12 @@ static boolean attach_stream(lives_clip_data_t *cdata, + + if (isclone) return TRUE; + +- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE); ++ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE); + + av_init_packet(&priv->avpkt); + + priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset); +- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + priv->input_position += pack.size + 4; + priv->avpkt.data = pack.data; + priv->avpkt.dts = priv->avpkt.pts = pack.dts; +@@ -1206,10 +1206,10 @@ static boolean attach_stream(lives_clip_data_t *cdata, + continue; + } + +- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE); ++ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE); + if (priv->pack_offset != 5) lseek(priv->fd, priv->pack_offset - 5, SEEK_CUR); + priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset); +- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + priv->avpkt.data = pack.data; + break; + } +@@ -1709,12 +1709,12 @@ boolean get_frame(const lives_clip_data_t *cdata, int6 + continue; + } + +- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE); ++ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE); + + if (priv->pack_offset != 1) lseek(priv->fd, priv->pack_offset - 1, SEEK_CUR); + + priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset); +- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + priv->avpkt.data = pack.data; + priv->avpkt.dts = priv->avpkt.pts = pack.dts; + +--- lives-plugins/plugins/decoders/libav_helper.h.orig 2017-05-12 05:48:30 UTC ++++ lives-plugins/plugins/decoders/libav_helper.h +@@ -117,6 +117,21 @@ static UNUSED void av_set_pts_info(AVStream *s, int pt + #define av_get_bits_per_sample(a) (av_get_bytes_per_sample(a) * 8) + #endif + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) ++#ifndef FF_INPUT_BUFFER_PADDING_SIZE ++#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_MIN_SIZE ++#else ++#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE ++#endif ++#else ++#ifndef AV_INPUT_BUFFER_PADDING_SIZE ++#define AV_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_MIN_SIZE ++#endif ++#endif ++ ++#ifndef AV_CODEC_FLAG_GLOBAL_HEADER ++#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER ++#endif + + + #endif // HAVE_LIBAV_LIBS +--- lives-plugins/plugins/decoders/mkv_decoder.c.orig 2017-05-12 08:39:45 UTC ++++ lives-plugins/plugins/decoders/mkv_decoder.c +@@ -883,7 +883,7 @@ static void matroska_fix_ass_packet(MatroskaDemuxConte + es = ec / 100; + ec -= 100 * es; + *ptr++ = '\0'; +- len = 50 + end - ptr + FF_INPUT_BUFFER_PADDING_SIZE; ++ len = 50 + end - ptr + AV_INPUT_BUFFER_PADDING_SIZE; + if (!(line = malloc(len))) + return; + snprintf(line, len, "Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n", +@@ -1544,7 +1544,7 @@ static int lives_mkv_read_header(lives_clip_data_t *cd + st->codec->extradata_size = extradata_size; + } else if (track->codec_priv.data && track->codec_priv.size > 0) { + st->codec->extradata = calloc(track->codec_priv.size + +- FF_INPUT_BUFFER_PADDING_SIZE, 1); ++ AV_INPUT_BUFFER_PADDING_SIZE, 1); + if (st->codec->extradata == NULL) { + fprintf(stderr, + "mkv_decoder: Out of memory\n"); +--- lives-plugins/plugins/decoders/mpegts_decoder.c.orig 2017-05-12 12:37:42 UTC ++++ lives-plugins/plugins/decoders/mpegts_decoder.c +@@ -125,7 +125,7 @@ static inline void skip_bits(GetBitContext *s, int n) + + /** + * init GetBitContext. +- * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits ++ * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits + * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end + * @param bit_size the size of the buffer in bits + * +@@ -337,6 +337,7 @@ struct MpegTSContext { + MpegTSFilter *pids[NB_PID_MAX]; + }; + ++/* + static const AVOption options[] = { + { + "compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT, +@@ -344,6 +345,7 @@ static const AVOption options[] = { + }, + { NULL }, + }; ++*/ + + /* TS stream handling */ + +@@ -1035,7 +1037,7 @@ static void new_pes_packet(PESContext *pes, AVPacket * + fprintf(stderr, "mpegts_decoder: PES packet size mismatch\n"); + //pes->flags |= AV_PKT_FLAG_CORRUPT; + } +- memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + // Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID + if (pes->sub_st && pes->stream_type == 0x83 && pes->extended_stream_id == 0x76) +@@ -1192,7 +1194,7 @@ static int mpegts_push_data(lives_clip_data_t *cdata, + pes->total_size = MAX_PES_PAYLOAD; + + /* allocate pes buffer */ +- pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!pes->buffer) + return AVERROR(ENOMEM); + +@@ -1289,7 +1291,7 @@ skip: + if (pes->data_index > 0 && pes->data_index + buf_size > pes->total_size) { + new_pes_packet(pes, ts->pkt); + pes->total_size = MAX_PES_PAYLOAD; +- pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!pes->buffer) + return AVERROR(ENOMEM); + ts->stop_parse = 1; +@@ -1454,7 +1456,7 @@ int ff_mp4_read_dec_config_descr(lives_clip_data_t *cd + if (!len || (uint64_t)len > (1 << 30)) + return -1; + av_free(st->codec->extradata); +- st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); ++ st->codec->extradata = av_mallocz(len + AV_INPUT_BUFFER_PADDING_SIZE); + if (!st->codec->extradata) + return AVERROR(ENOMEM); + memcpy(st->codec->extradata, p, len); +@@ -1802,7 +1804,7 @@ int ff_parse_mpeg2_descriptor(lives_clip_data_t *cdata + //if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4)) + //av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n"); + //} else { +- st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE); ++ st->codec->extradata = av_malloc(4 + AV_INPUT_BUFFER_PADDING_SIZE); + if (st->codec->extradata) { + st->codec->extradata_size = 4; + memcpy(st->codec->extradata, *pp, 4); +@@ -3141,8 +3143,8 @@ skip_det: + + priv->codec = codec; + +- if (codec->capabilities & CODEC_CAP_TRUNCATED) +- ctx->flags |= CODEC_FLAG_TRUNCATED; ++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ ctx->flags |= AV_CODEC_FLAG_TRUNCATED; + + // re-scan with avcodec; priv->data_start holds video data start position + Property changes on: branches/2019Q3/multimedia/lives/files/patch-ffmpeg4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q3/multimedia/lives/pkg-plist =================================================================== --- branches/2019Q3/multimedia/lives/pkg-plist (revision 511857) +++ branches/2019Q3/multimedia/lives/pkg-plist (revision 511858) @@ -1,379 +1,377 @@ bin/autolives.pl bin/build-lives-rfx-plugin bin/build-lives-rfx-plugin-multi bin/lives bin/lives-exe bin/lives_avi_encoder bin/lives_avi_encoder3 bin/lives_dirac_encoder bin/lives_dirac_encoder3 bin/lives_gif_encoder bin/lives_gif_encoder3 bin/lives_mkv_encoder bin/lives_mkv_encoder3 bin/lives_mng_encoder bin/lives_mng_encoder3 bin/lives_mpeg_encoder bin/lives_mpeg_encoder3 bin/lives_ogm_encoder bin/lives_ogm_encoder3 bin/lives_theora_encoder bin/lives_theora_encoder3 bin/midistart bin/midistop bin/sendOSC bin/smogrify include/weed/weed-compat.h include/weed/weed-effects.h include/weed/weed-events.h include/weed/weed-host.h include/weed/weed-palettes.h include/weed/weed-plugin.h include/weed/weed-utils.h include/weed/weed.h lib/libOSC.a lib/libOSC.so lib/libOSC.so.0 lib/libOSC.so.0.0.0 lib/libOSC_client.a lib/libOSC_client.so lib/libOSC_client.so.0 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_scripting.so lib/libweed-utils_scripting.so.0 lib/libweed-utils_scripting.so.0.0.9 lib/libweed.so lib/libweed.so.0 lib/libweed.so.0.0.9 lib/libweed_slice.so lib/libweed_slice.so.0 lib/libweed_slice.so.0.0.9 lib/libweed_slice_scripting.so lib/libweed_slice_scripting.so.0 lib/libweed_slice_scripting.so.0.0.9 lib/lives/plugins/decoders/asf_decoder.so lib/lives/plugins/decoders/dv_decoder.so lib/lives/plugins/decoders/flv_decoder.so lib/lives/plugins/decoders/mkv_decoder.so lib/lives/plugins/decoders/mpegts_decoder.so lib/lives/plugins/decoders/ogg_decoder.so lib/lives/plugins/decoders/zzavformat_decoder.so lib/lives/plugins/effects/realtime/weed/RGBdelay.so lib/lives/plugins/effects/realtime/weed/alien_overlay.so lib/lives/plugins/effects/realtime/weed/alpha_means.so lib/lives/plugins/effects/realtime/weed/alpha_visualizer.so lib/lives/plugins/effects/realtime/weed/audio_fft.so lib/lives/plugins/effects/realtime/weed/audio_transition.so lib/lives/plugins/effects/realtime/weed/audio_volume.so lib/lives/plugins/effects/realtime/weed/beat_detector.so lib/lives/plugins/effects/realtime/weed/blank_frame_detector.so lib/lives/plugins/effects/realtime/weed/blurzoom.so lib/lives/plugins/effects/realtime/weed/bump2d.so 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 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 -%%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 +%%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so 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 lib/lives/plugins/effects/realtime/weed/kaleidoscope.so lib/lives/plugins/effects/realtime/weed/ladspa.so lib/lives/plugins/effects/realtime/weed/layout_blends.so lib/lives/plugins/effects/realtime/weed/libvisual/libvis.so lib/lives/plugins/effects/realtime/weed/lifeTV.so lib/lives/plugins/effects/realtime/weed/livetext.so lib/lives/plugins/effects/realtime/weed/log_sig.so lib/lives/plugins/effects/realtime/weed/mask_overlay.so lib/lives/plugins/effects/realtime/weed/mirrors.so lib/lives/plugins/effects/realtime/weed/multi_blends.so lib/lives/plugins/effects/realtime/weed/multi_transitions.so lib/lives/plugins/effects/realtime/weed/negate.so lib/lives/plugins/effects/realtime/weed/nn_programmer.so lib/lives/plugins/effects/realtime/weed/noise.so lib/lives/plugins/effects/realtime/weed/onedTV.so lib/lives/plugins/effects/realtime/weed/palette_test.so lib/lives/plugins/effects/realtime/weed/plasma.so lib/lives/plugins/effects/realtime/weed/posterise.so lib/lives/plugins/effects/realtime/weed/projectM.so lib/lives/plugins/effects/realtime/weed/puretext.so lib/lives/plugins/effects/realtime/weed/randomiser.so lib/lives/plugins/effects/realtime/weed/revTV.so lib/lives/plugins/effects/realtime/weed/rippleTV.so lib/lives/plugins/effects/realtime/weed/rotozoom.so lib/lives/plugins/effects/realtime/weed/scribbler.so lib/lives/plugins/effects/realtime/weed/shift.so lib/lives/plugins/effects/realtime/weed/simple_blend.so lib/lives/plugins/effects/realtime/weed/slide_over.so lib/lives/plugins/effects/realtime/weed/softlight.so lib/lives/plugins/effects/realtime/weed/targeted_zoom.so lib/lives/plugins/effects/realtime/weed/textfun.so lib/lives/plugins/effects/realtime/weed/tone_gen.so lib/lives/plugins/effects/realtime/weed/tvpic.so lib/lives/plugins/effects/realtime/weed/vector_visualiser.so lib/lives/plugins/effects/realtime/weed/vertigo.so lib/lives/plugins/effects/realtime/weed/videowall.so lib/lives/plugins/effects/realtime/weed/warpTV.so lib/lives/plugins/effects/realtime/weed/xeffect.so lib/lives/plugins/effects/rendered/blank_frames lib/lives/plugins/effects/rendered/blur lib/lives/plugins/effects/rendered/brightness_change lib/lives/plugins/effects/rendered/charcoal lib/lives/plugins/effects/rendered/colorize lib/lives/plugins/effects/rendered/colour_filter lib/lives/plugins/effects/rendered/colour_replace lib/lives/plugins/effects/rendered/contrast lib/lives/plugins/effects/rendered/cycle lib/lives/plugins/effects/rendered/deinterlace lib/lives/plugins/effects/rendered/despeckle lib/lives/plugins/effects/rendered/dream lib/lives/plugins/effects/rendered/edge_detect lib/lives/plugins/effects/rendered/emboss lib/lives/plugins/effects/rendered/enhance lib/lives/plugins/effects/rendered/fade_in_out lib/lives/plugins/effects/rendered/flip lib/lives/plugins/effects/rendered/flop lib/lives/plugins/effects/rendered/frame_calculator lib/lives/plugins/effects/rendered/gamma_change lib/lives/plugins/effects/rendered/gen_blank_frames lib/lives/plugins/effects/rendered/gen_clip_from_image lib/lives/plugins/effects/rendered/gen_coloured_frames lib/lives/plugins/effects/rendered/gen_text lib/lives/plugins/effects/rendered/hue_change lib/lives/plugins/effects/rendered/image_overlay lib/lives/plugins/effects/rendered/jumble lib/lives/plugins/effects/rendered/modulate lib/lives/plugins/effects/rendered/monochrome lib/lives/plugins/effects/rendered/negate lib/lives/plugins/effects/rendered/noisify lib/lives/plugins/effects/rendered/normalize lib/lives/plugins/effects/rendered/photo_still lib/lives/plugins/effects/rendered/pixilate lib/lives/plugins/effects/rendered/posterize lib/lives/plugins/effects/rendered/randomzoom lib/lives/plugins/effects/rendered/resize lib/lives/plugins/effects/rendered/rotate lib/lives/plugins/effects/rendered/saturation_change lib/lives/plugins/effects/rendered/sepia lib/lives/plugins/effects/rendered/shift_horizontal lib/lives/plugins/effects/rendered/shift_vertical lib/lives/plugins/effects/rendered/shrink_expand lib/lives/plugins/effects/rendered/skip_forwards lib/lives/plugins/effects/rendered/solarize lib/lives/plugins/effects/rendered/spin lib/lives/plugins/effects/rendered/spread lib/lives/plugins/effects/rendered/swirl lib/lives/plugins/effects/rendered/textover lib/lives/plugins/effects/rendered/transition_bwthresh lib/lives/plugins/effects/rendered/transition_checkerboard lib/lives/plugins/effects/rendered/transition_fade2 lib/lives/plugins/effects/rendered/transition_splice lib/lives/plugins/effects/rendered/trim_frames lib/lives/plugins/effects/rendered/tunnel lib/lives/plugins/effects/rendered/wave lib/lives/plugins/encoders/encodedv_encoder lib/lives/plugins/encoders/ffmpeg_encoder lib/lives/plugins/encoders/mencoder_encoder lib/lives/plugins/encoders/mjpegtools_encoder lib/lives/plugins/encoders/multi_encoder lib/lives/plugins/encoders/multi_encoder3 lib/lives/plugins/encoders/pdf_encoder lib/lives/plugins/encoders/qtutils_encoder lib/lives/plugins/encoders/sswf_encoder 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/libav_stream.so lib/lives/plugins/playback/video/lives2lives_stream.so +lib/lives/plugins/playback/video/libav_stream.so lib/lives/plugins/playback/video/oggstream.so lib/lives/plugins/playback/video/openGL.so lib/lives/plugins/playback/video/vloopback.so -%%V4L%%lib/lives/plugins/playback/video/vloopback2.so +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 libdata/pkgconfig/libweed-utils.pc 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 %%PORTDOCS%%%%DOCSDIR%%/FEATURES %%PORTDOCS%%%%DOCSDIR%%/GETTING.STARTED %%PORTDOCS%%%%DOCSDIR%%/LiVES-Perl.odt %%PORTDOCS%%%%DOCSDIR%%/README %%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 %%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%%/mixxx.map %%DATADIR%%/plugins/effects/RFXscripts/blank_frames.script %%DATADIR%%/plugins/effects/RFXscripts/blur.script %%DATADIR%%/plugins/effects/RFXscripts/brightness_change.script %%DATADIR%%/plugins/effects/RFXscripts/charcoal.script %%DATADIR%%/plugins/effects/RFXscripts/colorize.script %%DATADIR%%/plugins/effects/RFXscripts/colour_filter.script %%DATADIR%%/plugins/effects/RFXscripts/colour_replace.script %%DATADIR%%/plugins/effects/RFXscripts/contrast.script %%DATADIR%%/plugins/effects/RFXscripts/cycle.script %%DATADIR%%/plugins/effects/RFXscripts/deinterlace.script %%DATADIR%%/plugins/effects/RFXscripts/despekle.script %%DATADIR%%/plugins/effects/RFXscripts/dream.script %%DATADIR%%/plugins/effects/RFXscripts/edge_detect.script %%DATADIR%%/plugins/effects/RFXscripts/emboss.script %%DATADIR%%/plugins/effects/RFXscripts/enhance.script %%DATADIR%%/plugins/effects/RFXscripts/fade_in_out.script %%DATADIR%%/plugins/effects/RFXscripts/flip.script %%DATADIR%%/plugins/effects/RFXscripts/flop.script %%DATADIR%%/plugins/effects/RFXscripts/frame_calculator.script %%DATADIR%%/plugins/effects/RFXscripts/gamma_change.script %%DATADIR%%/plugins/effects/RFXscripts/gen_blank_frames.script %%DATADIR%%/plugins/effects/RFXscripts/gen_clip_from_image.script %%DATADIR%%/plugins/effects/RFXscripts/gen_coloured_frames.script %%DATADIR%%/plugins/effects/RFXscripts/gen_text.script %%DATADIR%%/plugins/effects/RFXscripts/hue_change.script %%DATADIR%%/plugins/effects/RFXscripts/image_overlay.script %%DATADIR%%/plugins/effects/RFXscripts/jumble.script %%DATADIR%%/plugins/effects/RFXscripts/modulate.script %%DATADIR%%/plugins/effects/RFXscripts/monochrome.script %%DATADIR%%/plugins/effects/RFXscripts/negate.script %%DATADIR%%/plugins/effects/RFXscripts/noisify.script %%DATADIR%%/plugins/effects/RFXscripts/normalize.script %%DATADIR%%/plugins/effects/RFXscripts/photo_still.script %%DATADIR%%/plugins/effects/RFXscripts/pixilate.script %%DATADIR%%/plugins/effects/RFXscripts/posterize.script %%DATADIR%%/plugins/effects/RFXscripts/randomzoom.script %%DATADIR%%/plugins/effects/RFXscripts/resize.script %%DATADIR%%/plugins/effects/RFXscripts/rotate.script %%DATADIR%%/plugins/effects/RFXscripts/saturation_change.script %%DATADIR%%/plugins/effects/RFXscripts/sepia.script %%DATADIR%%/plugins/effects/RFXscripts/shift_horizontal.script %%DATADIR%%/plugins/effects/RFXscripts/shift_vertical.script %%DATADIR%%/plugins/effects/RFXscripts/shrink_expand.script %%DATADIR%%/plugins/effects/RFXscripts/skip_forwards.script %%DATADIR%%/plugins/effects/RFXscripts/solarize.script %%DATADIR%%/plugins/effects/RFXscripts/spin.script %%DATADIR%%/plugins/effects/RFXscripts/spread.script %%DATADIR%%/plugins/effects/RFXscripts/swirl.script %%DATADIR%%/plugins/effects/RFXscripts/textover.script %%DATADIR%%/plugins/effects/RFXscripts/transition_bwthresh.script %%DATADIR%%/plugins/effects/RFXscripts/transition_checkerboard.script %%DATADIR%%/plugins/effects/RFXscripts/transition_fade.script %%DATADIR%%/plugins/effects/RFXscripts/transition_splice.script %%DATADIR%%/plugins/effects/RFXscripts/trim_frames.script %%DATADIR%%/plugins/effects/RFXscripts/tunnel.script %%DATADIR%%/plugins/effects/RFXscripts/wave.script %%DATADIR%%/plugins/effects/compound/image_stabilizer %%DATADIR%%/plugins/effects/compound/motion_analyser %%DATADIR%%/plugins/effects/compound/neural_net %%DATADIR%%/resources/vidtest.avi %%DATADIR%%/themes/camera/frame.jpg %%DATADIR%%/themes/camera/header.theme %%DATADIR%%/themes/camera/main.jpg %%DATADIR%%/themes/crayons-bright/frame.jpg %%DATADIR%%/themes/crayons-bright/header.theme %%DATADIR%%/themes/crayons-bright/main.jpg %%DATADIR%%/themes/crayons/frame.jpg %%DATADIR%%/themes/crayons/header.theme %%DATADIR%%/themes/crayons/header.theme_gtk2 %%DATADIR%%/themes/crayons/main.jpg %%DATADIR%%/themes/cutting_room/frame.jpg %%DATADIR%%/themes/cutting_room/header.theme %%DATADIR%%/themes/cutting_room/main.jpg %%DATADIR%%/themes/editor/frame.jpg %%DATADIR%%/themes/editor/header.theme %%DATADIR%%/themes/editor/header.theme_gtk2 %%DATADIR%%/themes/editor/main.jpg %%DATADIR%%/themes/lives-splash.png %%DATADIR%%/themes/pinks/frame.jpg %%DATADIR%%/themes/pinks/header.theme %%DATADIR%%/themes/pinks/main.jpg %%NLS%%share/locale/ar/LC_MESSAGES/lives.mo %%NLS%%share/locale/ca/LC_MESSAGES/lives.mo %%NLS%%share/locale/cs/LC_MESSAGES/lives.mo %%NLS%%share/locale/da/LC_MESSAGES/lives.mo %%NLS%%share/locale/de_DE/LC_MESSAGES/lives.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/lives.mo %%NLS%%share/locale/es/LC_MESSAGES/lives.mo %%NLS%%share/locale/et/LC_MESSAGES/lives.mo %%NLS%%share/locale/fi/LC_MESSAGES/lives.mo %%NLS%%share/locale/fr/LC_MESSAGES/lives.mo %%NLS%%share/locale/gl/LC_MESSAGES/lives.mo %%NLS%%share/locale/he/LC_MESSAGES/lives.mo %%NLS%%share/locale/hr/LC_MESSAGES/lives.mo %%NLS%%share/locale/hu/LC_MESSAGES/lives.mo %%NLS%%share/locale/it/LC_MESSAGES/lives.mo %%NLS%%share/locale/ja/LC_MESSAGES/lives.mo %%NLS%%share/locale/nl_NL/LC_MESSAGES/lives.mo %%NLS%%share/locale/oc/LC_MESSAGES/lives.mo %%NLS%%share/locale/pl/LC_MESSAGES/lives.mo %%NLS%%share/locale/pms/LC_MESSAGES/lives.mo %%NLS%%share/locale/pt/LC_MESSAGES/lives.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/lives.mo %%NLS%%share/locale/ro/LC_MESSAGES/lives.mo %%NLS%%share/locale/ru/LC_MESSAGES/lives.mo %%NLS%%share/locale/sk/LC_MESSAGES/lives.mo %%NLS%%share/locale/te/LC_MESSAGES/lives.mo %%NLS%%share/locale/tr/LC_MESSAGES/lives.mo %%NLS%%share/locale/ug/LC_MESSAGES/lives.mo %%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 lib/lives/plugins/effects/realtime/weed/data -@dir lib/lives/plugins/effects/realtime/weed/icons @dir %%DATADIR%%/devicemaps +@dir lib/lives/plugins/effects/realtime/weed/icons Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 511857) +++ branches/2019Q3 (revision 511858) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head:r511598-511599