updates for debian jessie

diff --git a/Makefile b/Makefile
index 0c3b16b6e0451d4706b1b12f9d88c9822f92df5e..bd7b69bdafa531c9bb5f58f6da6ed5411cd286c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.1
+RELEASE=4.0

 
 PACKAGE=spiceterm
 
 PACKAGE=spiceterm

-VERSION=1.0
-PACKAGERELEASE=2
+VERSION=2.0
+PACKAGERELEASE=1

 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)

diff --git a/debian/changelog b/debian/changelog
index b8dccce3f3d441e9852b80be8f351ff71564e179..62968e621ae66f3e86b2df7ef4c80c2433039027 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spiceterm (2.0-1) unstable; urgency=medium
+
+  * update for debian jessie
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Feb 2015 16:39:55 +0100
+

 spiceterm (1.0-2) unstable; urgency=low
 
   * fix ALTGR handling for windows clients
 spiceterm (1.0-2) unstable; urgency=low
 
   * fix ALTGR handling for windows clients

diff --git a/screen.c b/screen.c
index c9965667197747aa164f3899b6c2ea1687b4fca0..6f253d2047042832b6563bc23b9781c226380ebd 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -152,10 +152,10 @@ push_command(SpiceScreen *spice_screen, QXLCommandExt *ext)
 {
     int need_wakeup = 1;
 
 {
     int need_wakeup = 1;
 

-    g_mutex_lock(spice_screen->command_mutex);
+    g_mutex_lock(&spice_screen->command_mutex);

 
     while (spice_screen->commands_end - spice_screen->commands_start >= COMMANDS_SIZE) {
 
     while (spice_screen->commands_end - spice_screen->commands_start >= COMMANDS_SIZE) {

-        g_cond_wait(spice_screen->command_cond, spice_screen->command_mutex);
+        g_cond_wait(&spice_screen->command_cond, &spice_screen->command_mutex);

     }
 
     g_assert(spice_screen->commands_end - spice_screen->commands_start < COMMANDS_SIZE);
     }
 
     g_assert(spice_screen->commands_end - spice_screen->commands_start < COMMANDS_SIZE);


@@ -168,10 +168,11 @@ push_command(SpiceScreen *spice_screen, QXLCommandExt *ext)
     spice_screen->commands_end++;
 
     if (need_wakeup) {
     spice_screen->commands_end++;
 
     if (need_wakeup) {

-        spice_screen->qxl_worker->wakeup(spice_screen->qxl_worker);
+       spice_qxl_wakeup(&spice_screen->qxl_instance);
+        //spice_screen->qxl_worker->wakeup(spice_screen->qxl_worker);

     }
 
     }
 

-    g_mutex_unlock(spice_screen->command_mutex);
+    g_mutex_unlock(&spice_screen->command_mutex);

 
 }
 
 
 }
 


@@ -379,7 +380,6 @@ static void
 create_primary_surface(SpiceScreen *spice_screen, uint32_t width, 
                        uint32_t height)
 {
 create_primary_surface(SpiceScreen *spice_screen, uint32_t width, 
                        uint32_t height)
 {

-    QXLWorker *qxl_worker = spice_screen->qxl_worker;

     QXLDevSurfaceCreate surface = { 0, };
 
     g_assert(height > 0);
     QXLDevSurfaceCreate surface = { 0, };
 
     g_assert(height > 0);


@@ -407,7 +407,7 @@ create_primary_surface(SpiceScreen *spice_screen, uint32_t width,
 
     spice_screen->cursor_set = 0;
 
 
     spice_screen->cursor_set = 0;
 

-    qxl_worker->create_primary_surface(qxl_worker, 0, &surface);
+    spice_qxl_create_primary_surface(&spice_screen->qxl_instance, 0, &surface);

 }
 
 QXLDevMemSlot slot = {
 }
 
 QXLDevMemSlot slot = {


@@ -430,9 +430,9 @@ attache_worker(QXLInstance *qin, QXLWorker *_qxl_worker)
     }
  
     spice_screen->qxl_worker = _qxl_worker;
     }
  
     spice_screen->qxl_worker = _qxl_worker;

-    spice_screen->qxl_worker->add_memslot(spice_screen->qxl_worker, &slot);
+    spice_qxl_add_memslot(&spice_screen->qxl_instance, &slot);

     create_primary_surface(spice_screen, spice_screen->width, spice_screen->height);
     create_primary_surface(spice_screen, spice_screen->width, spice_screen->height);

-    spice_screen->qxl_worker->start(spice_screen->qxl_worker);
+    spice_server_vm_start(spice_screen->server);

 }
 
 static void 
 }
 
 static void 


@@ -465,7 +465,7 @@ get_command(QXLInstance *qin, struct QXLCommandExt *ext)
     SpiceScreen *spice_screen = SPICE_CONTAINEROF(qin, SpiceScreen, qxl_instance);
     int res = FALSE;
 
     SpiceScreen *spice_screen = SPICE_CONTAINEROF(qin, SpiceScreen, qxl_instance);
     int res = FALSE;
 

-    g_mutex_lock(spice_screen->command_mutex);
+    g_mutex_lock(&spice_screen->command_mutex);

     
     if ((spice_screen->commands_end - spice_screen->commands_start) == 0) {
         res = FALSE;
     
     if ((spice_screen->commands_end - spice_screen->commands_start) == 0) {
         res = FALSE;


@@ -475,12 +475,12 @@ get_command(QXLInstance *qin, struct QXLCommandExt *ext)
     *ext = *spice_screen->commands[spice_screen->commands_start % COMMANDS_SIZE];
     g_assert(spice_screen->commands_start < spice_screen->commands_end);
     spice_screen->commands_start++;
     *ext = *spice_screen->commands[spice_screen->commands_start % COMMANDS_SIZE];
     g_assert(spice_screen->commands_start < spice_screen->commands_end);
     spice_screen->commands_start++;

-    g_cond_signal(spice_screen->command_cond);
+    g_cond_signal(&spice_screen->command_cond);

 
     res = TRUE;
 
 ret:
 
     res = TRUE;
 
 ret:

-    g_mutex_unlock(spice_screen->command_mutex);
+    g_mutex_unlock(&spice_screen->command_mutex);

     return res;
 }
 
     return res;
 }
 


@@ -489,12 +489,12 @@ discard_pending_commands(SpiceScreen *spice_screen)
 {
     int pos;
 
 {
     int pos;
 

-    g_mutex_lock(spice_screen->command_mutex);
+    g_mutex_lock(&spice_screen->command_mutex);

     for (pos = spice_screen->commands_start; pos < spice_screen->commands_end; pos++) {
         release_qxl_command_ext(spice_screen->commands[pos % COMMANDS_SIZE]);
     }
     spice_screen->commands_start = spice_screen->commands_end;
     for (pos = spice_screen->commands_start; pos < spice_screen->commands_end; pos++) {
         release_qxl_command_ext(spice_screen->commands[pos % COMMANDS_SIZE]);
     }
     spice_screen->commands_start = spice_screen->commands_end;

-    g_mutex_unlock(spice_screen->command_mutex);
+    g_mutex_unlock(&spice_screen->command_mutex);

 }
 
 static int 
 }
 
 static int 


@@ -767,8 +767,8 @@ spice_screen_new(SpiceCoreInterface *core, uint32_t width, uint32_t height,
     spice_screen->width = width;
     spice_screen->height = height;
 
     spice_screen->width = width;
     spice_screen->height = height;
 

-    spice_screen->command_cond = g_cond_new();
-    spice_screen->command_mutex = g_mutex_new();
+    g_cond_init(&spice_screen->command_cond);
+    g_mutex_init(&spice_screen->command_mutex);

 
     spice_screen->on_client_connected = client_connected,
     spice_screen->on_client_disconnected = client_disconnected,
 
     spice_screen->on_client_connected = client_connected,
     spice_screen->on_client_disconnected = client_disconnected,


@@ -833,16 +833,14 @@ void
 spice_screen_resize(SpiceScreen *spice_screen, uint32_t width,
                     uint32_t height)
 {
 spice_screen_resize(SpiceScreen *spice_screen, uint32_t width,
                     uint32_t height)
 {

-    QXLWorker *qxl_worker = spice_screen->qxl_worker;
-

     if (spice_screen->width == width && spice_screen->height == height) {
         return;
     }
 
     discard_pending_commands(spice_screen);
 
     if (spice_screen->width == width && spice_screen->height == height) {
         return;
     }
 
     discard_pending_commands(spice_screen);
 

-    qxl_worker->destroy_primary_surface(qxl_worker, 0);
-
+    spice_qxl_destroy_primary_surface(&spice_screen->qxl_instance, 0);
+ 

     create_primary_surface(spice_screen, width, height);
 
     spice_screen_clear(spice_screen, 0, 0, width, height);
     create_primary_surface(spice_screen, width, height);
 
     spice_screen_clear(spice_screen, 0, 0, width, height);

diff --git a/spiceterm.c b/spiceterm.c
index 3ff2d4faac8a1caaf4d97bec80b4630157494db3..532bb137f4e8389c4e0a6b8fb480c6ad4f7e5104 100644 (file)
--- a/spiceterm.c
+++ b/spiceterm.c
@@ -1632,9 +1632,7 @@ main (int argc, char** argv)
         .sasl = FALSE,
     };
 
         .sasl = FALSE,
     };
 

-    g_thread_init(NULL);
-
-    static struct option long_options[] = {
+   static struct option long_options[] = {

         { "timeout", required_argument, 0,  't' },
         { "authpath", required_argument, 0, 'A' },
         { "permissions", required_argument, 0, 'P' },
         { "timeout", required_argument, 0,  't' },
         { "authpath", required_argument, 0, 'A' },
         { "permissions", required_argument, 0, 'P' },

diff --git a/spiceterm.h b/spiceterm.h
index 678fa050db99bd365c4ff06cc33f762e49504059..7993c6aa01318fd4a83fe065b7e3f9373115ea8c 100644 (file)
--- a/spiceterm.h
+++ b/spiceterm.h
@@ -58,8 +58,8 @@ struct SpiceScreen {
     int width;
     int height;
 
     int width;
     int height;
 

-    GCond* command_cond;
-    GMutex* command_mutex;
+    GCond command_cond;
+    GMutex command_mutex;

 
     int commands_end;
     int commands_start;
 
     int commands_end;
     int commands_start;