haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 22:48:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibJPEG-Turbo: bump, switch to cmake, enable x86_64 and x86 (#3747)

Browse Source
This commit is contained in:
miqlas
2019-05-14 19:51:44 +02:00
committed by waddlesplash
parent eba5273362
commit 9c7855826b
2 changed files with 13 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
media-libs/libjpeg-turbo/libjpeg_turbo-1.5.3.recipe → media-libs/libjpeg-turbo/libjpeg_turbo-2.0.2.recipe
View File

@@ -19,7 +19,7 @@ early 2010, libjpeg-turbo spun off into an independent project, with the goal \
of making high-speed JPEG compression/decompression technology available to \ of making high-speed JPEG compression/decompression technology available to \
a broader range of users and developers." a broader range of users and developers."
HOMEPAGE="https://www.libjpeg-turbo.org/" HOMEPAGE="https://www.libjpeg-turbo.org/"
COPYRIGHT="1991-2018 Thomas G. Lane, Guido Vollbeding COPYRIGHT="1991-2019 Thomas G. Lane, Guido Vollbeding
1997-2010 Guido Vollbeding 1997-2010 Guido Vollbeding
2000-2017 D. R. Commander 2000-2017 D. R. Commander
2009 Bill Allombert 2009 Bill Allombert
@@ -32,18 +32,17 @@ COPYRIGHT="1991-2018 Thomas G. Lane, Guido Vollbeding
LICENSE="BSD (3-clause) LICENSE="BSD (3-clause)
IJG IJG
Zlib" Zlib"
REVISION="3" REVISION="1"
SOURCE_URI="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$portVersion.tar.gz" SOURCE_URI="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$portVersion.tar.gz"
CHECKSUM_SHA256="b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523" CHECKSUM_SHA256="acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed"
SOURCE_DIR="libjpeg-turbo-$portVersion" SOURCE_DIR="libjpeg-turbo-$portVersion"
PATCHES="libjpeg_turbo-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64 ?arm" ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
SECONDARY_ARCHITECTURES="?x86" SECONDARY_ARCHITECTURES="x86"
libjpegVersion="62.2.0" libjpegVersion="62.3.0"
libjpegVersionCompat="$libjpegVersion compat >= ${libjpegVersion%%.*}" libjpegVersionCompat="$libjpegVersion compat >= ${libjpegVersion%%.*}"
libturbojpegVersion="0.1.0" libturbojpegVersion="0.2.0"
libturbojpegVersionCompat="$libturbojpegVersion compat >= ${libturbojpegVersion%%.*}" libturbojpegVersionCompat="$libturbojpegVersion compat >= ${libturbojpegVersion%%.*}"
PROVIDES=" PROVIDES="
@@ -88,12 +87,8 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
cmd:aclocal cmd:cmake
cmd:automake
cmd:autoreconf
cmd:awk
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix
cmd:make cmd:make
@@ -107,13 +102,15 @@ defineDebugInfoPackage jpeg_turbo$secondaryArchSuffix \
BUILD() BUILD()
{ {
autoreconf -fi mkdir -p haiku_build && cd haiku_build
runConfigure ./configure cmake .. \
$cmakeDirArgs
make $jobArgs make $jobArgs
} }
INSTALL() INSTALL()
{ {
cd haiku_build
make install make install
rm -f "$libDir"/lib*jpeg.la rm -f "$libDir"/lib*jpeg.la
@@ -133,5 +130,6 @@ INSTALL()
TEST() TEST()
{ {
cd haiku_build
make test make test
} }

30
media-libs/libjpeg-turbo/patches/libjpeg_turbo-1.5.3.patchset
View File

@@ -1,30 +0,0 @@
From bf7be1f0e2f9c6758e0f5f4f5ae2c21dc4e3ab12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 16 Mar 2018 18:34:16 +0100
Subject: Basi Haiku arch support
diff --git a/acinclude.m4 b/acinclude.m4
index 113169f..fce8884 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -77,6 +77,16 @@ case "$host_os" in
;;
esac
;;
+ haiku*)
+ case "$host_cpu" in
+ x86_64)
+ objfmt='ELF64'
+ ;;
+ *)
+ objfmt='ELF'
+ ;;
+ esac
+ ;;
*)
objfmt='ELF ?'
;;
--
2.16.2