Merge pull request #7243 from Rmys/master

openjpeg:rebuild

multimedia/graphics/openjpeg/actions.py

@@ -14,6 +14,7 @@ def setup():
 
     if get.buildTYPE() == "emul32":
         shelltools.export("PKG_CONFIG_LIBDIR", "/usr/lib32/pkgconfig")
+        options += " --libdir=/usr/lib32"
         
     shelltools.system("./bootstrap.sh")    
 
@@ -23,15 +24,16 @@ def build():
     autotools.make()
 
 def install():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     if get.buildTYPE() == "emul32":
-        pisitools.insinto("/usr/lib32", "libopenjpeg/.libs/libopenjpeg.so*")
-        pisitools.insinto("/usr/lib32/pkgconfig", "libopenjpeg1.pc")
-        pisitools.dosed("%s//usr/lib32/pkgconfig/libopenjpeg1.pc" % get.installDIR(),
-                        get.emul32prefixDIR(),
-                        get.defaultprefixDIR())
+        #pisitools.insinto("/usr/lib32", "libopenjpeg/.libs/libopenjpeg.so*")
+        #pisitools.insinto("/usr/lib32/pkgconfig", "libopenjpeg1.pc")
+        #pisitools.dosed("%s//usr/lib32/pkgconfig/libopenjpeg1.pc" % get.installDIR(),
+                        #get.emul32prefixDIR(),
+                        #get.defaultprefixDIR())
         return
 
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     pisitools.dosym("openjpeg-1.5/openjpeg.h", "/usr/include/openjpeg.h")
 

multimedia/graphics/openjpeg/pspec.xml

@@ -72,6 +72,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2019-11-05</Date>
+            <Version>1.5.2</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="5">
             <Date>2018-08-07</Date>
             <Version>1.5.2</Version>