exiv2: bump version

This commit is contained in:
Gerasim Troeglazov
2019-08-24 13:42:15 +10:00
parent c270524a7c
commit d574dec076
3 changed files with 37 additions and 69 deletions

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2004-2013 Andreas Huggel
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01"
CHECKSUM_SHA256="3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934"
PATCHES="exiv2-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -18,6 +18,7 @@ PROVIDES="
exiv2$secondaryArchSuffix = $portVersion
cmd:exiv2$secondaryArchSuffix = $portVersion
lib:libexiv2$secondaryArchSuffix = $portVersion
lib:libexiv2_xmp$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -31,6 +32,7 @@ REQUIRES="
PROVIDES_devel="
exiv2${secondaryArchSuffix}_devel = $portVersion
devel:libexiv2${secondaryArchSuffix} = $portVersion
devel:libexiv2_xmp${secondaryArchSuffix} = $portVersion
"
REQUIRES_devel="
exiv2$secondaryArchSuffix == $portVersion base
@@ -46,16 +48,10 @@ BUILD_REQUIRES="
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:automake
cmd:awk
cmd:find
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:gettext
cmd:grep
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:sed
@@ -66,27 +62,25 @@ BUILD()
export CXXFLAGS="-D_BSD_SOURCE"
export LDFLAGS="-lbsd -lnetwork"
cd config
libtoolize -fci
autoconf
cp configure ..
cd ..
runConfigure ./configure \
--enable-video \
--with-curl
mkdir -p build
cd build
cmake .. $cmakeDirArgs \
-DEXIV2_ENABLE_CURL=ON \
-DEXIV2_ENABLE_VIDEO=ON \
-DEXIV2_BUILD_SAMPLES=OFF
make $jobArgs
}
INSTALL()
{
cd build
make install
rm $libDir/libexiv2.la
prepareInstalledDevelLibs libexiv2
prepareInstalledDevelLibs libexiv2 libexiv2-xmp
fixPkgconfig
packageEntries devel \
$developDir
$developDir \
$libDir/cmake
}

View File

@@ -1,48 +0,0 @@
From 01305b9ac11ce498968fafe8faa6677cdfe26ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 22 Oct 2017 13:55:25 +0200
Subject: Pthread support
diff --git a/src/actions.cpp b/src/actions.cpp
index 0ebe850..73954c0 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2048,6 +2048,8 @@ namespace {
#if defined(__APPLE__)
/* This is the critical section object (statically allocated). */
static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
+ #elif defined(__HAIKU__)
+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
#else
static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
#endif
--
2.14.2
From 71625486c455fe2516720c38ddb3e6133d73d562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 22 Oct 2017 13:55:42 +0200
Subject: Errno Haiku support
diff --git a/src/http.cpp b/src/http.cpp
index 86b7ebb..5d7e274 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -76,7 +76,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.14.2

View File

@@ -0,0 +1,22 @@
From 01305b9ac11ce498968fafe8faa6677cdfe26ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 22 Oct 2017 13:55:25 +0200
Subject: Pthread support
diff --git a/src/actions.cpp b/src/actions.cpp
index 34a7a80..b859624 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2018,7 +2018,7 @@ namespace {
/* Unix/Linux/Cygwin/MacOSX */
#include <pthread.h>
/* This is the critical section object (statically allocated). */
- #if defined(__APPLE__)
+ #if defined(__APPLE__) || defined(__HAIKU__)
#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
#else
--
2.23.0