regenerate the patches and point to correct branches

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']

recipes/spice-gtk/0001-Do-not-build-tests.patch → 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 <javier.celaya@flexvdi.com>
-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)" <everplays@gmail.com>
+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
 

recipes/spice-gtk/0002-use-alsasink-instead-of-autoaudiosink.patch → 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 <javier.celaya@flexvdi.com>
-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)" <everplays@gmail.com>
+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
 

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)" <everplays@gmail.com>
+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
+

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)" <everplays@gmail.com>
+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
+

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)" <everplays@gmail.com>
+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
+

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