From 08acbdbb4008a855426595c0b533122f2794fab9 Mon Sep 17 00:00:00 2001
From: miqlas <miqlas@users.noreply.github.com>
Date: Fri, 30 Jun 2017 08:03:41 +0200
Subject: [PATCH] exiv2: bump version (#1483)

---
 .../{exiv2-0.24.recipe => exiv2-0.25.recipe}  | 34 +++++++--
 media-gfx/exiv2/patches/exiv2-0.24.patch      | 12 ----
 media-gfx/exiv2/patches/exiv2-0.25.patchset   | 70 +++++++++++++++++++
 3 files changed, 97 insertions(+), 19 deletions(-)
 rename media-gfx/exiv2/{exiv2-0.24.recipe => exiv2-0.25.recipe} (65%)
 delete mode 100644 media-gfx/exiv2/patches/exiv2-0.24.patch
 create mode 100644 media-gfx/exiv2/patches/exiv2-0.25.patchset

diff --git a/media-gfx/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.25.recipe
similarity index 65%
rename from media-gfx/exiv2/exiv2-0.24.recipe
rename to media-gfx/exiv2/exiv2-0.25.recipe
index c49c2d4f7..fedd7106e 100644
--- a/media-gfx/exiv2/exiv2-0.24.recipe
+++ b/media-gfx/exiv2/exiv2-0.25.recipe
@@ -7,11 +7,11 @@ COPYRIGHT="2004-2013 Andreas Huggel
 	2009 Brad Schick"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="http://www.exiv2.org/exiv2-0.24.tar.gz"
-CHECKSUM_SHA256="f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e"
-PATCHES="exiv2-0.24.patch"
+SOURCE_URI="http://www.exiv2.org/exiv2-$portVersion.tar.gz"
+CHECKSUM_SHA256="c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4"
+PATCHES="exiv2-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -22,6 +22,8 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -35,25 +37,41 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libcurl$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
+	cmd:aclocal
 	cmd:autoconf
-	cmd:make
+	cmd:autoheader
+	cmd:automake
 	cmd:awk # required by configure
 	cmd:find # required by libtool
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:md5sum
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"
 
 BUILD()
 {
+	export CXXFLAGS="-D_BSD_SOURCE"
+	export LDFLAGS="-lbsd -lnetwork"
 	cd config
+	libtoolize -fci
 	autoconf
 	cp configure ..
 	cd ..
 
-	runConfigure ./configure
+	runConfigure ./configure \
+		--enable-video \
+		--with-curl
 	make $jobArgs
 }
 
@@ -61,6 +79,8 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/libexiv2.la
+
 	prepareInstalledDevelLibs libexiv2
 	fixPkgconfig
 
diff --git a/media-gfx/exiv2/patches/exiv2-0.24.patch b/media-gfx/exiv2/patches/exiv2-0.24.patch
deleted file mode 100644
index 3c2cafa2f..000000000
--- a/media-gfx/exiv2/patches/exiv2-0.24.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur exiv2-0.24-orig/config/configure.ac exiv2-0.24/config/configure.ac
---- exiv2-0.24-orig/config/configure.ac	2013-07-24 02:47:31.008126464 +0000
-+++ exiv2-0.24/config/configure.ac	2014-12-06 10:53:18.091488256 +0000
-@@ -212,6 +212,8 @@
- case "$host_os" in
- *mingw* | *cygwin*)
-     LDFLAGS="$LDFLAGS -no-undefined -lpsapi" ;;
-+*beos* | *haiku*)
-+	;;
- *)
-     LDFLAGS="$LDFLAGS -ldl" ;;
- esac
diff --git a/media-gfx/exiv2/patches/exiv2-0.25.patchset b/media-gfx/exiv2/patches/exiv2-0.25.patchset
new file mode 100644
index 000000000..9cb632133
--- /dev/null
+++ b/media-gfx/exiv2/patches/exiv2-0.25.patchset
@@ -0,0 +1,70 @@
+From 0b884735fbdd1048977eaf7a5169dbcb5c7046b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 28 Jun 2017 21:24:24 +0200
+Subject: Haiku supporting patch
+
+
+diff --git a/config/configure.ac b/config/configure.ac
+index 3f519bd..cc9e6f9 100644
+--- a/config/configure.ac
++++ b/config/configure.ac
+@@ -314,6 +314,8 @@ AC_SUBST(EXV_LIB_STATIC)
+ case "$host_os" in
+ *mingw* | *cygwin*)
+     LDFLAGS="$LDFLAGS -no-undefined -lpsapi -lwldap32 -lws2_32" ;;
++*haiku*)
++	;;
+ *)
+     LDFLAGS="$LDFLAGS -ldl" ;;
+ esac
+-- 
+2.12.2
+
+
+From 9611067a501cd25bc82b594bf416df6aee8b2cef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 28 Jun 2017 22:20:06 +0200
+Subject: Errno is in posix on Haiku
+
+
+diff --git a/src/http.cpp b/src/http.cpp
+index b8a429b..d4498db 100644
+--- a/src/http.cpp
++++ b/src/http.cpp
+@@ -70,7 +70,11 @@
+ 
+ #include <unistd.h>
+ #include <strings.h>
++#ifndef __HAIKU__
+ #include <sys/errno.h>
++#else
++#include <errno.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/uio.h>
+-- 
+2.12.2
+
+
+From 3496a821897079eae55ab013d677d3b9a0c533d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 28 Jun 2017 23:23:40 +0200
+Subject: configure.ac gettext patch
+
+
+diff --git a/config/configure.ac b/config/configure.ac
+index cc9e6f9..0b4b0f2 100644
+--- a/config/configure.ac
++++ b/config/configure.ac
+@@ -36,6 +36,7 @@ AC_CANONICAL_HOST
+ # i18n support
+ # ---------------------------------------------------------------------------
+ AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.19])
+ 
+ # ---------------------------------------------------------------------------
+ # Libtool support
+-- 
+2.12.2
+