haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

exiv2: bump version

Browse Source
This commit is contained in:
Jerome Duval
2021-01-07 21:03:35 +01:00
parent 1d4fdd5276
commit 1fd3a77c3b
3 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-gfx/exiv2/exiv2-0.27.2.recipe → media-gfx/exiv2/exiv2-0.27.3.recipe
View File

@@ -6,9 +6,9 @@ HOMEPAGE="https://www.exiv2.org/"
COPYRIGHT="2004-2013 Andreas Huggel
2009 Brad Schick"
LICENSE="GNU GPL v2"
REVISION="4"
REVISION="1"
SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934"
CHECKSUM_SHA256="6398bc743c32b85b2cb2a604273b8c90aa4eb0fd7c1700bf66cbb2712b4f00c1"
PATCHES="exiv2-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"

22
media-gfx/exiv2/patches/exiv2-0.27.2.patchset
View File

@@ -1,22 +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 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

45
media-gfx/exiv2/patches/exiv2-0.27.3.patchset Normal file
View File

@@ -0,0 +1,45 @@
From c3a1be2e5e38ca00d61a19d8728d11774abe909b 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 a941d67..57b7792 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1991,7 +1991,7 @@ namespace {
/* Unix/Linux/Cygwin/macOS */
#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.30.0
From 7a02ca819f49d79b26cc88088c193145dbc21466 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 7 Jan 2021 21:03:05 +0100
Subject: Haiku: disable stack protector
diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
index 0418aa6..9f42ce9 100644
--- a/cmake/compilerFlags.cmake
+++ b/cmake/compilerFlags.cmake
@@ -24,7 +24,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
if (COMPILER_IS_GCC OR COMPILER_IS_CLANG)
# This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
- if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
+ if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS OR HAIKU) )
if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
add_compile_options(-fstack-clash-protection -fcf-protection)
endif()
--
2.30.0