- Update to version 2.4.1

- Remove upstreamed patches

Changelog:

General compilation fixes.
Compilation fixes for libav.
Minor fixes for BSD compilation.
Minor fix for initialisation of "alien_overlay" effect.
Fix image file previews within File Open dialog (regression).

5 files changed, 3 insertions, 43 deletions

diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index aa50ca94e811..629a5e24533b 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lives
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ 
 
@@ -89,10 +89,6 @@ post-patch:
 		${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
diff --git a/multimedia/lives/distinfo b/multimedia/lives/distinfo
index 4008f2328aad..7c3d8b8d8b73 100644
--- a/multimedia/lives/distinfo
+++ b/multimedia/lives/distinfo
@@ -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
diff --git a/multimedia/lives/files/patch-libweed_weed-effects.h b/multimedia/lives/files/patch-libweed_weed-effects.h
deleted file mode 100644
index e965e5d830af..000000000000
--- a/multimedia/lives/files/patch-libweed_weed-effects.h
+++ /dev/null
@@ -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);
diff --git a/multimedia/lives/files/patch-src_widget-helper.c b/multimedia/lives/files/patch-src_widget-helper.c
deleted file mode 100644
index 5ef8ca8419a8..000000000000
--- a/multimedia/lives/files/patch-src_widget-helper.c
+++ /dev/null
@@ -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
diff --git a/multimedia/lives/files/patch-src_widget-helper.h b/multimedia/lives/files/patch-src_widget-helper.h
deleted file mode 100644
index 00df0f488984..000000000000
--- a/multimedia/lives/files/patch-src_widget-helper.h
+++ /dev/null
@@ -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