libjpeg-turbo: drop conflicts for the base package. (#2347) See #2336

This commit is contained in:
fbrosson
2018-03-19 17:59:45 +00:00
committed by GitHub
parent bbcdfdf644
commit 9bf19a3956

View File

@@ -32,7 +32,7 @@ COPYRIGHT="1991-2018 Thomas G. Lane, Guido Vollbeding
LICENSE="BSD (3-clause)
IJG
Zlib"
REVISION="1"
REVISION="2"
SOURCE_URI="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$portVersion.tar.gz"
CHECKSUM_SHA256="b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"
SOURCE_DIR="libjpeg-turbo-$portVersion"
@@ -54,9 +54,6 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
"
CONFLICTS="
jpeg$secondaryArchSuffix
"
PROVIDES_devel="
jpeg_turbo${secondaryArchSuffix}_devel = $portVersion