From 4cd850800e2904ef093131881ed8f995177ae632 Mon Sep 17 00:00:00 2001 From: "behrooz shabani (everplays)" Date: Thu, 9 Feb 2017 21:25:27 +0100 Subject: [PATCH] regenerate the patches and point to correct branches --- recipes/spice-gtk.recipe | 12 +++---- ...ch => 0001-PATCH-Do-not-build-tests.patch} | 10 +++--- ...e-alsasink-instead-of-autoaudiosink.patch} | 10 +++--- ..._device_get_libusb_device-symbol-fro.patch | 25 ------------- ...ce_usb_device_get_libusb_device-symb.patch | 25 +++++++++++++ ..._device_get_libusb_device-from-spice.patch | 25 ------------- ...ce_usb_device_get_libusb_device-from.patch | 25 +++++++++++++ ..._va_display_hook-symbol-from-linker-.patch | 35 +++++++++++++++++++ ...isplay_hook-symbol-from-linker-files.patch | 34 ------------------ recipes/spiceglue.recipe | 2 +- 10 files changed, 102 insertions(+), 101 deletions(-) rename recipes/spice-gtk/{0001-Do-not-build-tests.patch => 0001-PATCH-Do-not-build-tests.patch} (66%) rename recipes/spice-gtk/{0002-use-alsasink-instead-of-autoaudiosink.patch => 0002-patch-Use-alsasink-instead-of-autoaudiosink.patch} (80%) delete mode 100644 recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch create mode 100644 recipes/spice-gtk/0003-patch-Remove-spice_usb_device_get_libusb_device-symb.patch delete mode 100644 recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch create mode 100644 recipes/spice-gtk/0004-patch-Remove-spice_usb_device_get_libusb_device-from.patch create mode 100644 recipes/spice-gtk/0005-PATCH-Remove-set_va_display_hook-symbol-from-linker-.patch delete mode 100644 recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch diff --git a/recipes/spice-gtk.recipe b/recipes/spice-gtk.recipe index b7158d32..eb5ba308 100644 --- a/recipes/spice-gtk.recipe +++ b/recipes/spice-gtk.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'spice-gtk' version = '0.29-flexvdi' remotes = {'origin': 'https://github.com/flexVDI/spice-gtk.git'} - commit = 'v0.29-fv1' + commit = 'origin/master' # either LGPLv2.1 or MPLv1.1 licenses = [License.LGPLv2_1] autoreconf = True @@ -19,7 +19,7 @@ class Recipe(recipe.Recipe): Platform.LINUX: [ 'gtk+3', 'usbredir', 'librsvg' ] } - patches = ['spice-gtk/0001-Do-not-build-tests.patch'] + patches = ['spice-gtk/0001-PATCH-Do-not-build-tests.patch'] files_devel = ['include/spice-client-glib-2.0', 'lib/pkgconfig/spice-client-glib-2.0.pc'] @@ -34,9 +34,9 @@ class Recipe(recipe.Recipe): Platform.DARWIN, Platform.ANDROID]: self.configure_options += ' --enable-static --with-gtk=no --with-coroutine=gthread ' - self.patches += ['spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch', - 'spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch', - 'spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch'] + self.patches += ['spice-gtk/0003-patch-Remove-spice_usb_device_get_libusb_device-symb.patch', + 'spice-gtk/0004-patch-Remove-spice_usb_device_get_libusb_device-from.patch', + 'spice-gtk/0005-PATCH-Remove-set_va_display_hook-symbol-from-linker-.patch'] elif self.config.target_platform == Platform.WINDOWS: self.configure_options += ' --with-gtk=no' self.configure_options += ' --enable-usb-redir --with-usb-ids-path=./usb.ids' @@ -45,7 +45,7 @@ class Recipe(recipe.Recipe): self.use_system_libs = True self.configure_options += ' --with-gtk=3.0 --enable-spicy=no --disable-vala' self.configure_options += ' --enable-usb-redir --with-usb-ids-path=./usb.ids' - self.patches.append('spice-gtk/0002-use-alsasink-instead-of-autoaudiosink.patch') + self.patches.append('spice-gtk/0002-patch-Use-alsasink-instead-of-autoaudiosink.patch') if self.config.variants.va: self.configure_options += ' --enable-va' self.deps += ['libva'] diff --git a/recipes/spice-gtk/0001-Do-not-build-tests.patch b/recipes/spice-gtk/0001-PATCH-Do-not-build-tests.patch similarity index 66% rename from recipes/spice-gtk/0001-Do-not-build-tests.patch rename to recipes/spice-gtk/0001-PATCH-Do-not-build-tests.patch index beec7333..34cc7c14 100644 --- a/recipes/spice-gtk/0001-Do-not-build-tests.patch +++ b/recipes/spice-gtk/0001-PATCH-Do-not-build-tests.patch @@ -1,7 +1,7 @@ -From ba7c256a33ee2962d9418526e4bcad30db2c5d42 Mon Sep 17 00:00:00 2001 -From: Javier Celaya -Date: Sat, 4 Feb 2017 10:26:39 +0100 -Subject: [PATCH] Do not build tests +From ef4a0393c6fcd52e2980d78669cee9e04a918e93 Mon Sep 17 00:00:00 2001 +From: "behrooz shabani (everplays)" +Date: Thu, 9 Feb 2017 20:51:32 +0100 +Subject: [PATCH 1/5] [PATCH] Do not build tests --- configure.ac | 2 +- @@ -21,5 +21,5 @@ index 1692bb6..11f3248 100644 AC_OUTPUT([ Makefile -- -2.5.5 +2.11.1 diff --git a/recipes/spice-gtk/0002-use-alsasink-instead-of-autoaudiosink.patch b/recipes/spice-gtk/0002-patch-Use-alsasink-instead-of-autoaudiosink.patch similarity index 80% rename from recipes/spice-gtk/0002-use-alsasink-instead-of-autoaudiosink.patch rename to recipes/spice-gtk/0002-patch-Use-alsasink-instead-of-autoaudiosink.patch index 6f6ad9a6..70e971b3 100644 --- a/recipes/spice-gtk/0002-use-alsasink-instead-of-autoaudiosink.patch +++ b/recipes/spice-gtk/0002-patch-Use-alsasink-instead-of-autoaudiosink.patch @@ -1,7 +1,7 @@ -From dadb90c583d0ecf6569bee59261cd3587dce8b7c Mon Sep 17 00:00:00 2001 -From: Javier Celaya -Date: Tue, 10 Jan 2017 17:33:45 +0100 -Subject: [PATCH] Use alsasink instead of autoaudiosink +From eb3baf412e0368953910a45e3bd869a669ac57d8 Mon Sep 17 00:00:00 2001 +From: "behrooz shabani (everplays)" +Date: Thu, 9 Feb 2017 20:43:44 +0100 +Subject: [PATCH 2/5] [patch] Use alsasink instead of autoaudiosink --- src/spice-gstaudio.c | 2 +- @@ -21,5 +21,5 @@ index dc1d525..d1014f8 100644 p->playback.pipe = gst_parse_launch(pipeline, &error); if (error != NULL) { -- -2.10.2 +2.11.1 diff --git a/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch b/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch deleted file mode 100644 index 4d0e0804..00000000 --- a/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 294360ef99413b8170d57c1a727d048bcc83d8fe Mon Sep 17 00:00:00 2001 -From: "Sergio L. Pascual" -Date: Mon, 5 Oct 2015 10:50:03 +0200 -Subject: [PATCH 1/3] Remove spice_usb_device_get_libusb_device symbol from - map-file. - ---- - gtk/map-file | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gtk/map-file b/gtk/map-file -index 2a8be87..ca5a29d 100644 ---- a/gtk/map-file -+++ b/gtk/map-file -@@ -117,7 +117,6 @@ spice_uri_set_scheme; - spice_uri_set_user; - spice_uri_to_string; - spice_usb_device_get_description; --spice_usb_device_get_libusb_device; - spice_usb_device_get_type; - spice_usb_device_manager_can_redirect_device; - spice_usb_device_manager_connect_device_async; --- -2.3.8 (Apple Git-58) - diff --git a/recipes/spice-gtk/0003-patch-Remove-spice_usb_device_get_libusb_device-symb.patch b/recipes/spice-gtk/0003-patch-Remove-spice_usb_device_get_libusb_device-symb.patch new file mode 100644 index 00000000..727e1ff7 --- /dev/null +++ b/recipes/spice-gtk/0003-patch-Remove-spice_usb_device_get_libusb_device-symb.patch @@ -0,0 +1,25 @@ +From bfcce28d0626b6ddd33ac3422d999e2286201ae0 Mon Sep 17 00:00:00 2001 +From: "behrooz shabani (everplays)" +Date: Thu, 9 Feb 2017 20:44:34 +0100 +Subject: [PATCH 3/5] [patch] Remove spice_usb_device_get_libusb_device symbol + from map-file + +--- + src/map-file | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/map-file b/src/map-file +index 98c19c7..7120025 100644 +--- a/src/map-file ++++ b/src/map-file +@@ -120,7 +120,6 @@ spice_uri_set_scheme; + spice_uri_set_user; + spice_uri_to_string; + spice_usb_device_get_description; +-spice_usb_device_get_libusb_device; + spice_usb_device_get_type; + spice_usb_device_manager_can_redirect_device; + spice_usb_device_manager_connect_device_async; +-- +2.11.1 + diff --git a/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch b/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch deleted file mode 100644 index 530f444f..00000000 --- a/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 708280b43039867c5007ccc75843bae8f4679ca2 Mon Sep 17 00:00:00 2001 -From: "Sergio L. Pascual" -Date: Mon, 5 Oct 2015 11:46:40 +0200 -Subject: [PATCH 2/3] Remove spice_usb_device_get_libusb_device from - spice-glib-sym-file. - ---- - gtk/spice-glib-sym-file | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file -index 3a8da93..6830cb1 100644 ---- a/gtk/spice-glib-sym-file -+++ b/gtk/spice-glib-sym-file -@@ -92,7 +92,6 @@ spice_uri_set_scheme - spice_uri_set_user - spice_uri_to_string - spice_usb_device_get_description --spice_usb_device_get_libusb_device - spice_usb_device_get_type - spice_usb_device_manager_can_redirect_device - spice_usb_device_manager_connect_device_async --- -2.3.8 (Apple Git-58) - diff --git a/recipes/spice-gtk/0004-patch-Remove-spice_usb_device_get_libusb_device-from.patch b/recipes/spice-gtk/0004-patch-Remove-spice_usb_device_get_libusb_device-from.patch new file mode 100644 index 00000000..78286def --- /dev/null +++ b/recipes/spice-gtk/0004-patch-Remove-spice_usb_device_get_libusb_device-from.patch @@ -0,0 +1,25 @@ +From 30dc9c6efde33a23bbe8e4c4f3f26368f71ec855 Mon Sep 17 00:00:00 2001 +From: "behrooz shabani (everplays)" +Date: Thu, 9 Feb 2017 20:45:29 +0100 +Subject: [PATCH 4/5] [patch] Remove spice_usb_device_get_libusb_device from + spice-glib-sym-file + +--- + src/spice-glib-sym-file | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/spice-glib-sym-file b/src/spice-glib-sym-file +index 2692d2a..5984f32 100644 +--- a/src/spice-glib-sym-file ++++ b/src/spice-glib-sym-file +@@ -95,7 +95,6 @@ spice_uri_set_scheme + spice_uri_set_user + spice_uri_to_string + spice_usb_device_get_description +-spice_usb_device_get_libusb_device + spice_usb_device_get_type + spice_usb_device_manager_can_redirect_device + spice_usb_device_manager_connect_device_async +-- +2.11.1 + diff --git a/recipes/spice-gtk/0005-PATCH-Remove-set_va_display_hook-symbol-from-linker-.patch b/recipes/spice-gtk/0005-PATCH-Remove-set_va_display_hook-symbol-from-linker-.patch new file mode 100644 index 00000000..d3dc732f --- /dev/null +++ b/recipes/spice-gtk/0005-PATCH-Remove-set_va_display_hook-symbol-from-linker-.patch @@ -0,0 +1,35 @@ +From 43b2b3472543ddcd14557191773447a1a7a50dcd Mon Sep 17 00:00:00 2001 +From: "behrooz shabani (everplays)" +Date: Thu, 9 Feb 2017 20:46:19 +0100 +Subject: [PATCH 5/5] [PATCH] Remove "set_va_display_hook" symbol from linker + files. + +--- + src/map-file | 1 - + src/spice-glib-sym-file | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/map-file b/src/map-file +index 7120025..1178304 100644 +--- a/src/map-file ++++ b/src/map-file +@@ -138,7 +138,6 @@ spice_util_get_version_string; + spice_util_set_debug; + spice_uuid_to_string; + spice_webdav_channel_get_type; +-set_va_display_hooks; + local: + *; + }; +diff --git a/src/spice-glib-sym-file b/src/spice-glib-sym-file +index 5984f32..454bd29 100644 +--- a/src/spice-glib-sym-file ++++ b/src/spice-glib-sym-file +@@ -111,4 +111,3 @@ spice_util_get_version_string + spice_util_set_debug + spice_uuid_to_string + spice_webdav_channel_get_type +-set_va_display_hooks +-- +2.11.1 + diff --git a/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch b/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch deleted file mode 100644 index 2f661d3c..00000000 --- a/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 21a19ab7011c58b6c60ef41d670dc7feddea72e3 Mon Sep 17 00:00:00 2001 -From: "Sergio L. Pascual" -Date: Thu, 14 Apr 2016 12:56:40 +0200 -Subject: [PATCH] Remove "set_va_display_hook" symbol from linker files. - ---- - gtk/map-file | 1 - - gtk/spice-glib-sym-file | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/gtk/map-file b/gtk/map-file -index 4ef3dfe..f1323c9 100644 ---- a/gtk/map-file -+++ b/gtk/map-file -@@ -137,7 +137,6 @@ spice_util_get_version_string; - spice_util_set_debug; - spice_uuid_to_string; - spice_webdav_channel_get_type; --set_va_display_hooks; - local: - *; - }; -diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file -index 83f7afb..dba28e0 100644 ---- a/gtk/spice-glib-sym-file -+++ b/gtk/spice-glib-sym-file -@@ -110,4 +110,3 @@ spice_util_get_version_string - spice_util_set_debug - spice_uuid_to_string - spice_webdav_channel_get_type --set_va_display_hooks --- -2.6.4 (Apple Git-63) - diff --git a/recipes/spiceglue.recipe b/recipes/spiceglue.recipe index 091a1ac2..1cae15fe 100644 --- a/recipes/spiceglue.recipe +++ b/recipes/spiceglue.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'spiceglue' version = '2.2.36' - commit = 'winClientv2.2.36' + commit = 'origin/master' remotes = {'origin': 'https://github.com/flexvdi/spiceglue'} autoreconf = True