gstreamer-git: update to latest master (#3540)

msys2 · Apr 4, 2018 · db7f824 · db7f824
1 parent 34e1e72
commit db7f824
Show file tree

Hide file tree

Showing 16 changed files with 195 additions and 231 deletions.
diff --git a/mingw-w64-gst-editing-services-git/PKGBUILD b/mingw-w64-gst-editing-services-git/PKGBUILD
@@ -6,8 +6,8 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=r2575.9fbc717
-pkgrel=2
+pkgver=r2735.7ba51db9
+pkgrel=1
 pkgdesc="GStreamer Editing Services (mingw-w64)"
 arch=('any')
 url="https://gstreamer.freedesktop.org/"
@@ -24,7 +24,7 @@ pkgver() {
   cd "$srcdir/$_realname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
-			
+
 prepare() {
   cd "$srcdir/$_realname"
 

diff --git a/mingw-w64-gst-libav-git/PKGBUILD b/mingw-w64-gst-libav-git/PKGBUILD
@@ -6,17 +6,16 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=r2034.ac4a47b
-pkgrel=2
+pkgver=r2133.800b261
+pkgrel=1
 pkgdesc="GStreamer libav (mingw-w64)"
 arch=('any')
 url="https://gstreamer.freedesktop.org/"
 license=("LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "yasm")
-depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
-         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base-git")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc")
+depends=("${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
+         "${MINGW_PACKAGE_PREFIX}-ffmpeg")
 options=(!libtool strip staticlibs)
 source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-libav.git")
 sha256sums=('SKIP')
@@ -47,7 +46,8 @@ build() {
     --disable-static \
     --enable-shared \
     --enable-silent-rules \
-    --disable-gtk-doc
+    --disable-gtk-doc \
+    --with-system-libav
   make
 }
 

diff --git a/mingw-w64-gst-plugins-bad-git/0001-fix-zbar-linking.patch b/mingw-w64-gst-plugins-bad-git/0001-fix-zbar-linking.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-bad-1.12.1/ext/zbar/Makefile.am.orig	2017-06-23 12:45:47.347778600 +0300
++++ gst-plugins-bad-1.12.1/ext/zbar/Makefile.am	2017-06-23 12:45:59.369466200 +0300
+@@ -3,7 +3,7 @@
+ libgstzbar_la_SOURCES = gstzbar.c
+
+ libgstzbar_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ZBAR_CFLAGS)
+-libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS)
++libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS) $(LIBICONV)
+ libgstzbar_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstzbar_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+
diff --git a/mingw-w64-gst-plugins-bad-git/0005-Include-glext-h.patch b/mingw-w64-gst-plugins-bad-git/0005-Include-glext-h.patch
diff --git a/mingw-w64-gst-plugins-bad-git/0006-No-X11-on-_WIN32.patch b/mingw-w64-gst-plugins-bad-git/0006-No-X11-on-_WIN32.patch
diff --git a/mingw-w64-gst-plugins-bad-git/PKGBUILD b/mingw-w64-gst-plugins-bad-git/PKGBUILD
@@ -8,60 +8,63 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=r21805.2b44392
+pkgver=r23341.a53019068
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
 arch=('any')
 url="https://gstreamer.freedesktop.org/"
 license=("LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
-depends=("${MINGW_PACKAGE_PREFIX}-celt"
+makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc")
+depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
+         "${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-chromaprint"
-         "${MINGW_PACKAGE_PREFIX}-clutter"
          "${MINGW_PACKAGE_PREFIX}-curl"
          "${MINGW_PACKAGE_PREFIX}-daala"
          "${MINGW_PACKAGE_PREFIX}-faad2"
          "${MINGW_PACKAGE_PREFIX}-faac"
+         "${MINGW_PACKAGE_PREFIX}-fdk-aac"
          "${MINGW_PACKAGE_PREFIX}-fluidsynth"
-         "${MINGW_PACKAGE_PREFIX}-gnutls"
          "${MINGW_PACKAGE_PREFIX}-gsm"
-         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base-git"
+         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
+         "${MINGW_PACKAGE_PREFIX}-ladspa-sdk"
+         "${MINGW_PACKAGE_PREFIX}-lcms2"
          "${MINGW_PACKAGE_PREFIX}-libass"
+         "${MINGW_PACKAGE_PREFIX}-libbs2b"
          "${MINGW_PACKAGE_PREFIX}-libdca"
          "${MINGW_PACKAGE_PREFIX}-libdvdnav"
+         "${MINGW_PACKAGE_PREFIX}-libdvdread"
          "${MINGW_PACKAGE_PREFIX}-libexif"
          "${MINGW_PACKAGE_PREFIX}-libgme"
          "${MINGW_PACKAGE_PREFIX}-libjpeg"
-         "${MINGW_PACKAGE_PREFIX}-libmimic"
          "${MINGW_PACKAGE_PREFIX}-libmodplug"
          "${MINGW_PACKAGE_PREFIX}-libmpeg2"
-         "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-librsvg"
+         "${MINGW_PACKAGE_PREFIX}-libsndfile"
          "${MINGW_PACKAGE_PREFIX}-libsrtp"
+         "${MINGW_PACKAGE_PREFIX}-libssh2"
          "${MINGW_PACKAGE_PREFIX}-libwebp"
          "${MINGW_PACKAGE_PREFIX}-libxml2"
-         "${MINGW_PACKAGE_PREFIX}-mpg123"
          "${MINGW_PACKAGE_PREFIX}-nettle"
          "${MINGW_PACKAGE_PREFIX}-openal"
          "${MINGW_PACKAGE_PREFIX}-opencv"
          "${MINGW_PACKAGE_PREFIX}-openexr"
+         "${MINGW_PACKAGE_PREFIX}-openh264"
          "${MINGW_PACKAGE_PREFIX}-openjpeg2"
+         "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-opus"
          "${MINGW_PACKAGE_PREFIX}-orc"
-         "${MINGW_PACKAGE_PREFIX}-schroedinger"
+         "${MINGW_PACKAGE_PREFIX}-pango"
+         "${MINGW_PACKAGE_PREFIX}-rtmpdump-git"
          "${MINGW_PACKAGE_PREFIX}-soundtouch"
          "${MINGW_PACKAGE_PREFIX}-x265"
-         "${MINGW_PACKAGE_PREFIX}-openh264")
+         "${MINGW_PACKAGE_PREFIX}-zbar")
 options=(!libtool strip staticlibs)
 source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad.git"
-        "0005-Include-glext-h.patch"
-        "0006-No-X11-on-_WIN32.patch")
+        0001-fix-zbar-linking.patch)
 sha256sums=('SKIP'
-            '439436d02724c07af95f509647238f271f4717958dcf42dc5adb5a8e6a2108e7'
-            'da9b9c1cf8ce5ee77f7963a6ffecc2abfbc8d0e3c4ea88a49646c0c98a480e46')
+            'd8c685dad9202dade216d650a3c1f3a8be48e8cd71ca5504960e50b448778e3c')
 
 pkgver() {
   cd "$srcdir/$_realname"
@@ -70,8 +73,7 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}"/${_realname}
-  patch -p1 -i "${srcdir}"/0005-Include-glext-h.patch
-  patch -p1 -i "${srcdir}"/0006-No-X11-on-_WIN32.patch
+  patch -p1 -i "${srcdir}"/0001-fix-zbar-linking.patch
 
   NOCONFIGURE=1 ./autogen.sh
 }

diff --git a/mingw-w64-gst-plugins-base-git/PKGBUILD b/mingw-w64-gst-plugins-base-git/PKGBUILD
@@ -6,24 +6,27 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=r15566.a1a2a33
+pkgver=r18791.bec7f4ad5
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)"
 arch=('any')
 url="https://gstreamer.freedesktop.org/"
 license=("LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
-depends=("${MINGW_PACKAGE_PREFIX}-freetype"
-         "${MINGW_PACKAGE_PREFIX}-libvorbis"
+makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
+             "automake"
+             "git"
+             "libtool")
+depends=("${MINGW_PACKAGE_PREFIX}-graphene"
+         "${MINGW_PACKAGE_PREFIX}-gstreamer"
+         "${MINGW_PACKAGE_PREFIX}-libogg"
          "${MINGW_PACKAGE_PREFIX}-libtheora"
+         "${MINGW_PACKAGE_PREFIX}-libvorbis"
          "${MINGW_PACKAGE_PREFIX}-libvorbisidec"
+         "${MINGW_PACKAGE_PREFIX}-opus"
+         "${MINGW_PACKAGE_PREFIX}-orc"
          "${MINGW_PACKAGE_PREFIX}-pango"
-         #"${MINGW_PACKAGE_PREFIX}-libvisual"
-         #"${MINGW_PACKAGE_PREFIX}-cdparanoia"
-         "${MINGW_PACKAGE_PREFIX}-gstreamer-git"
-         "${MINGW_PACKAGE_PREFIX}-orc")
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 options=(!libtool strip staticlibs)
 source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-base.git")
 sha256sums=('SKIP')

diff --git a/mingw-w64-gst-plugins-good-git/PKGBUILD b/mingw-w64-gst-plugins-good-git/PKGBUILD
@@ -6,25 +6,33 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=r16326.7fb278d
-pkgrel=2
+pkgver=r17595.c4d13683f
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)"
 arch=('any')
 url="https://gstreamer.freedesktop.org/"
 license=("LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config")
-depends=("${MINGW_PACKAGE_PREFIX}-cairo"
+makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc")
+depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
+         "${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-flac"
          "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
-         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base-git"
+         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
+         "${MINGW_PACKAGE_PREFIX}-gtk3"
+         "${MINGW_PACKAGE_PREFIX}-lame"
          "${MINGW_PACKAGE_PREFIX}-libcaca"
+         "${MINGW_PACKAGE_PREFIX}-libjpeg"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-libshout"
          "${MINGW_PACKAGE_PREFIX}-libsoup"
          "${MINGW_PACKAGE_PREFIX}-libvpx"
+         "${MINGW_PACKAGE_PREFIX}-mpg123"
          "${MINGW_PACKAGE_PREFIX}-speex"
          "${MINGW_PACKAGE_PREFIX}-taglib"
-         "${MINGW_PACKAGE_PREFIX}-wavpack")
+         "${MINGW_PACKAGE_PREFIX}-twolame"
+         "${MINGW_PACKAGE_PREFIX}-wavpack"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 options=(!libtool strip staticlibs)
 source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good.git")
 sha256sums=('SKIP')

diff --git a/mingw-w64-gst-plugins-ugly-git/PKGBUILD b/mingw-w64-gst-plugins-ugly-git/PKGBUILD
@@ -7,22 +7,19 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=r5356.4161c2e
-pkgrel=2
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (mingw-w64)"
 arch=('any')
 url="https://gstreamer.freedesktop.org/"
 license=("LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc")
 depends=("${MINGW_PACKAGE_PREFIX}-a52dec"
-         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base-git"
-         "${MINGW_PACKAGE_PREFIX}-lame"
+         "${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
+         "${MINGW_PACKAGE_PREFIX}-libcdio"
          "${MINGW_PACKAGE_PREFIX}-libdvdread"
-         "${MINGW_PACKAGE_PREFIX}-libmad"
          "${MINGW_PACKAGE_PREFIX}-libmpeg2"
-         "${MINGW_PACKAGE_PREFIX}-libcdio"
          "${MINGW_PACKAGE_PREFIX}-opencore-amr"
-         "${MINGW_PACKAGE_PREFIX}-twolame"
          "${MINGW_PACKAGE_PREFIX}-x264")
 options=(!libtool strip staticlibs)
 source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-ugly.git")

diff --git a/mingw-w64-gst-python-git/0002-msys2-fix-linking-errors.patch b/mingw-w64-gst-python-git/0002-msys2-fix-linking-errors.patch
@@ -1,7 +1,7 @@
-From 835e75d3e98a2860ffec1ffb4e4969a90efdee66 Mon Sep 17 00:00:00 2001
-From: Lubosz Sarnecki <lubosz@gmail.com>
-Date: Thu, 31 Jul 2014 12:32:21 +0200
-Subject: [PATCH 2/2] msys2: fix linking errors
+From 02a760b7c561015996d5068694e99049b6a4c59e Mon Sep 17 00:00:00 2001
+From: Philippe Renon <philippe_renon@yahoo.fr>
+Date: Thu, 29 Mar 2018 19:15:24 +0200
+Subject: [PATCH] msys2: fix linking errors
 
 * add python lib manually
 * fix libtool error: add no-undefined flag
@@ -13,7 +13,7 @@ Subject: [PATCH 2/2] msys2: fix linking errors
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am
-index ee94f7c..4f04707 100644
+index 64ff170..b431589 100644
 --- a/gi/overrides/Makefile.am
 +++ b/gi/overrides/Makefile.am
 @@ -1,6 +1,6 @@
@@ -26,18 +26,20 @@ index ee94f7c..4f04707 100644
  # We install everything in the gi/overrides folder
  pygioverridesdir = $(PYGI_OVERRIDES_DIR)
 diff --git a/plugin/Makefile.am b/plugin/Makefile.am
-index 042c2bc..4a9b60d 100644
+index e6452e1..be8ef8c 100644
 --- a/plugin/Makefile.am
 +++ b/plugin/Makefile.am
-@@ -8,6 +8,6 @@ INCLUDES = $(PYGOBJECT_CFLAGS) $(GST_CFLAGS)\
+@@ -8,8 +8,8 @@ INCLUDES = $(PYGOBJECT_CFLAGS) $(GST_CFLAGS)\
  	$(PYTHON_INCLUDES)
 
- libgstpythonplugin_la_SOURCES = gstpythonplugin.c 
--libgstpythonplugin_la_LDFLAGS = -avoid-version -shrext $(PYTHON_SO)
--libgstpythonplugin_la_LIBADD =  $(PYTHON_LIBS) $(PYGOBJECT_LIBS) $(GST_LIBS)
-+libgstpythonplugin_la_LDFLAGS = -avoid-version -no-undefined -shrext $(PYTHON_SO)
-+libgstpythonplugin_la_LIBADD =  $(PYTHON_LIBS) $(PYGOBJECT_LIBS) $(GST_LIBS) -lgmodule-2.0
- libgstpythonplugin_la_CFLAGS = $(GST_CFLAGS) $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(PYTHON_INCLUDES)
+ libgstpython_la_SOURCES = gstpythonplugin.c
+-libgstpython_la_LDFLAGS = -avoid-version -shrext $(PYTHON_SO)
+-libgstpython_la_LIBADD =  $(PYTHON_LIBS) $(PYGOBJECT_LIBS) $(GST_LIBS)
++libgstpython_la_LDFLAGS = -avoid-version -no-undefined -shrext $(PYTHON_SO)
++libgstpython_la_LIBADD =  $(PYTHON_LIBS) $(PYGOBJECT_LIBS) $(GST_LIBS) -lgmodule-2.0
+ libgstpython_la_CFLAGS = $(GST_CFLAGS) $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(PYTHON_INCLUDES)
+
+ EXTRA_DIST = \
 -- 
-2.0.4
+2.16.2