diff --git a/media-libs/jpeg/jpeg-9c.recipe b/media-libs/jpeg/jpeg-9c.recipe index 8bf3c02ef..82f1e90fd 100644 --- a/media-libs/jpeg/jpeg-9c.recipe +++ b/media-libs/jpeg/jpeg-9c.recipe @@ -11,13 +11,12 @@ on many machines ranging from PCs to Crays." HOMEPAGE="http://www.ijg.org/" COPYRIGHT="1991-2018 Thomas G. Lane, Guido Vollbeding" LICENSE="JPEG" -REVISION="3" +REVISION="4" SOURCE_URI="http://www.ijg.org/files/jpegsrc.v$portVersion.tar.gz" CHECKSUM_SHA256="650250979303a649e21f87b5ccd02672af1ea6954b911342ea491f351ceb7122" -# deactivated in favor of libjpeg-turbo -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64 ?arm" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="?x86_gcc2 x86_64 ?arm" +SECONDARY_ARCHITECTURES="?x86_gcc2 x86" libVersion="9.3.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" @@ -30,30 +29,6 @@ REQUIRES=" haiku$secondaryArchSuffix " -PROVIDES_devel=" - jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9 - devel:libjpeg$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - jpeg$secondaryArchSuffix == $portVersion base - " - -if [ -z "$secondaryArchSuffix" ]; then - SUMMARY_tools="The JPEG tools" - PROVIDES_tools=" - jpeg_tools = $portVersion compat >= 9 - cmd:cjpeg = $portVersion compat >= 9 - cmd:djpeg = $portVersion compat >= 9 - cmd:jpegtran = $portVersion compat >= 9 - cmd:rdjpgcom = $portVersion compat >= 9 - cmd:wrjpgcom = $portVersion compat >= 9 - " - REQUIRES_tools=" - haiku - jpeg == $portVersion base - " -fi - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -68,9 +43,6 @@ BUILD_PREREQUIRES=" cmd:make " -defineDebugInfoPackage jpeg$secondaryArchSuffix \ - $libDir/libjpeg.so.$libVersion - BUILD() { AUTOHEADER=true autoreconf -fi @@ -81,28 +53,8 @@ BUILD() INSTALL() { - make install + make install-strip - rm $libDir/libjpeg.la - - prepareInstalledDevelLibs libjpeg - - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir - - # tools package - if [ -z "$secondaryArchSuffix" ]; then - packageEntries tools \ - $binDir \ - $documentationDir - fi - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi + rm $libDir/libjpeg.{a,la,so} + rm -rf $binDir $documentationDir $includeDir $libDir/pkgconfig }