From 6e29f13d64788650c98de5af310d4e3cbf8a0965 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 13 Aug 2022 15:03:23 +0200
Subject: 20220813.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 .../gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild      | 2 +-
 multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info     | 6 +++---
 multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild             | 5 ++---
 multimedia/gst-plugins-ugly/gst-plugins-ugly.info                   | 6 +++---
 multimedia/obs-studio/obs-studio.SlackBuild                         | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
index 5fdcb0305a..12998094ba 100644
--- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
+++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
@@ -32,7 +32,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-plugins-bad-nonfree
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.20.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
index 43340d39f2..75949728c2 100644
--- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
+++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-bad-nonfree"
-VERSION="1.18.5"
+VERSION="1.20.2"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz"
-MD5SUM="4ab1c19c3cf1ba79c20c65f6be78e7fd"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz"
+MD5SUM="1c537891ea5c412f5e71a632e9e6d96c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index d5d9e11406..23e7855262 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.20.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -90,8 +90,7 @@ cd build
     --localstatedir=/var \
     --mandir=/usr/man \
     --prefix=/usr \
-    --sysconfdir=/etc \
-    -Dexamples=disabled
+    --sysconfdir=/etc
   "${NINJA:=ninja}"
   DESTDIR=$PKG $NINJA install
 cd ..
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index 5a55a8aa0f..de6daf1f92 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-ugly"
-VERSION="1.18.5"
+VERSION="1.20.2"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz"
-MD5SUM="049f90b7a3a72e241ad47564b5cd7a7a"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz"
+MD5SUM="62dcd0cb786ea10cc34c9927aa656aac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild
index 9f73bebebc..7cf7616d74 100644
--- a/multimedia/obs-studio/obs-studio.SlackBuild
+++ b/multimedia/obs-studio/obs-studio.SlackBuild
@@ -81,7 +81,7 @@ cd $CEF_ROOT
   strip -v Release/*.so
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=array-bounds" \
     -DCMAKE_BUILD_TYPE=Release .
   make libcef_dll_wrapper
   cd ..
-- 
cgit v1.2.3