LibRaw: bump to 0.18.9, add jasper, add debuginfo with a trick. (#2488)

media-libs/libraw/libraw-0.18.9.recipe

@@ -7,35 +7,46 @@ 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-2017 LibRaw LLC"
-LICENSE="
-	GNU LGPL v2.1
+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="e5b8acca558aa457bc9214802004320c5610d1434c2adb1f3ea367f026afa53b"
+CHECKSUM_SHA256="d2ef177032e6d804fc512b206d02c393fca26be43ecd136cc26926407273b24e"
 SOURCE_DIR="LibRaw-$portVersion"
 PATCHES="libraw-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="16.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 0"
+
 PROVIDES="
 	libraw$secondaryArchSuffix = $portVersion compat >= 0
-	lib:libraw$secondaryArchSuffix = 16.0.0 compat >= 16
-	lib:libraw_r$secondaryArchSuffix = 16.0.0 compat >= 16
+	lib:libraw$secondaryArchSuffix = $libVersionCompat
+	lib:libraw_r$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
+	lib:libjasper$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:liblcms2$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libraw${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libraw$secondaryArchSuffix = 16.0.0 compat >= 16
-	devel:libraw_r$secondaryArchSuffix = 16.0.0 compat >= 16
+	devel:libraw$secondaryArchSuffix = $libVersionCompat
+	devel:libraw_r$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libraw$secondaryArchSuffix == $portVersion base
@@ -44,21 +55,22 @@ REQUIRES_devel="
 SUMMARY_tools="The libraw tools"
 PROVIDES_tools="
 	libraw_tools$secondaryArchSuffix = $portVersion
-	cmd:4channels$secondaryArchSuffix
-	cmd:dcraw_emu$secondaryArchSuffix
-	cmd:dcraw_half$secondaryArchSuffix
-	cmd:half_mt$secondaryArchSuffix
-	cmd:mem_image$secondaryArchSuffix
-	cmd:multirender_test$secondaryArchSuffix
-	cmd:postprocessing_benchmark$secondaryArchSuffix
-	cmd:raw_identify$secondaryArchSuffix
-	cmd:simple_dcraw$secondaryArchSuffix
-	cmd:unprocessed_raw$secondaryArchSuffix
+	cmd:4channels$commandSuffix = $portVersionCompat
+	cmd:dcraw_emu$commandSuffix = $portVersionCompat
+	cmd:dcraw_half$commandSuffix = $portVersionCompat
+	cmd:half_mt$commandSuffix = $portVersionCompat
+	cmd:mem_image$commandSuffix = $portVersionCompat
+	cmd:multirender_test$commandSuffix = $portVersionCompat
+	cmd:postprocessing_benchmark$commandSuffix = $portVersionCompat
+	cmd:raw_identify$commandSuffix = $portVersionCompat
+	cmd:simple_dcraw$commandSuffix = $portVersionCompat
+	cmd:unprocessed_raw$commandSuffix = $portVersionCompat
 	"
 REQUIRES_tools="
 	libraw$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
+	lib:libjasper$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:liblcms2$secondaryArchSuffix
 	"
@@ -69,24 +81,47 @@ fi
 
 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
-	cmd:find
 	"
 
+debugList=(
+	"$libDir"/libraw.so.$libVersion
+	"$libDir"/libraw_r.so.$libVersion
+	)
+librawTools="
+	4channels
+	dcraw_emu
+	dcraw_half
+	half_mt
+	mem_image
+	multirender_test
+	postprocessing_benchmark
+	raw-identify
+	simple_dcraw
+	unprocessed_raw
+	"
+for i in $librawTools; do
+	debugList+=("${commandBinDir/libraw$secondaryArchSuffix/libraw${secondaryArchSuffix}_tools}"/$i)
+done
+defineDebugInfoPackage libraw$secondaryArchSuffix "${debugList[@]}"
+
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs
 }
 
@@ -99,12 +134,24 @@ INSTALL()
 	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
 	packageEntries devel \
 		$developDir
 
 		# tools package
 	packageEntries tools \
-		$binDir
+		"$commandBinDir"
 
 }
+
+TEST()
+{
+	make check
+}

media-libs/libraw/patches/libraw-0.18.9.patchset

@@ -5,12 +5,12 @@ Subject: Haiku patch
 
 
 diff --git a/Makefile.am b/Makefile.am
-index 369148d..bd3ecad 100644
+index 35378a9..467fb7a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -36,8 +36,8 @@ lib_libraw_a_SOURCES = internal/dcraw_common.cpp \
+@@ -35,8 +35,8 @@ lib_libraw_a_SOURCES = internal/dcraw_common.cpp \
  				 src/libraw_datastream.cpp \
- 				 src/libraw_c_api.cpp
+ 				 src/libraw_c_api.cpp 
  
 -lib_libraw_r_a_CXXFLAGS = -pthread -w
 -lib_libraw_r_a_CFLAGS = -pthread -w