Merge pull request #7657 from suvari/master

gst-python3: fix meson build

programming/language/python3/gst-python3/actions.py

@@ -4,22 +4,19 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import autotools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
-from pisi.actionsapi import get
 
+from pisi.actionsapi import get
+from pisi.actionsapi import mesontools
+from pisi.actionsapi import pisitools
 def setup():
-    shelltools.export("PYTHON", "/usr/bin/python3.8")
+    mesontools.configure()
-    autotools.autoreconf("-vfi")
-    autotools.configure("--disable-static")
-    
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
-    autotools.make()
+    mesontools.build()
+    
+def check():
+    mesontools.build("test")
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    mesontools.install()
-
     pisitools.dodoc("AUTHORS", "ChangeLog" ,"COPYING", "README", "TODO")

programming/language/python3/gst-python3/files/gst-python-3.8.patch

@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 0c0a5ae..b3e66a1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,11 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
+ 
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++if get_option('python').endswith('2')
++  python_dep = python.dependency(required : true)
++else
++  python_dep = dependency('python3-embed', required : true)
++endif
+ 
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')

programming/language/python3/gst-python3/pspec.xml

@@ -14,13 +14,17 @@
         <Description>gst-python3 is a Python frontend to GStreamer.</Description>
         <Archive sha1sum="839fd35bd924a768c05288ce45a057a29c1e736c" type="tarxz">https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
+            <Dependency>glib2-devel</Dependency>
             <Dependency>python3-pygobject3-devel</Dependency>
             <Dependency>python-pygobject3-devel</Dependency>
-            <Dependency>glib2-devel</Dependency>
             <Dependency versionFrom="1.16.2">gstreamer-devel</Dependency>
-            <Dependency>python3-devel</Dependency>
+            <Dependency versionFrom="3.8.1">python3-devel</Dependency>
             <Dependency versionFrom="1.16.2">gst-plugins-base-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>gst-python-3.8.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -40,7 +44,7 @@
 
     <History>
         <Update release="7">
-            <Date>2020-01-19</Date>
+            <Date>2020-01-22</Date>
             <Version>1.16.2</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>
@@ -89,4 +93,4 @@
             <Email>groni@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>