commit a72ab574a803d455083d3f2192ed3b997cbb6d3b Author: Danny Rawlins <contact@romster.me> Date: Sun Feb 20 01:32:04 2022 +1100 gst-plugins-base-32: 1.18.5 -> 1.20.0 diff --git a/gst-plugins-base-32/.footprint b/gst-plugins-base-32/.footprint index 3be011c..c0fdeb4 100644 --- a/gst-plugins-base-32/.footprint +++ b/gst-plugins-base-32/.footprint @@ -37,41 +37,41 @@ drwxr-xr-x root/root usr/lib32/gstreamer-1.0/include/gst/gl/ -rwxr-xr-x root/root usr/lib32/gstreamer-1.0/libgstximagesink.so -rwxr-xr-x root/root usr/lib32/gstreamer-1.0/libgstxvimagesink.so lrwxrwxrwx root/root usr/lib32/libgstallocators-1.0.so -> libgstallocators-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstallocators-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstallocators-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstapp-1.0.so -> libgstapp-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstapp-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstapp-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstaudio-1.0.so -> libgstaudio-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstaudio-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstaudio-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstfft-1.0.so -> libgstfft-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstfft-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstfft-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstgl-1.0.so -> libgstgl-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstgl-1.0.so.0 -> libgstgl-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstgl-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstgl-1.0.so.0 -> libgstgl-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstgl-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstpbutils-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstpbutils-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstriff-1.0.so -> libgstriff-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstriff-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstriff-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstrtp-1.0.so -> libgstrtp-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstrtp-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstrtp-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstrtsp-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstrtsp-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstsdp-1.0.so -> libgstsdp-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstsdp-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstsdp-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgsttag-1.0.so -> libgsttag-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgsttag-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgsttag-1.0.so.0.2000.0 lrwxrwxrwx root/root usr/lib32/libgstvideo-1.0.so -> libgstvideo-1.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.1805.0 --rwxr-xr-x root/root usr/lib32/libgstvideo-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib32/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.2000.0 +-rwxr-xr-x root/root usr/lib32/libgstvideo-1.0.so.0.2000.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/gstreamer-allocators-1.0.pc -rw-r--r-- root/root usr/lib32/pkgconfig/gstreamer-app-1.0.pc diff --git a/gst-plugins-base-32/.signature b/gst-plugins-base-32/.signature index beb06fa..618ff6e 100644 --- a/gst-plugins-base-32/.signature +++ b/gst-plugins-base-32/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXcqZGjlfZd9HDaIuDwMgyxGr83aStFBRd4iblm5pK0B87cNj6FJq6OTkodraQ9HLc+9q+cWzmrrRB+rXbIVEwA4= -SHA256 (Pkgfile) = cc8de49af8501115fd8d1e4c572c67c0d5ca7e1dbbb2abdaebd209d243b4b68e -SHA256 (.footprint) = 76559c4d11b7369b14a9aedef31ed3b5ed276fd581908fa7c1561f219158aaea -SHA256 (gst-plugins-base-1.18.5.tar.xz) = 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 -SHA256 (qt5-option.patch) = 39a60664a64b4566b5fc961a1c16752f8771bfdabba93e988fd9d3d2e5de56e0 +RWSwxGo/zH7eXcDmFoC2emEF97OZSq4kQ+aq8AtysIXjVcMjvpU7ExbBUIiTshkga2fSK5PQxWWZepHU8S+MlM68Oqn3m4DfBwM= +SHA256 (Pkgfile) = dacc0832ea963e55806bff390866417cea7aac21a1e5ecf6854b7ddd45216e26 +SHA256 (.footprint) = 1af26878dac740ccbac6026d2865e22c36a2a9b612bce529b7ce40d1a3bfdf30 +SHA256 (gst-plugins-base-1.20.0.tar.xz) = 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c diff --git a/gst-plugins-base-32/Pkgfile b/gst-plugins-base-32/Pkgfile index 298ca91..a18d443 100644 --- a/gst-plugins-base-32/Pkgfile +++ b/gst-plugins-base-32/Pkgfile @@ -5,10 +5,9 @@ # Optional: cdparanoia-32 name=gst-plugins-base-32 -version=1.18.5 +version=1.20.0 release=1 -source=(https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$ver... - qt5-option.patch) +source=(https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$ver...) build() { # decide accordingly to what mesa builds with @@ -21,7 +20,6 @@ build() { PKGMK_GST_GLAPI+=',opengl' \ PKGMK_GST_WINDOW+=',x11' - patch -Np1 -d gst-plugins-base-$version -i $SRC/qt5-option.patch export PKG_CONFIG_PATH='/usr/lib32/pkgconfig:/usr/share/pkgconfig' meson setup build gst-plugins-base-$version \ diff --git a/gst-plugins-base-32/qt5-option.patch b/gst-plugins-base-32/qt5-option.patch deleted file mode 100644 index 7d00c21..0000000 --- a/gst-plugins-base-32/qt5-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6643e941beb5a5cc00e220e841d2cb90fa2d8330 Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne <nicolas.dufresne@collabora.com> -Date: Tue, 15 Sep 2020 14:15:36 -0400 -Subject: [PATCH] meson: Add a qt5 feature - -This allow opting out items of the builds the depends on QT5 library. -Auto-detection of QT5 in cross-build requires host tools to match with the -sysroot, and detection of mis-match is not fully reliable. - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/817> ---- - meson_options.txt | 1 + - tests/examples/gl/qt/meson.build | 4 ++++ - tests/examples/overlay/meson.build | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index bb3cb3c4e..7010b9162 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -79,6 +79,7 @@ option('glib-asserts', type : 'feature', value : 'enabled', yield : true, - description: 'Enable GLib assertion (auto = enabled for development, disabled for stable releases)') - option('glib-checks', type : 'feature', value : 'enabled', yield : true, - description: 'Enable GLib checks such as API guards (auto = enabled for development, disabled for stable releases)') -+option('qt5', type : 'feature', value : 'auto', yield : true, description : 'Qt5 QML examples') - - # Common options - option('package-name', type : 'string', yield : true, -diff --git a/tests/examples/gl/qt/meson.build b/tests/examples/gl/qt/meson.build -index ed0a0b0bb..66f3d93e7 100644 ---- a/tests/examples/gl/qt/meson.build -+++ b/tests/examples/gl/qt/meson.build -@@ -1,3 +1,7 @@ -+if get_option('qt5').disabled() -+ subdir_done() -+endif -+ - qt5_mod = import('qt5') - - qt5gui_dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets'], required : false) -diff --git a/tests/examples/overlay/meson.build b/tests/examples/overlay/meson.build -index b343f6598..926e9f3d7 100644 ---- a/tests/examples/overlay/meson.build -+++ b/tests/examples/overlay/meson.build -@@ -1,3 +1,7 @@ -+if get_option('qt5').disabled() -+ subdir_done() -+endif -+ - if x11_dep.found() - if gtk_x11_dep.found() - executable('gtk-videooverlay', 'gtk-videooverlay.c', --- -GitLab -