mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
exiv2, bump version (#9541)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -3,12 +3,13 @@ DESCRIPTION="Exiv2 provides fast and easy read and write access to the Exif, \
|
||||
IPTC and XMP metadata of images in various formats. Exiv2 is available as \
|
||||
free software and with a commercial license, and is used in many projects."
|
||||
HOMEPAGE="https://www.exiv2.org/"
|
||||
COPYRIGHT="2004-2013 Andreas Huggel
|
||||
COPYRIGHT="2004-2021 Exiv2 authors
|
||||
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="6398bc743c32b85b2cb2a604273b8c90aa4eb0fd7c1700bf66cbb2712b4f00c1"
|
||||
CHECKSUM_SHA256="551b1266e3aabd321f6d555dccd776128ee449d5039feafee927a1f33f7a9753"
|
||||
PATCHES="exiv2-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -16,15 +17,12 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
exiv2$secondaryArchSuffix = $portVersion
|
||||
cmd:exiv2$secondaryArchSuffix = $portVersion
|
||||
lib:libexiv2$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libgettextpo$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
@@ -38,18 +36,33 @@ REQUIRES_devel="
|
||||
exiv2$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
PROVIDES_tools="
|
||||
exiv2${secondaryArchSuffix}_tools = $portVersion
|
||||
cmd:exiv2$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_tools="
|
||||
$REQUIRES
|
||||
exiv2$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
ARCHITECTURES_doc="any"
|
||||
|
||||
PROVIDES_doc="
|
||||
exiv2${secondaryArchSuffix}_doc = $portVersion
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libgettextlib$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:dot
|
||||
cmd:doxygen
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:gettext
|
||||
cmd:grep
|
||||
@@ -67,9 +80,11 @@ BUILD()
|
||||
$cmakeDirArgs \
|
||||
-DEXIV2_ENABLE_CURL=ON \
|
||||
-DEXIV2_ENABLE_VIDEO=ON \
|
||||
-DEXIV2_BUILD_SAMPLES=OFF
|
||||
-DEXIV2_BUILD_SAMPLES=OFF \
|
||||
-DEXIV2_BUILD_DOC=ON
|
||||
|
||||
make -C build $jobArgs
|
||||
make -C build doc
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
@@ -94,4 +109,11 @@ INSTALL()
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$libDir/cmake
|
||||
|
||||
packageEntries tools \
|
||||
$binDir \
|
||||
$manDir
|
||||
|
||||
packageEntries doc \
|
||||
$documentationDir
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
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
|
||||
|
||||
70
media-gfx/exiv2/patches/exiv2-0.27.7.patchset
Normal file
70
media-gfx/exiv2/patches/exiv2-0.27.7.patchset
Normal file
@@ -0,0 +1,70 @@
|
||||
From 1fd8f700d87e565752da5bb3fe1b53b87f443a6e 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 f234484..51757c1 100644
|
||||
--- a/src/actions.cpp
|
||||
+++ b/src/actions.cpp
|
||||
@@ -1916,7 +1916,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.37.3
|
||||
|
||||
|
||||
From 714714958225b3c48ffbc9be4ada406ea3d3b991 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 68fd8f0..78ca0ca 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
|
||||
- if (NOT (MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS))
|
||||
+ if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS OR HAIKU) )
|
||||
if (NOT APPLE) # Don't know why this isn't working correctly on Apple with M1 processor
|
||||
check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION)
|
||||
endif()
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 4724d2b60b9df075f325af31c42c95d89a961a0a Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Fri, 29 Sep 2023 17:26:46 +0200
|
||||
Subject: Disable -Wno-deprecated-declarations
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0bc87f0..7809009 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -56,6 +56,10 @@ set( PACKAGE_BUGREPORT "http://github.com/exiv2/exiv2" )
|
||||
set( PACKAGE_URL "https://exiv2.org")
|
||||
set( PROJECT_DESCRIPTION "Exif/IPTC/Xmp C++ metadata library and tools plus ICC Profiles, Previews and more.")
|
||||
|
||||
+if (HAIKU)
|
||||
+ add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now
|
||||
+endif()
|
||||
+
|
||||
if ( EXIV2_ENABLE_EXTERNAL_XMP )
|
||||
set(EXIV2_ENABLE_XMP OFF)
|
||||
endif()
|
||||
--
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user