diff --git a/mingw-w64-gst-editing-services-git/PKGBUILD b/mingw-w64-gst-editing-services-git/PKGBUILD index 36ccd4d86a9d..fe8f4a571f79 100644 --- 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 index 65de61b524c6..9ccdedff9bc3 100644 --- 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 new file mode 100644 index 000000000000..9ebd6998663d --- /dev/null +++ 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 deleted file mode 100644 index 51ab25833586..000000000000 --- a/mingw-w64-gst-plugins-bad-git/0005-Include-glext-h.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN gst-plugins-bad-1.6.1.orig/tests/examples/gl/sdl/sdlshare.c gst-plugins-bad-1.6.1/tests/examples/gl/sdl/sdlshare.c ---- gst-plugins-bad-1.6.1.orig/tests/examples/gl/sdl/sdlshare.c 2015-11-02 18:28:09.641044400 +0000 -+++ gst-plugins-bad-1.6.1/tests/examples/gl/sdl/sdlshare.c 2015-11-02 18:28:12.358449300 +0000 -@@ -26,6 +26,7 @@ - #endif - - #include -+#include - #include "SDL/SDL.h" - #include "SDL/SDL_opengl.h" - -diff -urN gst-plugins-bad-1.6.1.orig/tests/examples/gl/sdl/sdlshare2.c gst-plugins-bad-1.6.1/tests/examples/gl/sdl/sdlshare2.c ---- gst-plugins-bad-1.6.1.orig/tests/examples/gl/sdl/sdlshare2.c 2015-11-02 18:28:09.641044400 +0000 -+++ gst-plugins-bad-1.6.1/tests/examples/gl/sdl/sdlshare2.c 2015-11-02 18:28:12.358449300 +0000 -@@ -26,6 +26,7 @@ - #endif - - #include -+#include - #include "SDL/SDL.h" - #include "SDL/SDL_opengl.h" - 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 deleted file mode 100644 index eb16edcda17e..000000000000 --- a/mingw-w64-gst-plugins-bad-git/0006-No-X11-on-_WIN32.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gst-plugins-bad-1.6.1/tests/examples/gl/gtk/3dvideo/main.cpp.orig 2015-10-22 09:04:08.000000000 +0100 -+++ gst-plugins-bad-1.6.1/tests/examples/gl/gtk/3dvideo/main.cpp 2015-11-02 18:30:09.348270600 +0000 -@@ -23,7 +23,9 @@ - #endif - - #include -+#if !defined(_WIN32) - #include -+#endif - - #include - #include -@@ -259,7 +261,9 @@ - GtkWidget *area, *combo, *w; - const gchar *uri; - -+#if !defined(_WIN32) - XInitThreads (); -+#endif - - gst_init (&argc, &argv); - gtk_init (&argc, &argv); diff --git a/mingw-w64-gst-plugins-bad-git/PKGBUILD b/mingw-w64-gst-plugins-bad-git/PKGBUILD index d3f89dfc3409..5da7c1ce6101 100644 --- 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 index b471a06687a0..b3e0ac954f0e 100644 --- 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 index b637106874a7..a4335c685b75 100644 --- 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 index 89376b81bd43..fb1c77a41215 100644 --- 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 index 4e3105aacf62..1d1a4583c507 100644 --- 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 -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 +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 diff --git a/mingw-w64-gst-python-git/0004-add-overrides.patch b/mingw-w64-gst-python-git/0004-add-overrides.patch deleted file mode 100644 index 0cf41006bc06..000000000000 --- a/mingw-w64-gst-python-git/0004-add-overrides.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/gi/__init__.py b/gi/__init__.py -new file mode 100644 -index 0000000..09d180b ---- /dev/null -+++ b/gi/__init__.py -@@ -0,0 +1,29 @@ -+#!/usr/bin/env python -+# -+# __init__.py -+# -+# Copyright (C) 2012 Thibault Saunier -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2.1 of the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this program; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3, or (at your option) -+# any later version. -+ -+ -+from pkgutil import extend_path -+ -+__path__ = extend_path(__path__, __name__) -diff --git a/gi/overrides/__init__.py b/gi/overrides/__init__.py -new file mode 100644 -index 0000000..802630a ---- /dev/null -+++ b/gi/overrides/__init__.py -@@ -0,0 +1,4 @@ -+from pkgutil import extend_path -+ -+__path__ = extend_path(__path__, __name__) -+print __path__, __name__ --- -cgit v0.10.2 - diff --git a/mingw-w64-gst-python-git/0005-unix-override-dir.patch b/mingw-w64-gst-python-git/0005-unix-override-dir.patch deleted file mode 100644 index 2ae86f8b866d..000000000000 --- a/mingw-w64-gst-python-git/0005-unix-override-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gst-python-1.4.0/configure.ac.orig 2015-07-21 14:34:06.163625200 +0300 -+++ gst-python-1.4.0/configure.ac 2015-07-21 14:34:25.981643200 +0300 -@@ -101,11 +101,7 @@ - - AC_MSG_CHECKING(for pygobject overrides directory) - if test "x$with_pygi_overrides_dir" = "x" ; then -- overrides_dir="`$PYTHON -c 'import gi; print(gi._overridesdir)' 2>/dev/null`" -- # fallback if the previous failed -- if test "x$overrides_dir" = "x" ; then - overrides_dir="${pyexecdir}/gi/overrides" -- fi - else - overrides_dir="$with_pygi_overrides_dir" - fi diff --git a/mingw-w64-gst-python-git/PKGBUILD b/mingw-w64-gst-python-git/PKGBUILD index bcf073f58b24..f9ad5d95ef89 100644 --- a/mingw-w64-gst-python-git/PKGBUILD +++ b/mingw-w64-gst-python-git/PKGBUILD @@ -3,61 +3,103 @@ _realname=gst-python pkgbase=mingw-w64-${_realname}-git -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.8.3 +pkgname=("${MINGW_PACKAGE_PREFIX}-gst-python-git" "${MINGW_PACKAGE_PREFIX}-gst-python2-git") +provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") +conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=r1383.31c3304 pkgrel=1 pkgdesc="GStreamer GObject Introspection overrides for Python 3 (mingw-w64)" arch=('any') license=('LGPL') -depends=("${MINGW_PACKAGE_PREFIX}-gstreamer-git" - "${MINGW_PACKAGE_PREFIX}-python3-gobject" - "${MINGW_PACKAGE_PREFIX}-gobject-introspection") +makedepends=("${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-pygobject-devel" + "${MINGW_PACKAGE_PREFIX}-python2-gobject" + "${MINGW_PACKAGE_PREFIX}-python3-gobject") makedepends=('git') url='https://gstreamer.freedesktop.org/modules/gst-python.html' options=(!libtool strip staticlibs) - -source=(https://gstreamer.freedesktop.org/src/gst-python/${_realname}-${pkgver}.tar.xz +source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-python.git" '0001-msys2-python3-config-returns-1-so-use-which.patch' - '0002-msys2-fix-linking-errors.patch' - '0004-add-overrides.patch' - '0005-unix-override-dir.patch') -sha256sums=('149e7b9c2c361832bc765d39bce004d1ffe1b330c09c42dc902ca48867e804ce' + '0002-msys2-fix-linking-errors.patch') +sha256sums=('SKIP' '836cf2e9e713705e5fd0f09d4e38d3de839a3c663eb6fa85f0a3f9a5f0b224ee' - 'dc4cd0f1890d82e5d09e667763b6a7c1731864e3ddfe4f0ff42d3e83de4def20' - '04f94d86379280d6a4d7970dd149f31ef9ea04f5151dc6f9be474069570366ac' - '00803a24df44a66e6116b1a01fa381903216a4409a4926e05b43a34dea224c08') + '9b4400e0e468888cded57c7269e2deb8f8c6dae9491282469a8c631fc33f7183') + +pkgver() { + cd "$srcdir/$_realname" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} prepare() { - cd ${_realname}-${pkgver} + cd ${_realname} patch -p1 -i ${srcdir}/0001-msys2-python3-config-returns-1-so-use-which.patch patch -p1 -i ${srcdir}/0002-msys2-fix-linking-errors.patch - patch -p1 -i ${srcdir}/0004-add-overrides.patch - patch -p1 -i ${srcdir}/0005-unix-override-dir.patch - WANT_AUTOMAKE=latest autoreconf -fiv + NOCONFIGURE=1 ./autogen.sh } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p build-${MINGW_CHOST} - cd "${srcdir}/build-${MINGW_CHOST}" - - PYTHON=${MINGW_PREFIX}/bin/python3 \ - ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ - --bindir=${MINGW_PREFIX}/bin \ - --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --disable-silent-rules - make -} - -package() { - cd build-${MINGW_CHOST} + rm -rf python{2,3}-build devel || true + mkdir python{2,3}-build devel + + for builddir in python{2,3}-build; do + pushd ${builddir} > /dev/null + PYTHON=${MINGW_PREFIX}/bin/${builddir%-build} \ + ../${_realname}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --disable-silent-rules + make + popd > /dev/null + done +} + +package_gst-python() { + pkgdesc="GStreamer GObject Introspection overrides for Python 3 (mingw-w64)" + depends=("${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-python3-gobject") + + cd python3-build make DESTDIR="${pkgdir}" install - mv ${pkgdir}${MINGW_PREFIX}/lib/bin/*.dll ${pkgdir}${MINGW_PREFIX}/lib/gstreamer-1.0/ - rm -rf ${pkgdir}${MINGW_PREFIX}/lib/bin + mv "${pkgdir}${MINGW_PREFIX}"/lib/bin/*.dll "${pkgdir}${MINGW_PREFIX}"/lib/gstreamer-1.0/ + rm -rf "${pkgdir}${MINGW_PREFIX}/lib/bin" + + # The python plugin loader makes problems because it links against libpython + # which might be in conflict one already used loading the plugin. + # The overrides don't need it so just remove it for now. + # https://github.com/Alexpux/MINGW-packages/issues/2034 + rm -r "${pkgdir}${MINGW_PREFIX}/lib/gstreamer-1.0" +} + +package_gst-python2() { + pkgdesc="GStreamer GObject Introspection overrides for Python 2 (mingw-w64)" + depends=("${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-python2-gobject") + + cd python2-build + make DESTDIR="${pkgdir}" install + + # See other package() + rm -r "${pkgdir}${MINGW_PREFIX}/lib/gstreamer-1.0" +} + +package_mingw-w64-i686-gst-python2-git() { + package_gst-python2 +} + +package_mingw-w64-i686-gst-python-git() { + package_gst-python +} + +package_mingw-w64-x86_64-gst-python2-git() { + package_gst-python2 +} + +package_mingw-w64-x86_64-gst-python-git() { + package_gst-python } diff --git a/mingw-w64-gst-rtsp-server-git/.gitignore b/mingw-w64-gst-rtsp-server-git/.gitignore new file mode 100644 index 000000000000..a6f28956278b --- /dev/null +++ b/mingw-w64-gst-rtsp-server-git/.gitignore @@ -0,0 +1 @@ +gst-rtsp-server diff --git a/mingw-w64-gst-rtsp-server-git/PKGBUILD b/mingw-w64-gst-rtsp-server-git/PKGBUILD index f83f73bd1c04..2968bb4bb637 100644 --- a/mingw-w64-gst-rtsp-server-git/PKGBUILD +++ b/mingw-w64-gst-rtsp-server-git/PKGBUILD @@ -3,17 +3,16 @@ _realname=gst-rtsp-server pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=1.10.0 -pkgrel=2 +provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") +conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=r1501.988db52 +pkgrel=1 pkgdesc="GStreamer RTSP server library (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" - "intltool" - "gtk-doc" +makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" "flex" "bison") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" @@ -27,20 +26,27 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=(!libtool strip staticlibs) -source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz) -sha256sums=('aa72a94cccdd2387ad25dc65c5c0b1f76269c3997cbde348232eec2a1565b3cd') +source=("${_realname}::git+https://anongit.freedesktop.org/git/gstreamer/gst-rtsp-server") +sha256sums=('SKIP') + +pkgver() { + cd "$srcdir/$_realname" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} prepare() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${_realname} NOCONFIGURE=1 ./autogen.sh } build() { + _pkgver=${_realname}-${pkgver} # How it's tagged in git + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ../${_realname}-${pkgver}/configure \ + ../${_realname}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -56,6 +62,7 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" make -j1 DESTDIR="${pkgdir}" install + find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a } diff --git a/mingw-w64-gstreamer-git/PKGBUILD b/mingw-w64-gstreamer-git/PKGBUILD index 44f182975548..61225a0e5b80 100644 --- a/mingw-w64-gstreamer-git/PKGBUILD +++ b/mingw-w64-gstreamer-git/PKGBUILD @@ -6,17 +6,15 @@ pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=r17279.f08c8d2 +pkgver=r18134.f5f1fb578 pkgrel=1 pkgdesc="GStreamer Multimedia Framework (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" - "intltool" - "gtk-doc" +makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" + "${MINGW_PACKAGE_PREFIX}-perl" "flex" "bison") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" @@ -66,7 +64,6 @@ build() { --enable-introspection \ --disable-poisoning \ --disable-gtk-doc \ - --enable-docbook \ --enable-check \ --disable-silent-rules \ "${extra_config[@]}"