- 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.

11 files changed, 45 insertions, 75 deletions

diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 49df70878369..5d5c10e93c47 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -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' \
diff --git a/multimedia/lives/distinfo b/multimedia/lives/distinfo
index 3f3615c540ad..4008f2328aad 100644
--- a/multimedia/lives/distinfo
+++ b/multimedia/lives/distinfo
@@ -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
diff --git a/multimedia/lives/files/patch-libweed_weed-effects.h b/multimedia/lives/files/patch-libweed_weed-effects.h
new file mode 100644
index 000000000000..e965e5d830af
--- /dev/null
+++ b/multimedia/lives/files/patch-libweed_weed-effects.h
@@ -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);
diff --git a/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c b/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c
deleted file mode 100644
index 71a9cb5b4b14..000000000000
--- a/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lives-plugins/plugins/decoders/asf_decoder.c.orig	2013-12-05 19:16:35.348036750 +0100
-+++ ./lives-plugins/plugins/decoders/asf_decoder.c	2013-12-05 19:18:43.232061256 +0100
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #ifndef IS_MINGW
--#ifndef IS_SOLARIS
-+#ifndef __FreeBSD__
- #include <endian.h>
- #endif
- #endif
diff --git a/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c b/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c
deleted file mode 100644
index 5d6722c54bd4..000000000000
--- a/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lives-plugins/plugins/decoders/mpegts_decoder.c.orig	2013-12-05 19:19:20.795023448 +0100
-+++ ./lives-plugins/plugins/decoders/mpegts_decoder.c	2013-12-05 19:19:44.882059440 +0100
-@@ -30,7 +30,7 @@
- #include <ctype.h>
- #include <sys/stat.h>
- 
--#ifndef IS_MINGW
-+#ifndef __FreeBSD__
- #include <endian.h>
- #endif
- 
diff --git a/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c b/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c
deleted file mode 100644
index a41f320d9469..000000000000
--- a/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lives-plugins/plugins/playback/video/lives2lives_stream.c.orig	2013-03-16 13:14:33.000000000 +0100
-+++ ./lives-plugins/plugins/playback/video/lives2lives_stream.c	2013-12-05 19:12:38.654055182 +0100
-@@ -8,7 +8,7 @@
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/socket.h>
--
-+#include <netinet/in.h>
- //////////////////////////////////////
- 
- static int palette_list[3];
diff --git a/multimedia/lives/files/patch-src__htmsocket.c b/multimedia/lives/files/patch-src__htmsocket.c
deleted file mode 100644
index 754199b231c7..000000000000
--- a/multimedia/lives/files/patch-src__htmsocket.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/htmsocket.c.orig	2013-11-12 03:18:17.000000000 +0100
-+++ ./src/htmsocket.c	2013-12-05 19:12:38.657055983 +0100
-@@ -8,7 +8,7 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <errno.h>
--
-+#include <netinet/in.h>
- #ifndef IS_MINGW
- #include <netdb.h>
- #include <sys/socket.h>
diff --git a/multimedia/lives/files/patch-src__main.h b/multimedia/lives/files/patch-src__main.h
deleted file mode 100644
index 032c1d77d840..000000000000
--- a/multimedia/lives/files/patch-src__main.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/main.h.orig	2013-11-22 14:59:46.000000000 +0100
-+++ ./src/main.h	2013-12-05 19:12:38.661054117 +0100
-@@ -144,6 +144,7 @@
- 
- 
- #include <stdlib.h>
-+#include <sys/stat.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/multimedia/lives/files/patch-src__plugins.h b/multimedia/lives/files/patch-src__plugins.h
deleted file mode 100644
index abdc384d494f..000000000000
--- a/multimedia/lives/files/patch-src__plugins.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/plugins.h.orig	2013-11-21 14:23:34.000000000 +0100
-+++ ./src/plugins.h	2013-12-05 19:12:38.664047584 +0100
-@@ -12,7 +12,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <stdlib.h>
--
-+#include "../libweed/weed-effects.h"
- 
- // generic plugins
- 
diff --git a/multimedia/lives/files/patch-src_widget-helper.h b/multimedia/lives/files/patch-src_widget-helper.h
new file mode 100644
index 000000000000..00df0f488984
--- /dev/null
+++ b/multimedia/lives/files/patch-src_widget-helper.h
@@ -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
diff --git a/multimedia/lives/pkg-plist b/multimedia/lives/pkg-plist
index d5c918a4fdf4..c2bab211992f 100644
--- a/multimedia/lives/pkg-plist
+++ b/multimedia/lives/pkg-plist
@@ -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