From b64d0780ce02cc622dfec1f28eb4e86df6a7409d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 8 Dec 2025 17:40:45 +0100 Subject: [PATCH] exiv2, bump to 0.28.7 (#13345) drop old version --- ...xiv2-0.28.5.recipe => exiv2-0.28.7.recipe} | 15 ++-- media-gfx/exiv2/exiv2_0.27-0.27.7.recipe | 72 ------------------- media-gfx/exiv2/patches/exiv2-0.27.7.patchset | 70 ------------------ ...-0.28.5.patchset => exiv2-0.28.7.patchset} | 0 4 files changed, 11 insertions(+), 146 deletions(-) rename media-gfx/exiv2/{exiv2-0.28.5.recipe => exiv2-0.28.7.recipe} (87%) delete mode 100644 media-gfx/exiv2/exiv2_0.27-0.27.7.recipe delete mode 100644 media-gfx/exiv2/patches/exiv2-0.27.7.patchset rename media-gfx/exiv2/patches/{exiv2-0.28.5.patchset => exiv2-0.28.7.patchset} (100%) diff --git a/media-gfx/exiv2/exiv2-0.28.5.recipe b/media-gfx/exiv2/exiv2-0.28.7.recipe similarity index 87% rename from media-gfx/exiv2/exiv2-0.28.5.recipe rename to media-gfx/exiv2/exiv2-0.28.7.recipe index c5cf2d55f..0a32d05d8 100644 --- a/media-gfx/exiv2/exiv2-0.28.5.recipe +++ b/media-gfx/exiv2/exiv2-0.28.7.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2004-2025 Exiv2 authors LICENSE="GNU GPL v2" REVISION="2" SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="e1671f744e379a87ba0c984617406fdf8c0ad0c594e5122f525b2fb7c28d394d" +CHECKSUM_SHA256="5e292b02614dbc0cee40fe1116db2f42f63ef6b2ba430c77b614e17b8d61a638" PATCHES="exiv2-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -92,12 +92,15 @@ BUILD_PREREQUIRES=" cmd:sed " +defineDebugInfoPackage exiv2$secondaryArchSuffix \ + $libDir/libexiv2.so.$libVersion + BUILD() { export CXXFLAGS="-D_BSD_SOURCE" export LDFLAGS="-lbsd -lnetwork" - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DCMAKE_INSTALL_DOCDIR=$documentationDir/packages/exiv2 \ @@ -116,7 +119,8 @@ INSTALL() { make -C build install - prepareInstalledDevelLib libexiv2 + prepareInstalledDevelLib \ + libexiv2 fixPkgconfig packageEntries devel \ @@ -133,6 +137,9 @@ INSTALL() TEST() { - # 60% tests passed, 2 tests failed out of 5 + # 0% tests passed, 5 tests failed out of 5 + # checked with 0.28.5, results are the same + # not sure why both versions fail now + # running the cmd in Terminal works fine: "exiv2 --verbose --version" ctest --test-dir build --output-on-failure } diff --git a/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe b/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe deleted file mode 100644 index fdcd407fd..000000000 --- a/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe +++ /dev/null @@ -1,72 +0,0 @@ -SUMMARY="A C++ library and command line utility to manage image metadata" -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-2021 Exiv2 authors - 2004-2013 Andreas Huggel - 2009 Brad Schick" -LICENSE="GNU GPL v2" -REVISION="4" -SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="551b1266e3aabd321f6d555dccd776128ee449d5039feafee927a1f33f7a9753" -SOURCE_DIR="exiv2-$portVersion" -PATCHES="exiv2-$portVersion.patchset" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - exiv2_0.27$secondaryArchSuffix = $portVersion - lib:libexiv2$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libexpat$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libcurl$secondaryArchSuffix - devel:libexpat$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:grep - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sed - " - -BUILD() -{ - export CXXFLAGS="-D_BSD_SOURCE" - export LDFLAGS="-lbsd -lnetwork" - - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ - $cmakeDirArgs \ - -DEXIV2_ENABLE_CURL=ON \ - -DEXIV2_ENABLE_VIDEO=ON \ - -DEXIV2_BUILD_EXIV2_COMMAND=OFF \ - -DEXIV2_BUILD_SAMPLES=OFF \ - -DEXIV2_BUILD_DOC=OFF - - make -C build $jobArgs -} - -INSTALL() -{ - make -C build install - - prepareInstalledDevelLibs libexiv2 libexiv2-xmp - fixPkgconfig - - rm -rf $developDir $libDir/cmake -} diff --git a/media-gfx/exiv2/patches/exiv2-0.27.7.patchset b/media-gfx/exiv2/patches/exiv2-0.27.7.patchset deleted file mode 100644 index 41966434d..000000000 --- a/media-gfx/exiv2/patches/exiv2-0.27.7.patchset +++ /dev/null @@ -1,70 +0,0 @@ -From 1fd8f700d87e565752da5bb3fe1b53b87f443a6e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -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 - /* 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 -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 -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 - diff --git a/media-gfx/exiv2/patches/exiv2-0.28.5.patchset b/media-gfx/exiv2/patches/exiv2-0.28.7.patchset similarity index 100% rename from media-gfx/exiv2/patches/exiv2-0.28.5.patchset rename to media-gfx/exiv2/patches/exiv2-0.28.7.patchset