haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

openjpeg: fix requires

Browse Source 
* missing $secondaryArchSuffix
* libtiff is now a regular package.

Thanks to Korli for noticing.
This commit is contained in:
Adrien Destugues
2014-10-09 07:57:34 +02:00
parent b0fffae274
commit 032165ba59
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media-libs/openjpeg/openjpeg-1.5.0.recipe
View File

@@ -54,17 +54,14 @@ REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
"
# haiku_x86 doesn't claim to provide lib:libtiff_x86 on gcc2 builds
if [ "$targetArchitecture" != x86_gcc2 ];then
REQUIRES="$REQUIRES lib:libtiff$secondaryArchSuffix"
fi
lib:libtiff$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libz
devel:libpng
"
#needs devel:libtiff too but that isn't provided by anything
devel:libz$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion

12
media-libs/openjpeg/openjpeg-2.1.0.recipe
View File

@@ -42,15 +42,13 @@ REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
"
# haiku_x86 doesn't claim to provide lib:libtiff_x86 on gcc2 builds
if [ "$targetArchitecture" != x86_gcc2 ];then
REQUIRES="$REQUIRES lib:libtiff$secondaryArchSuffix"
fi
lib:libtiff$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libz
devel:libpng
devel:libz$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
"
#needs devel:libtiff too but that isn't provided by anything