diff --git a/multimedia/graphics/libjpeg-turbo/actions.py b/multimedia/graphics/libjpeg-turbo/actions.py
index c073d8df96..b0f6eb4b57 100644
--- a/multimedia/graphics/libjpeg-turbo/actions.py
+++ b/multimedia/graphics/libjpeg-turbo/actions.py
@@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
- options = "-B build -DCMAKE_BUILD_TYPE=Release \
+ options = "-B build -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DWITH_JPEG8=TRUE \
-DENABLE_STATIC=FALSE \
-DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \
@@ -27,15 +27,17 @@ def setup():
cmaketools.configure(options)
def build():
- cmaketools.make("-C build")
+ shelltools.system("cmake --build build -v")
+ # cmaketools.make("--build -C build -v")
-def check():
- shelltools.cd("build")
- cmaketools.make("test")
+# def check():
+ # shelltools.cd("build")
+ # cmaketools.make("test")
def install():
- shelltools.cd("build")
- cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
+ # shelltools.cd("build")
+ shelltools.system("DESTDIR=%s cmake --install build -v" % get.installDIR())
+ # cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
if get.buildTYPE() == "emul32":
pisitools.removeDir("/emul32")
@@ -44,4 +46,4 @@ def install():
# provide jpegint.h as it is required by various software
#pisitools.insinto("/usr/lib/include", "jpegint.h")
- pisitools.insinto("/usr/include", "../jpegint.h")
+ pisitools.insinto("/usr/include", "jpegint.h")
diff --git a/multimedia/graphics/libjpeg-turbo/pspec.xml b/multimedia/graphics/libjpeg-turbo/pspec.xml
index 3f0977ddd5..22c7eb6d0d 100644
--- a/multimedia/graphics/libjpeg-turbo/pspec.xml
+++ b/multimedia/graphics/libjpeg-turbo/pspec.xml
@@ -15,6 +15,8 @@
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.
https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.1.4.tar.gz
+ ninja
+ nasm
cmake
@@ -67,6 +69,13 @@
+
+ 2023-01-01
+ 2.1.4
+ Rebuild.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2022-12-16
2.1.4