Merge branch 'master' of github.com:pisilinux/main

2018-08-11 20:47:49 +03:00
parent e894614d60 06fee69370
commit 3f53bc455d
8 changed files with 113 additions and 109 deletions
@@ -10,8 +10,7 @@ from pisi.actionsapi import pisitools

 def setup():
    autotools.configure("--with-package-name='PisiLinux gst-libav package' \
-                         --with-package-origin='http://www.pisilinux.org' \
-                         --enable-ffmpeg")
+                         --with-package-origin='http://www.pisilinux.org'")

    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") 

@@ -15,6 +15,7 @@
        <Archive sha1sum="4aadb887babfc81b931ed3dc7942e9f8c146dca5" type="tarxz">https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz</Archive>
        <BuildDependencies>     
            <Dependency>orc-devel</Dependency>
+            <Dependency>xz-devel</Dependency>
            <Dependency>yasm-devel</Dependency>
            <Dependency>gst-plugins-base-devel</Dependency>
        </BuildDependencies>
@@ -26,11 +27,13 @@
            <Package>gst-libav-next</Package>
        </Conflicts>
        <RuntimeDependencies>
+            <Dependency>xz</Dependency>
+            <Dependency>zlib</Dependency>
            <Dependency>bzip2</Dependency>
            <Dependency>glib2</Dependency>
            <Dependency>gstreamer</Dependency>
            <Dependency>gst-plugins-base</Dependency>
-    </RuntimeDependencies>
+        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="doc">/usr/share/doc</Path>
@@ -40,7 +43,7 @@

    <History>
        <Update release="1">
-            <Date>2016-06-10</Date>
+            <Date>2018-08-11</Date>
            <Version>1.12.4</Version>
            <Comment>Release Bump</Comment>
            <Name>Pisi Linux Community</Name>
@@ -10,21 +10,10 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get

 def setup():
-    #shelltools.export("AUTOPOINT", "true")
-    #pisitools.dosed("autogen.sh", "tool_run.*autopoint --force.*")
-
-    #pisitools.dosed("ext/modplug/gstmodplug.cc", "stdafx.h", "libmodplug/stdafx.h")
-    #pisitools.dosed("configure.ac", "AM_CONFIG_HEADER", "AC_CONFIG_HEADERS")
-
-    shelltools.export("NOCONFIGURE", "1")
-    shelltools.system("./autogen.sh")
-
    autotools.configure("--with-package-name='PisiLinux gstreamer-plugins-bad package' \
                         --with-package-origin='http://www.pisilinux.org'")
-
-    # for fix unused dependency
-    pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ")
-
+    
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") 

 def build():
    autotools.make()
@@ -33,4 +22,3 @@ def install():
    autotools.rawInstall("DESTDIR=%s" % get.installDIR())

    pisitools.dodoc("ABOUT-NLS", "AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README", "RELEASE", "REQUIREMENTS")
-
@@ -5,8 +5,8 @@
        <Name>gst-plugins-bad</Name>
        <Homepage>http://gstreamer.freedesktop.org/modules/gst-plugins-bad.html</Homepage>
        <Packager>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
        </Packager>
        <License>GPLv2</License>
        <IsA>library</IsA>
@@ -14,37 +14,42 @@
        <Description>GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared to the rest. They might be close to being good quality, but they're missing something - be it a good code review, some documentation, a set of tests, a real live maintainer, or some actual wide use.</Description>
        <Archive sha1sum="90e3c0990bbc6e2ed20688993d89bf6fd256ae00" type="tarxz"> https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency>gsm-devel</Dependency>--> <!-- gsmenc gsmdec -->
            <Dependency>orc-devel</Dependency>
-            <Dependency>celt-devel</Dependency>
+            <Dependency>gsm-devel</Dependency> <!-- gsmenc gsmdec -->
            <Dependency>faac-devel</Dependency>
-            <Dependency>xvid-devel</Dependency>
+            <Dependency>gtk3-devel</Dependency>
+            <Dependency>mesa-devel</Dependency>
+            <Dependency>webp-devel</Dependency>
+            <Dependency>x265-devel</Dependency>
            <Dependency>faad2-devel</Dependency>
-            <Dependency>libsdl-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>mpg123-devel</Dependency>
+            <Dependency>libdca-devel</Dependency> <!-- dtsdec -->
            <Dependency>jasper-devel</Dependency> <!-- jp2kdec jp2kenc -->
-            <Dependency>libdca-devel</Dependency>--> <!-- dtsdec -->
-            <Dependency>openal-devel</Dependency>
+            <Dependency>libsdl-devel</Dependency>
+            <Dependency>libexif-devel</Dependency>
            <Dependency>libopus-devel</Dependency>
+            <Dependency>wayland-devel</Dependency>
+            <Dependency>mesa-glu-devel</Dependency>
+            <Dependency>wayland-cursor</Dependency>
+            <Dependency>libmpeg2-devel</Dependency>
            <Dependency>DirectFB-devel</Dependency> <!-- dfbvideosink -->
            <Dependency>libvdpau-devel</Dependency>
-            <Dependency>rtmpdump-devel</Dependency>
-            <Dependency>libdc1394-devel</Dependency>
-            <Dependency>libdvdnav-devel</Dependency> --><!-- resindvd -->
            <Dependency>libtheora-devel</Dependency>
-            <Dependency>libdvdread-devel</Dependency>
-            <Dependency>libmodplug-devel</Dependency>
-            <Dependency>mjpegtools-devel</Dependency>--> <!-- mplex mpgenc -->
-            <Dependency>libsndfile-devel</Dependency>--> <!-- sfsrc sfsink -->
+            <Dependency>libdvdnav-devel</Dependency> <!-- resindvd -->
+            <Dependency>libsndfile-devel</Dependency> <!-- sfsrc sfsink -->
+            <Dependency>mjpegtools-devel</Dependency> <!-- mplex mpgenc -->
            <Dependency>soundtouch-devel</Dependency>
-            <Dependency>libcdaudio-devel</Dependency>
+            <Dependency>libdvdread-devel</Dependency>
+            <Dependency>llvm-clang-devel</Dependency>
            <Dependency>schroedinger-devel</Dependency>
            <Dependency>libvo-aacenc-devel</Dependency>
+            <Dependency>libjpeg-turbo-devel</Dependency>
            <Dependency>libvo-amrwbenc-devel</Dependency>
-            <Dependency>gst-plugins-base-devel</Dependency>
+            <Dependency>gstreamer-devel</Dependency>
+            <Dependency>gobject-introspection-devel</Dependency> 
+            <Dependency>gst-plugins-base-devel</Dependency>            
        </BuildDependencies>
-        <Patches>
-<!--             <Patch>directfb.patch</Patch> -->
-        </Patches>
    </Source>

    <Package>
@@ -55,35 +60,37 @@
        <RuntimeDependencies>
            <Dependency>gsm</Dependency> <!-- gsmenc gsmdec -->
            <Dependency>orc</Dependency>
-            <Dependency>celt</Dependency>
            <Dependency>faac</Dependency>
-            <Dependency>xvid</Dependency>
+            <Dependency>gtk3</Dependency>
+            <Dependency>mesa</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>webp</Dependency>
+            <Dependency>x265</Dependency>
            <Dependency>bzip2</Dependency>
+            <Dependency>cairo</Dependency>
            <Dependency>faad2</Dependency>
            <Dependency>glib2</Dependency>
-            <Dependency>jasper</Dependency> <!-- jp2kdec jp2kenc -->
            <Dependency>libX11</Dependency>
            <Dependency>libdca</Dependency> <!-- dtsdec -->
+            <Dependency>libdrm</Dependency>
            <Dependency>libgcc</Dependency>
-            <Dependency>libsdl</Dependency>
-            <Dependency>openal</Dependency>
+            <Dependency>libkms</Dependency>
+            <Dependency>wayland</Dependency>
+            <Dependency>libpng</Dependency>
            <Dependency>libopus</Dependency>
-            <Dependency>openssl</Dependency>
-            <Dependency>DirectFB</Dependency> <!-- dfbvideosink -->
+            <Dependency versionFrom="1.7.7">DirectFB</Dependency> <!-- dfbvideosink -->
            <Dependency>libvdpau</Dependency>
-            <Dependency>rtmpdump</Dependency>
-            <Dependency>gstreamer</Dependency>
-            <Dependency>libdc1394</Dependency>
            <Dependency>libdvdnav</Dependency> <!-- resindvd -->
-            <Dependency>libcdaudio</Dependency>
            <Dependency>libdvdread</Dependency>
-            <Dependency>libmodplug</Dependency>
            <Dependency>libsndfile</Dependency> <!-- sfsrc sfsink -->
            <Dependency>mjpegtools</Dependency> <!-- mplex mpgenc -->
            <Dependency>soundtouch</Dependency>
            <Dependency>libvo-aacenc</Dependency>
            <Dependency>schroedinger</Dependency>
+            <Dependency>libjpeg-turbo</Dependency>
+            <Dependency>gstreamer</Dependency>
            <Dependency>libvo-amrwbenc</Dependency>
+            <Dependency>wayland-client</Dependency>
            <Dependency>gst-plugins-base</Dependency>
        </RuntimeDependencies>
        <Files>
@@ -91,19 +98,23 @@
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="localedata">/usr/share/locale</Path>
            <Path fileType="data">/usr/share/gstreamer-1.0</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="data">/usr/share/gir-1.0</Path>
+            <Path fileType="data">/usr/share/gst-plugins-bad/1.0/</Path>
            <Path fileType="doc">/usr/share/gtk-doc</Path>
-            <Path fileType="data">/usr/share/glib-2.0/schemas</Path>
+            <Path fileType="data">/usr/share/gir-1.0/</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
        </Files>
    </Package>

    <Package>
        <Name>gst-plugins-bad-devel</Name>
+        <Conflicts>
+            <Package>gst-plugins-bad-next-devel</Package>
+        </Conflicts>
        <Summary>Development files for gst-plugins-bad</Summary>
        <RuntimeDependencies>
-            <Dependency release="current">gst-plugins-bad</Dependency>
            <Dependency>gstreamer-devel</Dependency>
+            <Dependency>gst-plugins-base-devel</Dependency>
+            <Dependency release="current">gst-plugins-bad</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="data">/usr/lib/pkgconfig</Path>
@@ -10,7 +10,6 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools

 def setup():
-    pisitools.dosed("configure.ac", "AM_CONFIG_HEADER", "AC_CONFIG_HEADERS")
    opts = {
            "introspection": "no" if get.buildTYPE() == "emul32" else "yes",
           }
@@ -15,17 +15,18 @@
        <Archive sha1sum="ded0a72fd5bcd94b358160781c65a7db60ce33f0" type="tarxz">http://ftp.gnome.org/pub/gnome/sources/gst-plugins-base/1.12/gst-plugins-base-1.12.0.tar.xz</Archive>
        <BuildDependencies>
            <Dependency>orc-devel</Dependency>
+            <Dependency>cdparanoia</Dependency>
            <Dependency>pango-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>
            <Dependency>libXv-devel</Dependency>
            <Dependency>libogg-devel</Dependency>
-            <Dependency>libX11-devel</Dependency>
-            <Dependency>libcdio-devel</Dependency>
+            <Dependency>libXext-devel</Dependency>
+<!--             <Dependency>libopus-devel</Dependency> -->
            <Dependency>alsa-lib-devel</Dependency>
            <Dependency>libvorbis-devel</Dependency>
            <Dependency>libtheora-devel</Dependency>
            <Dependency>libvisual-devel</Dependency>
            <Dependency>gstreamer-devel</Dependency>
-            <Dependency>cdparanoia-devel</Dependency>
            <Dependency>gobject-introspection-devel</Dependency>
        </BuildDependencies>
    </Source>
@@ -38,35 +39,33 @@
        <RuntimeDependencies>
            <Dependency>orc</Dependency>
            <Dependency>zlib</Dependency>
-            <Dependency>cairo</Dependency>
-            <Dependency>pango</Dependency>
            <Dependency>glib2</Dependency>
+            <Dependency>pango</Dependency>
+            <Dependency>cairo</Dependency>
            <Dependency>libXv</Dependency>
            <Dependency>libX11</Dependency>
            <Dependency>libogg</Dependency>
-            <Dependency>libxml2</Dependency>
            <Dependency>libXext</Dependency>
+<!--             <Dependency>libopus</Dependency> -->
            <Dependency>alsa-lib</Dependency>
            <Dependency>libvorbis</Dependency>
            <Dependency>libvisual</Dependency>
            <Dependency>libtheora</Dependency>
-            <Dependency>gstreamer</Dependency>
            <Dependency>cdparanoia</Dependency>
+            <Dependency>gstreamer</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/girepository-1.0</Path>
-            <Path fileType="library">/usr/lib/gstreamer-1.0</Path>
-            <Path fileType="library">/usr/lib/libgst*</Path>
+            <Path fileType="library">/usr/lib</Path>
            <Path fileType="doc">/usr/share/doc</Path>
            <Path fileType="doc">/usr/share/gtk-doc</Path>
            <Path fileType="data">/usr/share/gir-1.0</Path>
-            <Path fileType="data">/usr/share/gst-plugins-base</Path>
            <Path fileType="man">/usr/share/man</Path>
            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="data">/usr/share/gst-plugins-base/1.0</Path>
        </Files>
    </Package>
-
+    
    <Package>
        <Name>gst-plugins-base-32bit</Name>
        <PartOf>emul32</PartOf>
@@ -111,11 +110,14 @@

    <Package>
        <Name>gst-plugins-base-devel</Name>
+        <Conflicts>
+            <Package>gst-plugins-base-next-devel</Package>
+        </Conflicts>
        <Summary>Development files for gst-plugins-base</Summary>
        <RuntimeDependencies>
            <Dependency release="current">gst-plugins-base</Dependency>
-            <Dependency>glib2-devel</Dependency>
            <Dependency>gstreamer-devel</Dependency>
+            <Dependency>glib2-devel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="header">/usr/include</Path>
@@ -128,7 +130,7 @@

    <History>
        <Update release="5">
-            <Date>2018-07-31</Date>
+            <Date>2018-08-11</Date>
            <Version>1.12.0</Version>
            <Comment>Version bump.</Comment>
            <Name>Pisi Linux Community</Name>
@@ -12,8 +12,7 @@ from pisi.actionsapi import get
 def setup():
    shelltools.export("AUTOPOINT", "true")
    autotools.autoreconf("-vfi")
-    #shelltools.system("./autogen.sh --disable-gtk-doc --disable-docbook")
-
+    
    options = '--with-package-name="GStreamer for PisiLinux" \
               --with-package-origin="http://www.pisilinux.org" \
               --disable-gtk-doc'
@@ -22,24 +21,23 @@ def setup():
        options += " --bindir=/usr/bin32 \
                     --libdir=/usr/lib32 \
                     --libexecdir=/usr/libexec32 \
+                     --with-bash-completion-dir=no \
                     --disable-introspection"

        shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")

    autotools.configure(options)
    
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")    

 def build():
    autotools.make()

 def install():
    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
+    
    if get.buildTYPE() == "emul32":
        pisitools.removeDir("/usr/bin32")
        pisitools.removeDir("/usr/libexec32")

-    pisitools.removeDir("/usr/share/gtk-doc")
-
    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README")
@@ -20,12 +20,6 @@
            <Dependency>glib2-devel</Dependency>
            <Dependency>gsl-devel</Dependency>
        </BuildDependencies>
-        <Patches>
-        <!-- FIXME: this is a workaround for following plugin changes, in case timestamp has not changed, it is a bit too complex though-->
-<!--             <Patch level="1">tests-remove-silly-test_fail_abstract_new-check.patch</Patch> -->
-            <Patch level="1">wrapper-plugins.patch</Patch>
-<!--             <Patch level="1">bison3.patch</Patch> -->
-        </Patches>
    </Source>

    <Package>
@@ -34,29 +28,58 @@
            <Package>gstreamer-next</Package>
        </Conflicts>
        <RuntimeDependencies>
-            <Dependency>glib2</Dependency>
-            <Dependency>libxml2</Dependency>
+             <Dependency>glib2</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="library">/usr/libexec</Path>
+            <Path fileType="library">/usr/lib/libgstbase*</Path>
+            <Path fileType="library">/usr/lib/libgstcheck*</Path>
+            <Path fileType="library">/usr/lib/libgstcontroller*</Path>
+            <Path fileType="library">/usr/lib/libgstnet*</Path>
+            <Path fileType="library">/usr/lib/libgstreamer*</Path>
+            <Path fileType="library">/usr/lib/gstreamer-1.0</Path>
+            <Path fileType="library">/usr/lib/girepository-1.0</Path>
+            <Path fileType="executable">/usr/libexec</Path>
            <Path fileType="data">/usr/share/gir-1.0</Path>
+            <Path fileType="data">/usr/share/bash-completion</Path>
            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="doc">/usr/share/gtk-doc</Path>
            <Path fileType="localedata">/usr/share/locale</Path>
            <Path fileType="man">/usr/share/man</Path>
-            <Path fileType="data">/usr/share/bash-completion</Path>
+        </Files>
+    </Package>
+
+    <Package> 
+        <Name>gstreamer-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for gstreamer</Summary>
+        <BuildType>emul32</BuildType>
+        <BuildDependencies>
+            <Dependency>glib2-32bit</Dependency>
+        </BuildDependencies>
+        <RuntimeDependencies>
+            <Dependency>glib2-32bit</Dependency>
+            <Dependency release="current">gstreamer</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32/libgstbase*</Path>
+            <Path fileType="library">/usr/lib32/libgstcheck*</Path>
+            <Path fileType="library">/usr/lib32/libgstcontroller*</Path>
+            <Path fileType="library">/usr/lib32/libgstnet*</Path>
+            <Path fileType="library">/usr/lib32/libgstreamer*</Path>
+            <Path fileType="library">/usr/lib32/gstreamer-1.0</Path>
        </Files>
    </Package>

    <Package>
        <Name>gstreamer-devel</Name>
+        <Conflicts>
+            <Package>gstreamer-next-devel</Package>
+        </Conflicts>
        <Summary>Development files for gstreamer</Summary>
        <RuntimeDependencies>
            <Dependency release="current">gstreamer</Dependency>
            <Dependency>glib2-devel</Dependency>
-	    <Dependency>gobject-introspection-devel</Dependency>
-            <Dependency>libxml2-devel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="header">/usr/include</Path>
@@ -66,28 +89,9 @@
        </Files>
    </Package>

-    <Package>
-        <Name>gstreamer-32bit</Name>
-        <PartOf>emul32</PartOf>
-        <Summary>32-bit shared libraries for gstreamer</Summary>
-        <BuildType>emul32</BuildType>
-        <BuildDependencies>
-            <Dependency>glib2-32bit</Dependency>
-            <Dependency>libxml2-32bit</Dependency>
-        </BuildDependencies>
-        <RuntimeDependencies>
-            <Dependency release="current">gstreamer</Dependency>
-            <Dependency>glib2-32bit</Dependency>
-            <Dependency>libxml2-32bit</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib32</Path>
-        </Files>
-    </Package>
-
    <History>
-        <Update release="4">
-            <Date>2018-07-31</Date>
+        <Update release="5">
+            <Date>2018-08-11</Date>
            <Version>1.12.4</Version>
            <Comment>Version Bump.</Comment>
            <Name>Pisi Linux Community</Name>