[arch-commits] Commit in gst-plugins-bad/trunk (2 files)

[Jan Steffens via arch-commits]

Date: Tuesday, October 27, 2020 @ 12:53:38
  Author: heftig
Revision: 398880

1.18.1-1

Modified:
  gst-plugins-bad/trunk/PKGBUILD
Deleted:
  gst-plugins-bad/trunk/0001-opencv-allow-compilation-against-4.5.x.patch

---+
 0001-opencv-allow-compilation-against-4.5.x.patch |   22 
 PKGBUILD  |   12 --
 2 files changed, 5 insertions(+), 29 deletions(-)

Deleted: 0001-opencv-allow-compilation-against-4.5.x.patch
===
--- 0001-opencv-allow-compilation-against-4.5.x.patch   2020-10-27 12:51:19 UTC 
(rev 398879)
+++ 0001-opencv-allow-compilation-against-4.5.x.patch   2020-10-27 12:53:38 UTC 
(rev 398880)
@@ -1,22 +0,0 @@
-From  Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Mon, 26 Oct 2020 16:24:08 +0100
-Subject: [PATCH] opencv: allow compilation against 4.5.x
-

- ext/opencv/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index 074272a9c..e3d1865da 100644
 a/ext/opencv/meson.build
-+++ b/ext/opencv/meson.build
-@@ -66,7 +66,7 @@ if opencv_found
- endif
-   endforeach
- else
--  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.5.0'], 
required : false)
-+  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.6.0'], 
required : false)
-   opencv_found = opencv_dep.found()
-   if opencv_found
- foreach h : libopencv4_headers

Modified: PKGBUILD
===
--- PKGBUILD2020-10-27 12:51:19 UTC (rev 398879)
+++ PKGBUILD2020-10-27 12:53:38 UTC (rev 398880)
@@ -3,7 +3,7 @@
 
 pkgbase=gst-plugins-bad
 pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv)
-pkgver=1.18.0+54+gbd3532008
+pkgver=1.18.1
 pkgrel=1
 pkgdesc="Multimedia graph framework - bad plugins"
 url="https://gstreamer.freedesktop.org/;
@@ -23,11 +23,9 @@
  zxing-cpp opencv libva)
 checkdepends=(xorg-server-xvfb)
 options=(!emptydirs)
-_commit=bd3532008f2a12377c2d5b56e93cbfa53e1979cf  # 1.18
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit;
-0001-opencv-allow-compilation-against-4.5.x.patch)
-sha256sums=('SKIP'
-'b310123298a4de09033c84b6e2a1ec01c7122320cddc3bff655c42c56d21d064')
+_commit=e5c3c106a2da607953fea36e3a253b382c939684  # tags/1.18.1^0
+source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit;)
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
@@ -37,7 +35,7 @@
 prepare() {
   cd $pkgbase
   git cherry-pick -n 3ea6387f969c0b08027fc959b8b8cd102708bceb  # Fix 
svthevcenc test
-  git apply -3 ../0001-opencv-allow-compilation-against-4.5.x.patch
+  git cherry-pick -n 77f28ee3e71d1c5bd8278967963b08b226515dd1  # opencv 4.5
 }
 
 build() {

[arch-commits] Commit in gst-plugins-bad/trunk (2 files)

[Jan Steffens via arch-commits]

Date: Saturday, May 9, 2020 @ 18:16:15
  Author: heftig
Revision: 382964

1.16.2-10: openexr rebuild

Added:
  gst-plugins-bad/trunk/0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
Modified:
  gst-plugins-bad/trunk/PKGBUILD

-+
 0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch |   46 ++
 PKGBUILD|   14 -
 2 files changed, 57 insertions(+), 3 deletions(-)

Added: 0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
===
--- 0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch 
(rev 0)
+++ 0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch 2020-05-09 18:16:15 UTC 
(rev 382964)
@@ -0,0 +1,46 @@
+From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Sat, 9 May 2020 19:59:46 +0200
+Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE
+
+This was removed in Vulkan 1.2.140.
+
+> Shortly after 2020-04-24, we will be removing the automatically
+> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE`
+> tokens from the Vulkan headers. These tokens are currently defined for
+> some enumerated types, but are explicitly not part of the Vulkan API.
+> They existed only to support some Vulkan implementation internals,
+> which no longer require them. We will be accepting comments on this
+> topic in [#1230], but we strongly suggest any external projects using
+> these tokens immediately migrate away from them.
+
+[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230
+---
+ ext/vulkan/vkerror.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c
+index 3fec27e4d..c91589d9b 100644
+--- a/ext/vulkan/vkerror.c
 b/ext/vulkan/vkerror.c
+@@ -27,7 +27,7 @@
+ #include "vkerror.h"
+ 
+ /* *INDENT-OFF* */
+-static const struct 
++static const struct
+ {
+   VkResult result;
+   const char *str;
+@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
+ 
+   if (result >= 0)
+ return NULL;
+-  if (result < VK_RESULT_BEGIN_RANGE)
+-return "Unknown Error";
+ 
+   for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
+ if (result == vk_result_string_map[i].result)
+-- 
+2.26.2
+

Modified: PKGBUILD
===
--- PKGBUILD2020-05-09 18:15:11 UTC (rev 382963)
+++ PKGBUILD2020-05-09 18:16:15 UTC (rev 382964)
@@ -4,7 +4,7 @@
 pkgbase=gst-plugins-bad
 pkgname=(gst-plugins-bad-libs gst-plugins-bad)
 pkgver=1.16.2
-pkgrel=9
+pkgrel=10
 pkgdesc="GStreamer open-source multimedia framework bad plugins"
 url="https://gstreamer.freedesktop.org/;
 arch=(x86_64)
@@ -22,8 +22,10 @@
 checkdepends=(xorg-server-xvfb)
 options=(!emptydirs)
 _commit=a6f26408f74a60d02ce6b4f0daee392ce847055f  # tags/1.16.2^0
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit;)
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit;
+0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch)
+sha256sums=('SKIP'
+'0c6c51a371d8f381a2190280913cc41e06c17c25dbb1167043072003b3f0d338')
 
 pkgver() {
   cd $pkgbase
@@ -35,6 +37,12 @@
 
   # Fix build with neon 0.31
   git cherry-pick -n f10b424418e448211e3427a76fcd046e157ef0b7
+
+  # Fix build with vulkan-headers 1.2.140
+  git apply -3 ../0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
+
+  # Fix build with GCC 10
+  git cherry-pick -n a0cd455dd0e0375c6395fe732173225ea7e18562
 }
 
 build() {

[arch-commits] Commit in gst-plugins-bad/trunk (2 files)

[Jan Steffens]

Date: Wednesday, September 23, 2015 @ 23:58:21
  Author: heftig
Revision: 247185

1.5.91

Modified:
  gst-plugins-bad/trunk/PKGBUILD
Deleted:
  gst-plugins-bad/trunk/fix-faad2-version-check.patch

---+
 PKGBUILD  |   14 --
 fix-faad2-version-check.patch |   35 ---
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-23 21:45:53 UTC (rev 247184)
+++ PKGBUILD2015-09-23 21:58:21 UTC (rev 247185)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=gst-plugins-bad
-pkgver=1.4.5
-pkgrel=4
+pkgver=1.5.91
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Bad Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,17 +12,11 @@
 makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 
'python' 'valgrind' 'wildmidi' 'librsvg'
  'gobject-introspection' 'gtk-doc' 'gtk3' 'clutter' 'opencv' 
'libtiger' 'ladspa' 'openal' 'libusb')
 options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
-fix-faad2-version-check.patch)
-sha256sums=('152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c'
-'741492ae7a9518603fc51d87ae331d882f075547ea7fdec19c60f399085f18cc')
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('193534a17c4338f8e8fa2f1720e6f61557e72ee6a6985d551020f63226a0c810')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=748571
-  patch -Np1 -i ../fix-faad2-version-check.patch
-
   autoreconf -vi
 }
 

Deleted: fix-faad2-version-check.patch
===
--- fix-faad2-version-check.patch   2015-09-23 21:45:53 UTC (rev 247184)
+++ fix-faad2-version-check.patch   2015-09-23 21:58:21 UTC (rev 247185)
@@ -1,35 +0,0 @@
-From 1f738ca5b8711ca5532a326cd646312e60484863 Mon Sep 17 00:00:00 2001
-From: Wim Taymans 
-Date: Wed, 13 May 2015 16:23:26 +0200
-Subject: fix faad2 version check
-
-On fedora 22, the output of cpp inserts extra debug comments, which
-makes our regexp for the faad2 version check fail. This in turn causes
-it to compile with the wrong arguments passed which then causes stack
-corruption and crashes.
-
-Fix this by only checking for the version (which should be by itself on
-a single line). This is potentially less safe, it might be possible that
-a similar string would appear in a later version in the header file.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
-
-diff --git a/configure.ac b/configure.ac
-index f5ce28c..d295253 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -2008,9 +2008,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
-   AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr])
-   for minor in 10 9 8 7 6 5 0; do
- if test x$faad2_minor_version = "x"; then
--  AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [
-+  AC_EGREP_CPP([\"2\.$minor\"$], [
-   #include <$faad_hdr>
--  GST_CHECK_FAAD_VERSION FAAD2_VERSION
-+  FAAD2_VERSION
- ], [
-   faad2_minor_version=$minor
- ])
--- 
-cgit v0.10.2
-

[arch-commits] Commit in gst-plugins-bad/trunk (2 files)

[Evangelos Foutras]

Date: Sunday, June 21, 2015 @ 15:22:01
  Author: foutrelis
Revision: 241157

upgpkg: gst-plugins-bad 1.4.5-4

Fix faad2 version check; fixes crashes in Firefox (FS#45403).

Added:
  gst-plugins-bad/trunk/fix-faad2-version-check.patch
Modified:
  gst-plugins-bad/trunk/PKGBUILD

---+
 PKGBUILD  |   17 ++---
 fix-faad2-version-check.patch |   35 +++
 2 files changed, 49 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-21 12:10:49 UTC (rev 241156)
+++ PKGBUILD2015-06-21 13:22:01 UTC (rev 241157)
@@ -3,7 +3,7 @@
 
 pkgname=gst-plugins-bad
 pkgver=1.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc=GStreamer Multimedia Framework Bad Plugins
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,9 +12,20 @@
 makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 
'python' 'valgrind' 'wildmidi' 'librsvg'
  'gobject-introspection' 'gtk-doc' 'gtk3' 'clutter' 'opencv' 
'libtiger' 'ladspa' 'openal' 'libusb')
 options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c')
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
+fix-faad2-version-check.patch)
+sha256sums=('152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c'
+'741492ae7a9518603fc51d87ae331d882f075547ea7fdec19c60f399085f18cc')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=748571
+  patch -Np1 -i ../fix-faad2-version-check.patch
+
+  autoreconf -vi
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: fix-faad2-version-check.patch
===
--- fix-faad2-version-check.patch   (rev 0)
+++ fix-faad2-version-check.patch   2015-06-21 13:22:01 UTC (rev 241157)
@@ -0,0 +1,35 @@
+From 1f738ca5b8711ca5532a326cd646312e60484863 Mon Sep 17 00:00:00 2001
+From: Wim Taymans wtaym...@redhat.com
+Date: Wed, 13 May 2015 16:23:26 +0200
+Subject: fix faad2 version check
+
+On fedora 22, the output of cpp inserts extra debug comments, which
+makes our regexp for the faad2 version check fail. This in turn causes
+it to compile with the wrong arguments passed which then causes stack
+corruption and crashes.
+
+Fix this by only checking for the version (which should be by itself on
+a single line). This is potentially less safe, it might be possible that
+a similar string would appear in a later version in the header file.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
+
+diff --git a/configure.ac b/configure.ac
+index f5ce28c..d295253 100644
+--- a/configure.ac
 b/configure.ac
+@@ -2008,9 +2008,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
+   AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr])
+   for minor in 10 9 8 7 6 5 0; do
+ if test x$faad2_minor_version = x; then
+-  AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \2\.$minor\], [
++  AC_EGREP_CPP([\2\.$minor\$], [
+   #include $faad_hdr
+-  GST_CHECK_FAAD_VERSION FAAD2_VERSION
++  FAAD2_VERSION
+ ], [
+   faad2_minor_version=$minor
+ ])
+-- 
+cgit v0.10.2
+