Merge pull request #5299 from Rmys/master

openjpeg2:32 bit

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 \
+    #shelltools.makedirs("build")
-                          -DCMAKE_INSTALL_PREFIX=/usr \
+    #shelltools.cd("build")
-                          -DBUILD_DOC=on")
+
+    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*")
+        

multimedia/graphics/openjpeg2/pspec.xml

@@ -49,7 +49,29 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
             <Path fileType="data">/usr/lib/openjpeg-2.3</Path>
+            <Path fileType="data">/usr/lib32/openjpeg-2.3</Path>
+        </Files>
+    </Package>
+    <Package>
+        <Name>openjpeg2-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for openjpeg2</Summary>
+        <BuildType>emul32</BuildType>
+        <BuildDependencies>
+            <Dependency>lcms2-32bit</Dependency>
+            <Dependency>tiff-32bit</Dependency>
+            <Dependency>libpng-32bit</Dependency>
+        </BuildDependencies>
+        <RuntimeDependencies>
+            <Dependency>lcms2-32bit</Dependency>
+            <Dependency>tiff-32bit</Dependency>
+            <Dependency>libpng-32bit</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+            <Path fileType="executable">/usr/bin/*_32</Path>
         </Files>
     </Package>
 
@@ -57,7 +79,7 @@
         <Update release="2">
             <Date>2018-08-03</Date>
             <Version>2.3.0</Version>
-            <Comment>First release</Comment>
+            <Comment>First release.</Comment>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Update>