svn commit: r387776 - in head/multimedia/lives: . files

[Pawel Pekala]

Author: pawel
Date: Thu May 28 21:02:41 2015
New Revision: 387776
URL: https://svnweb.freebsd.org/changeset/ports/387776

Log:
  - Update to version 2.4.0
  - Remove upstreamed patches
  
  Changelog:
  
  Implement workaround for expose event problems in gtk+ 3.10.
  Fix threading crash in multitrack.
  Fix invalid saving of layouts in multitrack.
  Fix sizes of scrolled windows inside dialog boxes (regression).
  Fix timeline start position for gtkgrid widget in multitrack.
  Fix "fade background mode" (b) so it looks nice again.
  Stability fix for expose event during startup.
  Stability fix for mkv_decoder with broken end frames.
  Implement C++ language bindings (liblives).
  Fixes for several smaller issues (Thomas Berger).
  Code cleanup / reformat.
  Updated translations to UK English, French, Galician, German, Russian and
  Simplified Chinese.

Added:
  head/multimedia/lives/files/patch-libweed_weed-effects.h   (contents, props changed)
  head/multimedia/lives/files/patch-src_widget-helper.h   (contents, props changed)
Deleted:
  head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c
  head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c
  head/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c
  head/multimedia/lives/files/patch-src__htmsocket.c
  head/multimedia/lives/files/patch-src__main.h
  head/multimedia/lives/files/patch-src__plugins.h
Modified:
  head/multimedia/lives/Makefile
  head/multimedia/lives/distinfo
  head/multimedia/lives/pkg-plist

Modified: head/multimedia/lives/Makefile
==============================================================================
--- head/multimedia/lives/Makefile	Thu May 28 20:50:12 2015	(r387775)
+++ head/multimedia/lives/Makefile	Thu May 28 21:02:41 2015	(r387776)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lives
-PORTVERSION=	2.2.7
+PORTVERSION=	2.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ 
 
@@ -87,10 +87,6 @@ post-patch:
 	@${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|off64_t|off_t|g ; s|lseek64|lseek|g' \
-		${WRKSRC}/src/audio.c \
-		${WRKSRC}/lives-plugins/plugins/decoders/dv_decoder.c \
-		${WRKSRC}/lives-plugins/plugins/decoders/ogg_decoder.h
 	@${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' \

Modified: head/multimedia/lives/distinfo
==============================================================================
--- head/multimedia/lives/distinfo	Thu May 28 20:50:12 2015	(r387775)
+++ head/multimedia/lives/distinfo	Thu May 28 21:02:41 2015	(r387776)
@@ -1,2 +1,2 @@
-SHA256 (lives-2.2.7.tar.bz2) = 6d02c0f4b9a353488156b9f7c07f1a7d88fda496059e1391e4e5bd4eb1dc9470
-SIZE (lives-2.2.7.tar.bz2) = 3609897
+SHA256 (lives-2.4.0.tar.bz2) = c7f48599169c330577e4fea7934796f2feac22bb2fff90b864d3088a4f6fe44d
+SIZE (lives-2.4.0.tar.bz2) = 3751082

Added: head/multimedia/lives/files/patch-libweed_weed-effects.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/lives/files/patch-libweed_weed-effects.h	Thu May 28 21:02:41 2015	(r387776)
@@ -0,0 +1,12 @@
+--- 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);

Added: head/multimedia/lives/files/patch-src_widget-helper.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/lives/files/patch-src_widget-helper.h	Thu May 28 21:02:41 2015	(r387776)
@@ -0,0 +1,13 @@
+--- 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

Modified: head/multimedia/lives/pkg-plist
==============================================================================
--- head/multimedia/lives/pkg-plist	Thu May 28 20:50:12 2015	(r387775)
+++ head/multimedia/lives/pkg-plist	Thu May 28 21:02:41 2015	(r387776)
@@ -31,15 +31,29 @@ 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.6
+lib/libweed-utils.so.0.0.8
+lib/libweed-utils_scripting.so
+lib/libweed-utils_scripting.so.0
+lib/libweed-utils_scripting.so.0.0.8
 lib/libweed.so
 lib/libweed.so.0
-lib/libweed.so.0.0.6
+lib/libweed.so.0.0.8
 lib/libweed_slice.so
 lib/libweed_slice.so.0
-lib/libweed_slice.so.0.0.6
+lib/libweed_slice.so.0.0.8
+lib/libweed_slice_scripting.so
+lib/libweed_slice_scripting.so.0
+lib/libweed_slice_scripting.so.0.0.8
 lib/lives/plugins/decoders/asf_decoder.so
 lib/lives/plugins/decoders/dv_decoder.so
 lib/lives/plugins/decoders/flv_decoder.so