diff --git a/media-libs/jasper/jasper-2.0.13.recipe b/media-libs/jasper/jasper-2.0.14.recipe similarity index 73% rename from media-libs/jasper/jasper-2.0.13.recipe rename to media-libs/jasper/jasper-2.0.14.recipe index 89f9d7e57..b806c11e6 100644 --- a/media-libs/jasper/jasper-2.0.13.recipe +++ b/media-libs/jasper/jasper-2.0.14.recipe @@ -1,20 +1,18 @@ SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard" -DESCRIPTION=" -The JasPer Project is an open-source initiative to provide a free \ -software-based reference implementation of the codec specified in the \ +DESCRIPTION="The JasPer Project is an open-source initiative to provide a \ +free software-based reference implementation of the codec specified in the \ JPEG-2000 Part-1 standard. More details about this software can be found in \ -the JasPer Software Reference Manual. -" +the JasPer Software Reference Manual." HOMEPAGE="http://www.ece.uvic.ca/~frodo/jasper/" COPYRIGHT="1999-2007 Michael D. Adams" LICENSE="JasPer v2" REVISION="1" SOURCE_URI="https://github.com/mdadams/jasper/archive/version-$portVersion.tar.gz" -CHECKSUM_SHA256="b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24" +CHECKSUM_SHA256="85266eea728f8b14365db9eaf1edc7be4c348704e562bb05095b9a077cf1a97b" SOURCE_DIR="jasper-version-$portVersion" -ARCHITECTURES="?x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" jasper$secondaryArchSuffix = $portVersion @@ -24,7 +22,7 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix " - + PROVIDES_devel=" jasper${secondaryArchSuffix}_devel = $portVersion devel:libjasper$secondaryArchSuffix = 4.0.0 compat >= 4 @@ -40,16 +38,21 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:imgcmp$secondaryArchSuffix = $portVersion cmd:imginfo$secondaryArchSuffix = $portVersion cmd:jasper$secondaryArchSuffix = $portVersion + cmd:jiv$secondaryArchSuffix = $portVersion " REQUIRES_tools=" jasper$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libglu$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix " fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libGL$secondaryArchSuffix + devel:libglu$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -65,10 +68,8 @@ BUILD() mkdir -p build-jasper && cd build-jasper cmake .. $cmakeDirArgs \ -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DJAS_ENABLE_OPENGL=OFF \ - -DOPENGL_INCLUDE_DIR=/system/develop/headers \ - -DGLUT_INCLUDE_DIR=/system/develop/headers + -DCMAKE_SKIP_RPATH=ON \ + -DJAS_ENABLE_OPENGL=ON make } @@ -76,13 +77,6 @@ INSTALL() { cd build-jasper make install - - mv $prefix/lib $prefix/lib2 - mkdir -p $(dirname $includeDir) $(dirname $libDir) $manDir - mv $prefix/include $includeDir - mv $prefix/lib2 $libDir - mv $prefix/share/man/man1 $manDir/ - rm -rf $prefix/share prepareInstalledDevelLibs libjasper fixPkgconfig