debian/changelog                                                               
|   13 +
 debian/control                                                                 
|    2 
 debian/patches/0001-Require-libinput-0.4.0.patch                               
|   94 +++++++++
 debian/patches/0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch 
|   99 ++++++++++
 debian/patches/series                                                          
|    2 
 debian/rules                                                                   
|    2 
 debian/weston.install                                                          
|    3 
 7 files changed, 210 insertions(+), 5 deletions(-)

New commits:
commit b00c73f9536b5c459a8a78608515107f4b4ad4b5
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date:   Fri Sep 5 02:14:21 2014 +0200

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9687bf3..a9a125e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-weston (1.5.0-3) UNRELEASED; urgency=medium
+weston (1.5.0-3) unstable; urgency=medium
 
   * d/p/0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch,
     d/p/0001-Require-libinput-0.4.0.patch,
@@ -9,7 +9,7 @@ weston (1.5.0-3) UNRELEASED; urgency=medium
     + Disable cairo-gl support. It causes trouble in some embedded platforms
       so we're disabling its support, at least for now.
 
- -- Emilio Pozuelo Monfort <po...@debian.org>  Fri, 05 Sep 2014 00:27:14 +0200
+ -- Emilio Pozuelo Monfort <po...@debian.org>  Fri, 05 Sep 2014 02:14:06 +0200
 
 weston (1.5.0-2) unstable; urgency=medium
 

commit ba163b709d69f356453df1b8f08987420b75f82e
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date:   Fri Sep 5 00:31:22 2014 +0200

    Disable cairo-gl support

diff --git a/debian/changelog b/debian/changelog
index 98fade4..9687bf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ weston (1.5.0-3) UNRELEASED; urgency=medium
     d/p/0001-Require-libinput-0.4.0.patch,
     debian/control:
     + Build against libinput 0.5.0.
+  * debian/weston.install,
+    debian/rules:
+    + Disable cairo-gl support. It causes trouble in some embedded platforms
+      so we're disabling its support, at least for now.
 
  -- Emilio Pozuelo Monfort <po...@debian.org>  Fri, 05 Sep 2014 00:27:14 +0200
 
diff --git a/debian/rules b/debian/rules
index b119855..58acb37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 override_dh_auto_configure:
        dh_auto_configure -- --disable-libunwind --libexec=/usr/lib/weston \
-               --with-cairo=gl --enable-libinput-backend
+               --with-cairo=image --enable-libinput-backend
 
 override_dh_auto_test:
        # the test suite does not 100% pass in headless mode
diff --git a/debian/weston.install b/debian/weston.install
index 921d228..2d2ba53 100644
--- a/debian/weston.install
+++ b/debian/weston.install
@@ -6,7 +6,6 @@ usr/bin/weston-terminal
 usr/include/weston
 usr/lib/weston/weston-desktop-shell
 usr/lib/weston/weston-keyboard
-usr/lib/weston/weston-screensaver
 usr/lib/weston/weston-screenshooter
 usr/lib/weston/weston-simple-im
 usr/lib/*/pkgconfig/weston.pc
@@ -36,14 +35,12 @@ weston-editor       usr/lib/weston/
 weston-eventdemo       usr/lib/weston/
 weston-flower  usr/lib/weston/
 weston-fullscreen      usr/lib/weston/
-weston-gears   usr/lib/weston/
 weston-image   usr/lib/weston/
 weston-info    usr/lib/weston/
 weston-keyboard        usr/lib/weston/
 weston-multi-resource  usr/lib/weston/
 weston-resizor usr/lib/weston/
 weston-scaler  usr/lib/weston/
-weston-screensaver     usr/lib/weston/
 weston-screenshooter   usr/lib/weston/
 weston-simple-egl      usr/lib/weston/
 weston-simple-im       usr/lib/weston/

commit 80850110fd436a1f8cf7b117ce491de06ca53666
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date:   Fri Sep 5 00:28:08 2014 +0200

    Build against libinput 0.5.0

diff --git a/debian/changelog b/debian/changelog
index 16a49a3..98fade4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+weston (1.5.0-3) UNRELEASED; urgency=medium
+
+  * d/p/0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch,
+    d/p/0001-Require-libinput-0.4.0.patch,
+    debian/control:
+    + Build against libinput 0.5.0.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org>  Fri, 05 Sep 2014 00:27:14 +0200
+
 weston (1.5.0-2) unstable; urgency=medium
 
   * debian/control,
diff --git a/debian/control b/debian/control
index 8ed6aa6..3df1bc8 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Build-Depends:
  libpam0g-dev,
  libvpx-dev,
  libsystemd-login-dev,
- libinput-dev,
+ libinput-dev (>= 0.5.0),
 Standards-Version: 3.9.5
 Homepage: http://wayland.freedesktop.org/
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/weston
diff --git a/debian/patches/0001-Require-libinput-0.4.0.patch 
b/debian/patches/0001-Require-libinput-0.4.0.patch
new file mode 100644
index 0000000..145d44e
--- /dev/null
+++ b/debian/patches/0001-Require-libinput-0.4.0.patch
@@ -0,0 +1,94 @@
+From 3b843d3a61286d4b2a9552a3a2cae80c6b1cf8cd Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed, 25 Jun 2014 14:07:36 +1000
+Subject: [PATCH] Require libinput 0.4.0
+
+No functional changes, just adjusting for API changes in libinput:
+- libinput_destroy() replaced by libinput_unref()
+- log functions now take a libinput context, userdata is gone
+- udev seat creation is now libinput_udev_create_context() and
+  libinput_udev_assign_seat()
+
+Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+---
+ configure.ac        |  2 +-
+ src/libinput-seat.c | 32 +++++++++++++++++++++-----------
+ 2 files changed, 22 insertions(+), 12 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,7 +159,7 @@
+ AM_CONDITIONAL([ENABLE_LIBINPUT_BACKEND], [test x$enable_libinput_backend = 
xyes])
+ if test x$enable_libinput_backend = xyes; then
+   AC_DEFINE([BUILD_LIBINPUT_BACKEND], [1], [Build the libinput input device 
backend])
+-  PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.3.0])
++  PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.4.0])
+ fi
+ 
+ 
+--- a/src/libinput-seat.c
++++ b/src/libinput-seat.c
+@@ -252,8 +252,9 @@
+ }
+ 
+ static void
+-libinput_log_func(enum libinput_log_priority priority, void *user_data,
+-                   const char *format, va_list args)
++libinput_log_func(struct libinput *libinput,
++                enum libinput_log_priority priority,
++                const char *format, va_list args)
+ {
+       weston_vlog(format, args);
+ }
+@@ -268,25 +269,34 @@
+ 
+       input->compositor = c;
+ 
+-      libinput_log_set_handler(&libinput_log_func, NULL);
+-
+       log_priority = getenv("WESTON_LIBINPUT_LOG_PRIORITY");
+ 
++      input->libinput = libinput_udev_create_context(&libinput_interface,
++                                                     input, udev);
++      if (!input->libinput) {
++              return -1;
++      }
++
++      libinput_log_set_handler(input->libinput, &libinput_log_func);
++
+       if (log_priority) {
+               if (strcmp(log_priority, "debug") == 0) {
+-                      libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
++                      libinput_log_set_priority(input->libinput,
++                                                LIBINPUT_LOG_PRIORITY_DEBUG);
+               } else if (strcmp(log_priority, "info") == 0) {
+-                      libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_INFO);
++                      libinput_log_set_priority(input->libinput,
++                                                LIBINPUT_LOG_PRIORITY_INFO);
+               } else if (strcmp(log_priority, "error") == 0) {
+-                      libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_ERROR);
++                      libinput_log_set_priority(input->libinput,
++                                                LIBINPUT_LOG_PRIORITY_ERROR);
+               }
+       }
+ 
+-      input->libinput = libinput_udev_create_for_seat(&libinput_interface, 
input,
+-                                                      udev, seat_id);
+-      if (!input->libinput) {
++      if (libinput_udev_assign_seat(input->libinput, seat_id) != 0) {
++              libinput_unref(input->libinput);
+               return -1;
+       }
++
+       process_events(input);
+ 
+       return udev_input_enable(input);
+@@ -300,7 +310,7 @@
+       wl_event_source_remove(input->libinput_source);
+       wl_list_for_each_safe(seat, next, &input->compositor->seat_list, 
base.link)
+               udev_seat_destroy(seat);
+-      libinput_destroy(input->libinput);
++      libinput_unref(input->libinput);
+ }
+ 
+ static void
diff --git 
a/debian/patches/0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch
 
b/debian/patches/0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch
new file mode 100644
index 0000000..59ae545
--- /dev/null
+++ 
b/debian/patches/0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch
@@ -0,0 +1,99 @@
+From 26714b4718ec877418c9a8faa111d8b9def7b0a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jad...@gmail.com>
+Date: Mon, 2 Jun 2014 23:15:48 +0200
+Subject: [PATCH] libinput: Use floating point instead of fixed point numbers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Also update configure.ac to require libinput 0.3 when enabled, as it is
+the version where double replaced li_fixed_t.
+
+Signed-off-by: Jonas Ã…dahl <jad...@gmail.com>
+---
+ configure.ac          |  2 +-
+ src/libinput-device.c | 27 ++++++++++++++++++---------
+ 2 files changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e2bf38d..16e813d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,7 +159,7 @@ AC_ARG_ENABLE(libinput-backend, [  
--enable-libinput-backend],,
+ AM_CONDITIONAL([ENABLE_LIBINPUT_BACKEND], [test x$enable_libinput_backend = 
xyes])
+ if test x$enable_libinput_backend = xyes; then
+   AC_DEFINE([BUILD_LIBINPUT_BACKEND], [1], [Build the libinput input device 
backend])
+-  PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.1.0])
++  PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.3.0])
+ fi
+ 
+ 
+diff --git a/src/libinput-device.c b/src/libinput-device.c
+index 4605a76..2ba4ec3 100644
+--- a/src/libinput-device.c
++++ b/src/libinput-device.c
+@@ -73,11 +73,14 @@ handle_pointer_motion(struct libinput_device 
*libinput_device,
+ {
+       struct evdev_device *device =
+               libinput_device_get_user_data(libinput_device);
++      wl_fixed_t dx, dy;
+ 
++      dx = wl_fixed_from_double(libinput_event_pointer_get_dx(pointer_event));
++      dy = wl_fixed_from_double(libinput_event_pointer_get_dy(pointer_event));
+       notify_motion(device->seat,
+                     libinput_event_pointer_get_time(pointer_event),
+-                    libinput_event_pointer_get_dx(pointer_event),
+-                    libinput_event_pointer_get_dy(pointer_event));
++                    dx,
++                    dy);
+ }
+ 
+ static void
+@@ -99,10 +102,12 @@ handle_pointer_motion_absolute(
+       width = device->output->current_mode->width;
+       height = device->output->current_mode->height;
+ 
+-      x = libinput_event_pointer_get_absolute_x_transformed(pointer_event,
+-                                                            width);
+-      y = libinput_event_pointer_get_absolute_y_transformed(pointer_event,
+-                                                            height);
++      x = wl_fixed_from_double(
++              libinput_event_pointer_get_absolute_x_transformed(pointer_event,
++                                                                width));
++      y = wl_fixed_from_double(
++              libinput_event_pointer_get_absolute_y_transformed(pointer_event,
++                                                                height));
+ 
+       weston_output_transform_coordinate(device->output, x, y, &x, &y);
+       notify_motion_absolute(device->seat, time, x, y);
+@@ -127,11 +132,13 @@ handle_pointer_axis(struct libinput_device 
*libinput_device,
+ {
+       struct evdev_device *device =
+               libinput_device_get_user_data(libinput_device);
++      double value;
+ 
++      value = libinput_event_pointer_get_axis_value(pointer_event);
+       notify_axis(device->seat,
+                   libinput_event_pointer_get_time(pointer_event),
+                   libinput_event_pointer_get_axis(pointer_event),
+-                  libinput_event_pointer_get_axis_value(pointer_event));
++                  wl_fixed_from_double(value));
+ }
+ 
+ static void
+@@ -155,8 +162,10 @@ handle_touch_with_coords(struct libinput_device 
*libinput_device,
+ 
+       width = device->output->current_mode->width;
+       height = device->output->current_mode->height;
+-      x = libinput_event_touch_get_x_transformed(touch_event, width);
+-      y = libinput_event_touch_get_y_transformed(touch_event, height);
++      x = wl_fixed_from_double(
++              libinput_event_touch_get_x_transformed(touch_event, width));
++      y = wl_fixed_from_double(
++              libinput_event_touch_get_y_transformed(touch_event, height));
+ 
+       weston_output_transform_coordinate(device->output,
+                                          x, y, &x, &y);
+-- 
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 685d402..48b8c79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-animation-fix-move-scale-animation.patch
 0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch
+0001-libinput-Use-floating-point-instead-of-fixed-point-n.patch
+0001-Require-libinput-0.4.0.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xphp7-0001cv...@moszumanska.debian.org

Reply via email to