Index: head/multimedia/lives/files/patch-libweed_weed-effects.h =================================================================== --- head/multimedia/lives/files/patch-libweed_weed-effects.h (revision 394393) +++ head/multimedia/lives/files/patch-libweed_weed-effects.h (nonexistent) @@ -1,12 +0,0 @@ ---- libweed/weed-effects.h.orig 2015-04-17 23:38:34 UTC -+++ libweed/weed-effects.h -@@ -126,7 +126,9 @@ extern "C" - #define WEED_ERROR_PLUGIN_INVALID 64 - - /* host bootstrap function */ -+#ifndef PLUGIN_ENCODERS - typedef weed_plant_t *(*weed_bootstrap_f)(weed_default_getter_f *value, int num_versions, int *plugin_versions); -+#endif - - /* plugin only functions */ - typedef weed_plant_t *(*weed_setup_f)(weed_bootstrap_f weed_boot); Property changes on: head/multimedia/lives/files/patch-libweed_weed-effects.h ___________________________________________________________________ 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: head/multimedia/lives/files/patch-src_widget-helper.c =================================================================== --- head/multimedia/lives/files/patch-src_widget-helper.c (revision 394393) +++ head/multimedia/lives/files/patch-src_widget-helper.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/widget-helper.c.orig 2015-08-05 09:16:34.803154000 +0200 -+++ src/widget-helper.c 2015-08-05 09:16:59.890589000 +0200 -@@ -2404,7 +2404,7 @@ - LIVES_INLINE boolean lives_label_set_halignment(LiVESLabel *label, float yalign) { - #ifdef GUI_GTK - #if GTK_CHECK_VERSION(3,16,0) -- gtk_label_set_y_align(label,yalign); -+ gtk_label_set_yalign(label,yalign); - #else - gtk_misc_set_alignment(GTK_MISC(label),0.,yalign); - #endif Property changes on: head/multimedia/lives/files/patch-src_widget-helper.c ___________________________________________________________________ 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: head/multimedia/lives/files/patch-src_widget-helper.h =================================================================== --- head/multimedia/lives/files/patch-src_widget-helper.h (revision 394393) +++ head/multimedia/lives/files/patch-src_widget-helper.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/widget-helper.h.orig 2015-05-27 17:58:56 UTC -+++ src/widget-helper.h -@@ -12,6 +12,10 @@ - #define M_PI 3.1415926536 - #endif - -+#ifndef ulong -+#define ulong unsigned long -+#endif -+ - #define LIVES_HAS_GRID_WIDGET 0 - #define LIVES_HAS_IMAGE_MENU_ITEM 0 - #define LIVES_HAS_DEVICE_MANAGER 0 Property changes on: head/multimedia/lives/files/patch-src_widget-helper.h ___________________________________________________________________ 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: head/multimedia/lives/Makefile =================================================================== --- head/multimedia/lives/Makefile (revision 394393) +++ head/multimedia/lives/Makefile (revision 394394) @@ -1,112 +1,108 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= lives -PORTVERSION= 2.4.0 +PORTVERSION= 2.4.1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ MAINTAINER= pawel@FreeBSD.org COMMENT= Video editing system LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:${PORTSDIR}/multimedia/v4l_compat \ ${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib \ libjack.so:${PORTSDIR}/audio/jack \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ liboil-0.3.so:${PORTSDIR}/devel/liboil \ libprojectM.so:${PORTSDIR}/graphics/libprojectm \ libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 \ libopencv_calib3d.so:${PORTSDIR}/graphics/opencv \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libdv.so:${PORTSDIR}/multimedia/libdv \ libmjpegutils.so:${PORTSDIR}/multimedia/mjpegtools \ libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \ mpg123:${PORTSDIR}/audio/mpg123 \ sox:${PORTSDIR}/audio/sox \ ogg123:${PORTSDIR}/audio/vorbis-tools \ convert:${PORTSDIR}/graphics/ImageMagick \ sswf:${PORTSDIR}/graphics/sswf \ mencoder:${PORTSDIR}/multimedia/mencoder \ mplayer:${PORTSDIR}/multimedia/mplayer \ ogmmerge:${PORTSDIR}/multimedia/ogmtools \ transcode:${PORTSDIR}/multimedia/transcode \ x264:${PORTSDIR}/multimedia/x264 \ cdrecord:${PORTSDIR}/sysutils/cdrtools WRKSRC= ${WRKDIR}/${DISTNAME:tl} USES= ghostscript:run libtool pathfix perl5 pkgconfig python \ shebangfix tar:bzip2 SHEBANG_FILES= build-lives-rfx-plugin build-lives-rfx-plugin-multi \ smogrify tools/autolives.pl GNU_CONFIGURE= yes USE_CSTD= gnu89 USE_GNOME= gtk30 intltool USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-ldvgrab INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -L${LOCALBASE}/lib -pthread 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 PORT_VERBS= lives LiVES _encoder.py midistart midistop smogrify sendOSC OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA NLS OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen DOXYGEN_CONFIGURE_OFF= --disable-doxygen FREI0R_BUILD_DEPENDS= frei0r>0:${PORTSDIR}/graphics/frei0r FREI0R_RUN_DEPENDS= frei0r>0:${PORTSDIR}/graphics/frei0r MATROSKA_RUN_DEPENDS= mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls .include .if ! ${PORT_OPTIONS:MFREI0R} CONFIGURE_ENV+= ac_cv_header_frei0r_h=no .endif post-patch: @${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} 's|/bin/touch|/usr/bin/touch|g' \ - ${WRKSRC}/src/callbacks.c \ - ${WRKSRC}/src/saveplay.c \ - ${WRKSRC}/src/utils.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 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} (cd ${STAGEDIR}${PREFIX}/bin && ${RM} lives && ${LN} -s lives-exe lives) .if ${PORT_OPTIONS:MDOXYGEN} @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||}/html \ ! -type d >> ${TMPPLIST}) .endif .include Index: head/multimedia/lives/distinfo =================================================================== --- head/multimedia/lives/distinfo (revision 394393) +++ head/multimedia/lives/distinfo (revision 394394) @@ -1,2 +1,2 @@ -SHA256 (lives-2.4.0.tar.bz2) = c7f48599169c330577e4fea7934796f2feac22bb2fff90b864d3088a4f6fe44d -SIZE (lives-2.4.0.tar.bz2) = 3751082 +SHA256 (lives-2.4.1.tar.bz2) = 7c4d9f9a440680d622290c7d2d9d1b99942f581a08ff98b13d3ff4e48c45c2b1 +SIZE (lives-2.4.1.tar.bz2) = 3757937