[1/1] package/usbredir: bump to version 0.12.0

Drop all patches (already in version)

https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-meson-add-tests-option.patch         | 46 --------------
 ...002-meson-add-stack_protector-option.patch | 60 -------------------
 .../0003-meson.build-make-C-optional.patch    | 39 ------------
 package/usbredir/usbredir.hash                |  4 +-
 package/usbredir/usbredir.mk                  |  2 +-
 5 files changed, 3 insertions(+), 148 deletions(-)
 delete mode 100644 package/usbredir/0001-meson-add-tests-option.patch
 delete mode 100644 package/usbredir/0002-meson-add-stack_protector-option.patch
 delete mode 100644 package/usbredir/0003-meson.build-make-C-optional.patch

On 01/01/2022 23:05, Fabrice Fontaine wrote:
> Drop all patches (already in version)
> 
> https://gitlab.freedesktop.org/spice/usbredir/-/blob/usbredir-0.12.0/ChangeLog.md
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   .../0001-meson-add-tests-option.patch         | 46 --------------
>   ...002-meson-add-stack_protector-option.patch | 60 -------------------
>   .../0003-meson.build-make-C-optional.patch    | 39 ------------
>   package/usbredir/usbredir.hash                |  4 +-
>   package/usbredir/usbredir.mk                  |  2 +-
>   5 files changed, 3 insertions(+), 148 deletions(-)
>   delete mode 100644 package/usbredir/0001-meson-add-tests-option.patch
>   delete mode 100644 package/usbredir/0002-meson-add-stack_protector-option.patch
>   delete mode 100644 package/usbredir/0003-meson.build-make-C-optional.patch
> 
> diff --git a/package/usbredir/0001-meson-add-tests-option.patch b/package/usbredir/0001-meson-add-tests-option.patch
> deleted file mode 100644
> index b2df1587b1..0000000000
> --- a/package/usbredir/0001-meson-add-tests-option.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From 8490a7ac101d4ee0a78c44b252d3b7a6c2508c74 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sat, 21 Aug 2021 11:55:48 +0200
> -Subject: [PATCH] meson: add tests option
> -
> -Add tests option to allow the user to disable them
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Retrieved from:
> -https://gitlab.freedesktop.org/spice/usbredir/-/commit/8490a7ac101d4ee0a78c44b252d3b7a6c2508c74]
> ----
> - meson.build       | 4 +++-
> - meson_options.txt | 5 +++++
> - 2 files changed, 8 insertions(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 6e773a7..a6d21b8 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -106,7 +106,9 @@ if host_machine.system() != 'windows'
> -         subdir('fuzzing')
> -     endif
> - endif
> --subdir('tests')
> -+if get_option('tests').enabled()
> -+    subdir('tests')
> -+endif
> - subdir('data')
> -
> - summary(summary_info, bool_yn: true)
> -diff --git a/meson_options.txt b/meson_options.txt
> -index b35732b..63e8c85 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -21,3 +21,8 @@ option('tools',
> -     type : 'feature',
> -     value : 'enabled',
> -     description : 'Build usbredir\'s tools such as usbredirect')
> -+
> -+option('tests',
> -+    type : 'feature',
> -+    value : 'enabled',
> -+    description : 'Build usbredir\'s tests such as filter')
> ---
> -GitLab
> -
> diff --git a/package/usbredir/0002-meson-add-stack_protector-option.patch b/package/usbredir/0002-meson-add-stack_protector-option.patch
> deleted file mode 100644
> index 613e2714e3..0000000000
> --- a/package/usbredir/0002-meson-add-stack_protector-option.patch
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -From 54cf1897ef3aa4d0a35b5f4eb1f5c6928b033af5 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Fri, 24 Sep 2021 17:24:43 +0200
> -Subject: [PATCH] meson: add stack_protector option
> -
> -Add stack_protector option to allow the user to disable it as some
> -embedded toolchains don't support it which will result in the following
> -build failure:
> -
> -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: usbredirparser/libusbredirparser.so.1.1.0.p/usbredirparser.c.o: in function `va_log':
> -usbredirparser.c:(.text+0x1c4): undefined reference to `__stack_chk_guard'
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/40de5443e98157ad50c6841ea70a835cd5ad4fe9
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status:
> -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/53]
> ----
> - meson.build       | 6 +++++-
> - meson_options.txt | 5 +++++
> - 2 files changed, 10 insertions(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index a6d21b8..4350f53 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -17,8 +17,12 @@ cc_flags = [
> - if host_machine.system() != 'windows'
> -     cc_flags += [
> - 	'-Wp,-D_FORTIFY_SOURCE=2',
> --	'-fstack-protector',
> -     ]
> -+    if get_option('stack_protector').enabled()
> -+        cc_flags += [
> -+	    '-fstack-protector',
> -+        ]
> -+    endif
> - endif
> -
> - # Check if we are building from .git
> -diff --git a/meson_options.txt b/meson_options.txt
> -index 63e8c85..34dd392 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -17,6 +17,11 @@ option('fuzzing-install-dir',
> -     type : 'string',
> -     description : 'Installation directory for fuzzing binaries')
> -
> -+option('stack_protector',
> -+    type : 'feature',
> -+    value : 'enabled',
> -+    description : 'Build usbredir\'s with stack-protector')
> -+
> - option('tools',
> -     type : 'feature',
> -     value : 'enabled',
> ---
> -2.33.0
> -
> diff --git a/package/usbredir/0003-meson.build-make-C-optional.patch b/package/usbredir/0003-meson.build-make-C-optional.patch
> deleted file mode 100644
> index fe1ed3f698..0000000000
> --- a/package/usbredir/0003-meson.build-make-C-optional.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 55fc307d23d657b52433d1c8508467d0589754d5 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sat, 16 Oct 2021 15:45:57 +0200
> -Subject: [PATCH] meson.build: make C++ optional
> -
> -Remove cpp from meson project statement to make C++ optional and avoid
> -the following build failure when the toolchain does not provide a C++
> -compiler:
> -
> -../output-1/build/usbredir-0.11.0/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++']]
> -The following exception(s) were encountered:
> -Running "/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++ --version" gave "[Errno 2] No such file or directory: '/home/buildroot/autobuild/instance-3/output-1/host/bin/arm-linux-g++'"
> -
> -Indeed C++ is only required for fuzzing which is already handled by
> -meson through add_languages('cpp', required: true)
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/eca1d8a2b73a769354ab1d24c7996be30f152138
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status:
> -https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/55]
> ----
> - meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 49dbce4..ca19f22 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1,4 +1,4 @@
> --project('usbredir', 'c', 'cpp',
> -+project('usbredir', 'c',
> -     version: '0.11.0',
> -     license: 'LGPLv2.1+',
> -     meson_version : '>= 0.53',
> ---
> -2.33.0
> -
> diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash
> index e11d4aa720..f738c36690 100644
> --- a/package/usbredir/usbredir.hash
> +++ b/package/usbredir/usbredir.hash
> @@ -1,5 +1,5 @@
> -# https://spice-space.org/download/usbredir/usbredir-0.11.0.tar.xz.sha256sum
> -sha256  72dd5f3aa90dfbc0510b5149bb5b1654c8f21fdc405dfce7b5dc163dcff19cba  usbredir-0.11.0.tar.xz
> +# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum
> +sha256  fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d  usbredir-0.12.0.tar.xz
>   
>   # Hash for license files
>   sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
> diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
> index 0a8dbf012d..6792a3e758 100644
> --- a/package/usbredir/usbredir.mk
> +++ b/package/usbredir/usbredir.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -USBREDIR_VERSION = 0.11.0
> +USBREDIR_VERSION = 0.12.0
>   USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz
>   USBREDIR_SITE = http://spice-space.org/download/usbredir
>   USBREDIR_LICENSE = LGPL-2.1+ (libraries)
>