diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe deleted file mode 100644 index 0e98efe07..000000000 --- a/media-libs/jpeg/jpeg-9.recipe +++ /dev/null @@ -1,101 +0,0 @@ -SUMMARY="An image compression library and tools for JPEGs" -DESCRIPTION="This package contains C software to implement JPEG image \ -encoding, decoding, and transcoding. JPEG is a standardized compression \ -method for full-color and gray-scale images. - -The distributed programs provide conversion between JPEG "JFIF" format and \ -image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \ -compression and decompression library can easily be reused in other programs, \ -such as image viewers. The package is highly portable C code; we have tested \ -it on many machines ranging from PCs to Crays." -HOMEPAGE="http://www.ijg.org" -COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding." -LICENSE="JPEG" -REVISION="4" -SOURCE_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz" -CHECKSUM_SHA256="c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535" -PATCHES="jpeg-9.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - jpeg$secondaryArchSuffix = $portVersion compat >= 9 - lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9 - devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 - " -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 - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:grep - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - runConfigure ./configure \ - --enable-shared - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libjpeg - - # 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 -} diff --git a/media-libs/jpeg/jpeg-9a.recipe b/media-libs/jpeg/jpeg-9c.recipe similarity index 84% rename from media-libs/jpeg/jpeg-9a.recipe rename to media-libs/jpeg/jpeg-9c.recipe index f64c80044..ad059c734 100644 --- a/media-libs/jpeg/jpeg-9a.recipe +++ b/media-libs/jpeg/jpeg-9c.recipe @@ -8,20 +8,23 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \ compression and decompression library can easily be reused in other programs, \ such as image viewers. The package is highly portable C code; it was tested \ on many machines ranging from PCs to Crays." -HOMEPAGE="http://www.ijg.org" -COPYRIGHT="1991-2014, Thomas G. Lane, Guido Vollbeding" +HOMEPAGE="http://www.ijg.org/" +COPYRIGHT="1991-2018 Thomas G. Lane, Guido Vollbeding" LICENSE="JPEG" -REVISION="4" +REVISION="1" SOURCE_URI="http://www.ijg.org/files/jpegsrc.v$portVersion.tar.gz" -CHECKSUM_SHA256="3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7" +CHECKSUM_SHA256="1f3a3f610f57e88ff3f1f9db530c605f3949ee6e78002552e324d493cf086ad4" PATCHES="jpeg-9.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +libVersion="9.3.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" jpeg$secondaryArchSuffix = $portVersion compat >= 9 - lib:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9 + lib:libjpeg$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -29,7 +32,7 @@ REQUIRES=" PROVIDES_devel=" jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9 - devel:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9 + devel:libjpeg$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" jpeg$secondaryArchSuffix == $portVersion base @@ -66,7 +69,7 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage jpeg$secondaryArchSuffix \ - $libDir/libjpeg.so.9.1.0 + $libDir/libjpeg.so.$libVersion BUILD() { @@ -80,6 +83,8 @@ INSTALL() { make install + rm $libDir/libjpeg.la + prepareInstalledDevelLibs libjpeg # devel package diff --git a/media-libs/jpeg/patches/jpeg-9.patchset b/media-libs/jpeg/patches/jpeg-9.patchset index 87b0aac39..310469119 100644 --- a/media-libs/jpeg/patches/jpeg-9.patchset +++ b/media-libs/jpeg/patches/jpeg-9.patchset @@ -5,10 +5,10 @@ Subject: jconfig.cfg: fix handling of "boolean" on Haiku diff --git a/jconfig.cfg b/jconfig.cfg -index bb7435c..69a1c31 100644 +index c4548fc..486baf8 100644 --- a/jconfig.cfg +++ b/jconfig.cfg -@@ -25,6 +25,13 @@ typedef unsigned char boolean; +@@ -31,6 +31,13 @@ typedef unsigned char boolean; #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #endif @@ -23,5 +23,5 @@ index bb7435c..69a1c31 100644 #undef RIGHT_SHIFT_IS_UNSIGNED -- -1.7.5 +2.16.1