From fb6a2c8215dcb77f6659fef55fdefd5407fd9301 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 25 Feb 2022 10:52:18 +0100 Subject: [PATCH] libraw: bump version keep library 19 package for compatibility --- ...raw-0.19.5.recipe => libraw-0.20.2.recipe} | 10 +- media-libs/libraw/libraw19-0.19.5.recipe | 100 ++++++++++++++++++ .../libraw/patches/libraw-0.20.2.patchset | 24 +++++ 3 files changed, 130 insertions(+), 4 deletions(-) rename media-libs/libraw/{libraw-0.19.5.recipe => libraw-0.20.2.recipe} (94%) create mode 100644 media-libs/libraw/libraw19-0.19.5.recipe create mode 100644 media-libs/libraw/patches/libraw-0.20.2.patchset diff --git a/media-libs/libraw/libraw-0.19.5.recipe b/media-libs/libraw/libraw-0.20.2.recipe similarity index 94% rename from media-libs/libraw/libraw-0.19.5.recipe rename to media-libs/libraw/libraw-0.20.2.recipe index 8331b3032..ba75cb955 100644 --- a/media-libs/libraw/libraw-0.19.5.recipe +++ b/media-libs/libraw/libraw-0.20.2.recipe @@ -10,9 +10,9 @@ HOMEPAGE="https://www.libraw.org/" COPYRIGHT="2008-2018 LibRaw LLC" LICENSE="GNU LGPL v2.1 CDDL v1" -REVISION="3" +REVISION="1" SOURCE_URI="https://www.libraw.org/data/LibRaw-$portVersion.tar.gz" -CHECKSUM_SHA256="40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5" +CHECKSUM_SHA256="dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6" SOURCE_DIR="LibRaw-$portVersion" PATCHES="libraw-$portVersion.patchset" @@ -26,7 +26,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion="19.0.2" +libVersion="20.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" portVersionCompat="$portVersion compat >= 0" @@ -54,7 +54,7 @@ REQUIRES_devel=" SUMMARY_tools="The libraw tools" PROVIDES_tools=" - libraw_tools$secondaryArchSuffix = $portVersion + libraw${secondaryArchSuffix}_tools = $portVersion cmd:4channels$commandSuffix = $portVersionCompat cmd:dcraw_emu$commandSuffix = $portVersionCompat cmd:dcraw_half$commandSuffix = $portVersionCompat @@ -63,6 +63,7 @@ PROVIDES_tools=" cmd:multirender_test$commandSuffix = $portVersionCompat cmd:postprocessing_benchmark$commandSuffix = $portVersionCompat cmd:raw_identify$commandSuffix = $portVersionCompat + cmd:rawtextdump$commandSuffix = $portVersionCompat cmd:simple_dcraw$commandSuffix = $portVersionCompat cmd:unprocessed_raw$commandSuffix = $portVersionCompat " @@ -110,6 +111,7 @@ librawTools=" multirender_test postprocessing_benchmark raw-identify + rawtextdump simple_dcraw unprocessed_raw " diff --git a/media-libs/libraw/libraw19-0.19.5.recipe b/media-libs/libraw/libraw19-0.19.5.recipe new file mode 100644 index 000000000..4c7f2ca27 --- /dev/null +++ b/media-libs/libraw/libraw19-0.19.5.recipe @@ -0,0 +1,100 @@ +SUMMARY="Library for reading and processing of RAW digicam images" +DESCRIPTION="LibRaw is a library for reading RAW files from digital photo \ +cameras (CRW/CR2, NEF, RAF, DNG, MOS, KDC, DCR, etc, virtually all RAW \ +formats are supported). +It pays special attention to correct retrieval of data required for subsequent \ +RAW conversion. +The library is intended for embedding in RAW converters, data analyzers, and \ +other programs using RAW files as the initial data." +HOMEPAGE="https://www.libraw.org/" +COPYRIGHT="2008-2018 LibRaw LLC" +LICENSE="GNU LGPL v2.1 + CDDL v1" +REVISION="1" +SOURCE_URI="https://www.libraw.org/data/LibRaw-$portVersion.tar.gz" +CHECKSUM_SHA256="40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5" +SOURCE_DIR="LibRaw-$portVersion" +PATCHES="libraw-$portVersion.patchset" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +libVersion="19.0.2" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +portVersionCompat="$portVersion compat >= 0" + +PROVIDES=" + libraw19$secondaryArchSuffix = $portVersion compat >= 0 + lib:libraw$secondaryArchSuffix = $libVersionCompat + lib:libraw_r$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libgomp$secondaryArchSuffix + lib:libjasper$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:liblcms2$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libjasper$secondaryArchSuffix + devel:liblcms2$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:cmp + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + autoreconf -fi + runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" + make $jobArgs +} + +INSTALL() +{ + make install + + rm $libDir/lib*.la + + prepareInstalledDevelLibs libraw libraw_r + fixPkgconfig + + pushd "$developLibDir" + if [ -f libraw_r.a -a -f libraw.a ] && cmp libraw_r.a libraw.a; then + rm libraw_r.a + ln -s libraw.a libraw_r.a + fi + popd + + # devel package + rm -rf \ + $developDir + + # tools package + rm -rf \ + "$commandBinDir" + +} + +TEST() +{ + make check +} diff --git a/media-libs/libraw/patches/libraw-0.20.2.patchset b/media-libs/libraw/patches/libraw-0.20.2.patchset new file mode 100644 index 000000000..ecc15c244 --- /dev/null +++ b/media-libs/libraw/patches/libraw-0.20.2.patchset @@ -0,0 +1,24 @@ +From 316b22d6585ee642b3917558f03b3085f99ebf29 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 14 Mar 2015 13:21:53 +0000 +Subject: Haiku patch + + +diff --git a/Makefile.am b/Makefile.am +index 19166b7..33ba0ad 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -71,8 +71,8 @@ lib_libraw_a_SOURCES = src/libraw_c_api.cpp \ + src/x3f/x3f_utils_patched.cpp + + +-lib_libraw_r_a_CXXFLAGS = -pthread -w +-lib_libraw_r_a_CFLAGS = -pthread -w ++lib_libraw_r_a_CXXFLAGS = -w ++lib_libraw_r_a_CFLAGS = -w + lib_libraw_la_SOURCES = $(lib_libraw_a_SOURCES) + lib_libraw_r_la_SOURCES = $(lib_libraw_a_SOURCES) + +-- +2.30.2 +