diff --git a/media-gfx/exiv2/exiv2-0.28.5.recipe b/media-gfx/exiv2/exiv2-0.28.5.recipe index 936ab986b..ea137cf5d 100644 --- a/media-gfx/exiv2/exiv2-0.28.5.recipe +++ b/media-gfx/exiv2/exiv2-0.28.5.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2004-2025 Exiv2 authors 2004-2013 Andreas Huggel 2009 Brad Schick" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="e1671f744e379a87ba0c984617406fdf8c0ad0c594e5122f525b2fb7c28d394d" PATCHES="exiv2-$portVersion.patchset" @@ -47,6 +47,9 @@ PROVIDES_devel=" " REQUIRES_devel=" exiv2$secondaryArchSuffix == $portVersion base + devel:libbrotlidec$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libinih$secondaryArchSuffix " PROVIDES_tools=" diff --git a/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe b/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe index 1a445364f..fdcd407fd 100644 --- a/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe +++ b/media-gfx/exiv2/exiv2_0.27-0.27.7.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2004-2021 Exiv2 authors 2004-2013 Andreas Huggel 2009 Brad Schick" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="551b1266e3aabd321f6d555dccd776128ee449d5039feafee927a1f33f7a9753" SOURCE_DIR="exiv2-$portVersion" @@ -28,15 +28,6 @@ REQUIRES=" lib:libz$secondaryArchSuffix " -PROVIDES_devel=" - exiv2_0.27${secondaryArchSuffix}_devel = $portVersion - devel:libexiv2${secondaryArchSuffix} = $portVersion - devel:libexiv2_xmp${secondaryArchSuffix} = $portVersion - " -REQUIRES_devel=" - exiv2_0.27$secondaryArchSuffix == $portVersion base - " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix @@ -74,24 +65,8 @@ INSTALL() { make -C build install - rm -rf $documentationDir - prepareInstalledDevelLibs libexiv2 libexiv2-xmp fixPkgconfig - if [ -n "$secondaryArchSuffix" ]; then - sed -i 's,\/lib/x86/libexiv2-xmp.a,\/develop/lib/x86/libexiv2-xmp.a,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config-release.cmake - sed -i 's,\/include,\/develop/headers/x86,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config.cmake - else - sed -i 's,\/lib/libexiv2-xmp.a,\/develop/lib/libexiv2-xmp.a,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config-release.cmake - sed -i 's,\/include,\/develop/headers,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config.cmake - fi - - packageEntries devel \ - $developDir \ - $libDir/cmake + rm -rf $developDir $libDir/cmake }