Merge pull request #5487 from Rmys/master

libopus:rebuild 32bit

multimedia/misc/libopus/actions.py

@@ -1,19 +1,28 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Licensed under the GNU General Public License, version 3.
+# Licensed under the GNU General Public License, version 2
-# See the file http://www.gnu.org/copyleft/gpl.txt.
+# See the file http://www.gnu.org/copyleft/gpl.txt
 
+from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import get
+from pisi.actionsapi import shelltools
-
 
 def setup():
-    autotools.autoreconf("-vif")
+    autotools.autoreconf("-fiv")
-    autotools.configure("--enable-custom-modes \
+    options = "\
-                         --disable-static \
+                --disable-static \
-                         --disable-doc")
+              "
+
+    if get.buildTYPE() == "_emul32":
+        options += "  --libdir=/usr/lib32 \
+                  "
+    shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+
+    autotools.configure(options)
+
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make()
@@ -21,4 +30,6 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("COPYING", "ChangeLog", "README")
+
+    if get.buildTYPE() == "_emul32":
+        pisitools.dodoc("README", "NEWS", "AUTHORS")

multimedia/misc/libopus/pspec.xml

@@ -13,6 +13,9 @@
         <Summary>Opus is a totally open, royalty-free, highly versatile audio codec</Summary>
         <Description>Opus is unmatched for interactive speech and music transmission over the Internet, but is also intended for storage and streaming applications. It is standardized by the Internet Engineering Task Force (IETF) as RFC 6716 which incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec.</Description>
         <Archive sha1sum="35d108ca9d6a8d05e52d06c5421a5f95b39fdac9" type="targz">http://downloads.xiph.org/releases/opus/opus-1.2.1.tar.gz</Archive>
+        <BuildDependencies>
+            <Dependency>doxygen</Dependency>
+        </BuildDependencies>
     </Source>
 
     <Package>
@@ -33,6 +36,7 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
         </Files>
     </Package>
     
@@ -47,7 +51,27 @@
         </Files>
     </Package>
     
+    <Package>
+        <Name>libopus-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for libopus</Summary>
+        <BuildType>emul32</BuildType>
+        <RuntimeDependencies>
+            <Dependency release="current">libopus</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+        </Files>
+    </Package>
+
     <History>
+        <Update release="4">
+            <Date>2018-08-16</Date>
+            <Version>1.2.1</Version>
+            <Comment>Rebuild 32bit.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2018-08-01</Date>
             <Version>1.2.1</Version>