From 4b7cfb8d95961ce90e3d919d5a76ec874bed2fe2 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 23 Jan 2023 13:04:26 +0300 Subject: [PATCH] libjpeg-turbo rebuild --- multimedia/graphics/libjpeg-turbo/actions.py | 8 ++++++-- multimedia/graphics/libjpeg-turbo/pspec.xml | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/multimedia/graphics/libjpeg-turbo/actions.py b/multimedia/graphics/libjpeg-turbo/actions.py index b0f6eb4b57..c4cf0eb424 100644 --- a/multimedia/graphics/libjpeg-turbo/actions.py +++ b/multimedia/graphics/libjpeg-turbo/actions.py @@ -14,15 +14,18 @@ def setup(): -DWITH_JPEG8=TRUE \ -DENABLE_STATIC=FALSE \ -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 = "-B build -DCMAKE_INSTALL_DEFAULT_LIBDIR=/usr/lib32 \ + options += " -DCMAKE_INSTALL_DEFAULT_LIBDIR=/usr/lib32 \ -DCMAKE_INSTALL_PREFIX=/emul32" + + else: + options += " -DCMAKE_INSTALL_PREFIX=/usr" cmaketools.configure(options) @@ -42,6 +45,7 @@ def install(): if get.buildTYPE() == "emul32": pisitools.removeDir("/emul32") pisitools.dosed("%s/usr/lib32/pkgconfig/*.pc" % get.installDIR(), "emul32", "usr") + pisitools.dosed("%s/usr/lib32/cmake/libjpeg-turbo/*.cmake" % get.installDIR(), "emul32", "usr") return # provide jpegint.h as it is required by various software diff --git a/multimedia/graphics/libjpeg-turbo/pspec.xml b/multimedia/graphics/libjpeg-turbo/pspec.xml index 22c7eb6d0d..ed415a2ee4 100644 --- a/multimedia/graphics/libjpeg-turbo/pspec.xml +++ b/multimedia/graphics/libjpeg-turbo/pspec.xml @@ -49,6 +49,9 @@ /usr/include/ /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/lib/cmake + /usr/lib32/cmake @@ -69,6 +72,13 @@ + + 2023-01-23 + 2.1.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-01-01 2.1.4