From 9766fed86641d8aaf5691070df5facc1c99f51b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 2 Dec 2016 19:13:00 +0100 Subject: [PATCH] libraw: add libgomp and libjpeg dependencies. * reorder sections. --- media-libs/libraw/libraw-0.17.2.recipe | 76 +++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/media-libs/libraw/libraw-0.17.2.recipe b/media-libs/libraw/libraw-0.17.2.recipe index c77abf146..41061f38d 100644 --- a/media-libs/libraw/libraw-0.17.2.recipe +++ b/media-libs/libraw/libraw-0.17.2.recipe @@ -17,7 +17,7 @@ LICENSE=" CDDL v1" SOURCE_URI="http://www.libraw.org/data/LibRaw-$portVersion.tar.gz" CHECKSUM_SHA256="92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c" -REVISION="2" +REVISION="3" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="LibRaw-$portVersion" @@ -31,9 +31,46 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libgomp$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix " +PROVIDES_devel=" + libraw${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libraw$secondaryArchSuffix = 15.0.0 compat >= 15 + devel:libraw_r$secondaryArchSuffix = 15.0.0 compat >= 15 + " +REQUIRES_devel=" + libraw$secondaryArchSuffix == $portVersion base + " + +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 + " +REQUIRES_tools=" + libraw$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libgomp$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:liblcms2$secondaryArchSuffix + " +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + REQUIRES_tools+=" + " +fi + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liblcms2$secondaryArchSuffix @@ -73,40 +110,3 @@ INSTALL() $binDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libraw${secondaryArchSuffix}_devel = $portVersion compat >= 0 - devel:libraw$secondaryArchSuffix = 15.0.0 compat >= 15 - devel:libraw_r$secondaryArchSuffix = 15.0.0 compat >= 15 - " -REQUIRES_devel=" - libraw$secondaryArchSuffix == $portVersion base - " - -# ----- tools package ------------------------------------------------------- - -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 - " -REQUIRES_tools=" - libraw$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix - lib:liblcms2$secondaryArchSuffix - " -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - REQUIRES_tools+=" - " -fi