From 67083f53abbc27591d0826d8ab960763a777ebc5 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 9 Aug 2018 13:23:53 +0300 Subject: [PATCH] openjpeg2:32 bit --- multimedia/graphics/openjpeg2/actions.py | 39 +++++++++++++++++++++--- multimedia/graphics/openjpeg2/pspec.xml | 24 ++++++++++++++- 2 files changed, 57 insertions(+), 6 deletions(-) diff --git a/multimedia/graphics/openjpeg2/actions.py b/multimedia/graphics/openjpeg2/actions.py index e3cebdd6cd..f559614213 100755 --- a/multimedia/graphics/openjpeg2/actions.py +++ b/multimedia/graphics/openjpeg2/actions.py @@ -7,16 +7,45 @@ from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools from pisi.actionsapi import get +from pisi.actionsapi import shelltools + def setup(): - cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_DOC=on") + #shelltools.makedirs("build") + #shelltools.cd("build") + + options = "-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_DOC=on" + + if get.buildTYPE() == "emul32": + shelltools.export("CC", "gcc -m32") + shelltools.export("CXX", "g++ -m32") + shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") + + options = "-DOPENJPEG_INSTALL_LIB_DIR=lib32 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPENJPEG_INSTALL_BIN_DIR=emul32 \ + -DBUILD_DOC=OFF" + + cmaketools.configure(options) def build(): + #shelltools.cd("build") cmaketools.make() def install(): + #shelltools.cd("build") cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("AUTHORS*", "CHANGELOG*", "NEWS*", "README*") + + if get.buildTYPE() == "emul32": + pisitools.insinto("/usr/bin/","%s/usr/emul32/opj_compress" % get.installDIR(),"opj_compress_32") + pisitools.insinto("/usr/bin/","%s/usr/emul32/opj_decompress" % get.installDIR(),"opj_decompress_32") + pisitools.insinto("/usr/bin/","%s/usr/emul32/opj_dump" % get.installDIR(),"opj_dump_32") + pisitools.dosed("%s/usr/lib32/pkgconfig/libopenjp2.pc" % get.installDIR(), "emul32", "bin") + pisitools.removeDir("/usr/emul32") + + + pisitools.dodoc("AUTHORS*", "CHANGELOG*", "NEWS*", "README*") + diff --git a/multimedia/graphics/openjpeg2/pspec.xml b/multimedia/graphics/openjpeg2/pspec.xml index b53b2a579d..5c68de15a8 100755 --- a/multimedia/graphics/openjpeg2/pspec.xml +++ b/multimedia/graphics/openjpeg2/pspec.xml @@ -49,7 +49,29 @@ /usr/include /usr/lib/pkgconfig + /usr/lib32/pkgconfig /usr/lib/openjpeg-2.3 + /usr/lib32/openjpeg-2.3 + + + + openjpeg2-32bit + emul32 + 32-bit shared libraries for openjpeg2 + emul32 + + lcms2-32bit + tiff-32bit + libpng-32bit + + + lcms2-32bit + tiff-32bit + libpng-32bit + + + /usr/lib32 + /usr/bin/*_32 @@ -57,7 +79,7 @@ 2018-08-03 2.3.0 - First release + First release. PisiLinux Community admins@pisilinux.org