diff --git a/multimedia/graphics/libjpeg-turbo/actions.py b/multimedia/graphics/libjpeg-turbo/actions.py
index 85a797beec..614e072d64 100644
--- a/multimedia/graphics/libjpeg-turbo/actions.py
+++ b/multimedia/graphics/libjpeg-turbo/actions.py
@@ -1,26 +1,43 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
+#
# Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/copyleft/gpl.txt
+# See the file http://www.gnu.org/licenses/gpl.txt
-from pisi.actionsapi import autotools
-from pisi.actionsapi import get
+from pisi.actionsapi import cmaketools
from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
def setup():
- autotools.autoreconf("-fi")
- if not get.buildTYPE() == "emul32":
- autotools.configure("--with-jpeg8")
- else:
- pisitools.dosed("configure", "(NAFLAGS='-fel)f64( -DELF -D__x86_64__)", "\\1f32\\2")
- autotools.configure("--with-jpeg8 --without-simd")
+ options = "-DCMAKE_BUILD_TYPE=Release \
+ -DWITH_JPEG8=TRUE \
+ -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \
+ -DCMAKE_INSTALL_PREFIX=/usr"
+
+ if get.buildTYPE() == "emul32":
+ shelltools.export("CC", "gcc -m32")
+ shelltools.export("CXX", "g++ -m32")
+ shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
+
+ options = "-DCMAKE_INSTALL_DEFAULT_LIBDIR=/usr/lib32 \
+ -DCMAKE_INSTALL_PREFIX=/emul32"
+
+ cmaketools.configure(options)
def build():
- autotools.make()
+ cmaketools.make()
+
+def check():
+ cmaketools.make("test")
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- if get.buildTYPE() == "emul32": return
-
+ cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
+
+ if get.buildTYPE() == "emul32":
+ pisitools.removeDir("/emul32")
+ pisitools.dosed("%s/usr/lib32/pkgconfig/*.pc" % get.installDIR(), "emul32", "usr")
+ return
+
# provide jpegint.h as it is required by various software
pisitools.insinto("/usr/lib/include", "jpegint.h")
diff --git a/multimedia/graphics/libjpeg-turbo/pspec.xml b/multimedia/graphics/libjpeg-turbo/pspec.xml
index e0195d4785..8ef18a54ac 100644
--- a/multimedia/graphics/libjpeg-turbo/pspec.xml
+++ b/multimedia/graphics/libjpeg-turbo/pspec.xml
@@ -13,7 +13,10 @@
app:gui
MMX, SSE, and SSE2 SIMD accelerated JPEG library
libjpeg-turbo is a derivative of libjpeg for x86 and x86-64 processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression. libjpeg-turbo is generally 2-4x as fast as the unmodified version of libjpeg v6b, all else being equal.
- mirrors://sourceforge/libjpeg-turbo/1.5.3/libjpeg-turbo-1.5.3.tar.gz
+ mirrors://sourceforge/libjpeg-turbo/2.0.1/libjpeg-turbo-2.0.1.tar.gz
+
+ cmake
+
@@ -42,7 +45,7 @@
jpeg-devel
- /usr/include/
+ /usr/include/
/usr/lib/pkgconfig
@@ -64,6 +67,13 @@
+
+ 2019-01-05
+ 2.0.1
+ Version bump.
+ Pisi Linux Community
+ admin@pisilinux.org
+
2018-07-25
1.5.3