Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c0e809e98348531e1190c5b674bf8df5e2e5a81
commit 3c0e809e98348531e1190c5b674bf8df5e2e5a81 Author: Baste <[email protected]> Date: Tue Oct 13 09:43:37 2015 +0200 clutter-1.24.2-1-x86_64 - 1.24.0 -> 1.24.2 diff --git a/source/xlib/clutter/FrugalBuild b/source/xlib/clutter/FrugalBuild index 8b50c06..6af1032 100644 --- a/source/xlib/clutter/FrugalBuild +++ b/source/xlib/clutter/FrugalBuild @@ -5,10 +5,8 @@ USE_DOC=${USE_DOC:-"y"} -options+=('asneeded') - pkgname=clutter -pkgver=1.24.0 +pkgver=1.24.2 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces." depends=('libxdamage' 'libxcomposite' 'libgl' 'freetype2' 'libxau>=1.0.4' 'libxdmcp' \ @@ -24,7 +22,7 @@ replaces=('clutter-cairo') provides=('clutter-cairo') unset MAKEFLAGS Fconfopts="$Fconfopts --enable-xinput --enable-wayland-backend --enable-egl-backend --enable-evdev-input --enable-wayland-compositor" -sha1sums=('d79fbe2fbbae0583b6c33c6297a8a34436b95542') +sha1sums=('b8553f30c4e52afff9bce8971e3ed98d294b3135') if Fuse $USE_DOC; then makedepends=("${makedepends[@]}" 'gtk-doc>=1.24') diff --git a/source/xlib/clutter/faillback.diff b/source/xlib/clutter/faillback.diff deleted file mode 100644 index 1d59c55..0000000 --- a/source/xlib/clutter/faillback.diff +++ /dev/null @@ -1,59 +0,0 @@ -From f05432d57e5e980d0841fd6c13a7f886a46107fe Mon Sep 17 00:00:00 2001 -From: Robert Bragg <[email protected]> -Date: Tue, 01 Nov 2011 13:42:40 +0000 -Subject: cogl: fallback to non-transparent stages if unsupported - -If our check of the CoglOnscreenTemplate during initialization fails -then we disable the request for an alpha component in the swap chain and -try the check again. - -Reviewed-by: Neil Roberts <[email protected]> -Reviewed-by: Emmanuele Bassi <[email protected]> ---- -diff --git a/clutter/cogl/clutter-backend-cogl.c b/clutter/cogl/clutter-backend-cogl.c -index 1ca8850..1343dd1 100644 ---- a/clutter/cogl/clutter-backend-cogl.c -+++ b/clutter/cogl/clutter-backend-cogl.c -@@ -296,6 +296,7 @@ clutter_backend_cogl_create_context (ClutterBackend *backend, - #endif - CoglSwapChain *swap_chain = NULL; - CoglOnscreenTemplate *onscreen_template = NULL; -+ gboolean status; - - if (backend->cogl_context) - return TRUE; -@@ -325,9 +326,28 @@ clutter_backend_cogl_create_context (ClutterBackend *backend, - * Conceptually should we be able to check an onscreen_template - * without more details about the CoglDisplay configuration? - */ -- if (!cogl_renderer_check_onscreen_template (backend->cogl_renderer, -- onscreen_template, -- error)) -+ status = cogl_renderer_check_onscreen_template (backend->cogl_renderer, -+ onscreen_template, -+ error); -+#ifdef COGL_HAS_XLIB_SUPPORT -+ if (!status && clutter_x11_get_use_argb_visual ()) -+ { -+ g_clear_error (error); -+ /* It's possible that the current renderer doesn't support transparency -+ * in a swap_chain so lets see if we can fallback to not having any -+ * transparency... -+ * -+ * XXX: It might be nice to have a CoglRenderer feature we could -+ * explicitly check for ahead of time. -+ */ -+ cogl_swap_chain_set_has_alpha (swap_chain, FALSE); -+ status = cogl_renderer_check_onscreen_template (backend->cogl_renderer, -+ onscreen_template, -+ error); -+ } -+#endif -+ -+ if (!status) - goto error; - - backend->cogl_display = cogl_display_new (backend->cogl_renderer, --- -cgit v0.9.0.2 - diff --git a/source/xlib/clutter/libinput.patch b/source/xlib/clutter/libinput.patch deleted file mode 100644 index 280b7e5..0000000 --- a/source/xlib/clutter/libinput.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 358039182478140c8dcb7bcd077fff855d836bac Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <[email protected]> -Date: Fri, 16 Jan 2015 01:03:52 +0100 -Subject: [PATCH] evdev: use libinput's new merged scroll events - -libinput's API changed from separate scroll events for vert/horiz scrolling to -a single event that contains both axes if they changed. - -Updated by Armin K. to use the discrete axis value for wheel events as done -in Weston. ---- - clutter/evdev/clutter-device-manager-evdev.c | 40 +++++++++++++++++++--------- - configure.ac | 2 +- - 2 files changed, 28 insertions(+), 14 deletions(-) - -diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c -index 7b48481..2b3828a 100644 ---- a/clutter/evdev/clutter-device-manager-evdev.c -+++ b/clutter/evdev/clutter-device-manager-evdev.c -@@ -1191,29 +1191,43 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev, - - case LIBINPUT_EVENT_POINTER_AXIS: - { -- gdouble value, dx = 0.0, dy = 0.0; -+ gdouble dx = 0.0, dy = 0.0; - guint32 time; -+ gboolean wheel = FALSE; - enum libinput_pointer_axis axis; -+ enum libinput_pointer_axis_source source; - struct libinput_event_pointer *axis_event = - libinput_event_get_pointer_event (event); -+ - device = libinput_device_get_user_data (libinput_device); - - time = libinput_event_pointer_get_time (axis_event); -- value = libinput_event_pointer_get_axis_value (axis_event); -- axis = libinput_event_pointer_get_axis (axis_event); -+ source = libinput_event_pointer_get_axis_source (axis_event); - -- switch (axis) -- { -- case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL: -- dx = 0; -- dy = value; -- break; -+ /* libinput < 0.8 sent wheel click events with value 10. Since 0.8 -+ the value is the angle of the click in degrees. To keep -+ backwards-compat with existing clients, we just send multiples of -+ the click count. */ -+ -+ if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL) -+ wheel = TRUE; - -- case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL: -- dx = value; -- dy = 0; -- break; -+ axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; -+ if (libinput_event_pointer_has_axis (axis_event, axis)) -+ { -+ if (wheel) -+ dy = 10 * libinput_event_pointer_get_axis_value_discrete (axis_event, axis); -+ else -+ dy = libinput_event_pointer_get_axis_value (axis_event, axis); -+ } - -+ axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; -+ if (libinput_event_pointer_has_axis (axis_event, axis)) -+ { -+ if (wheel) -+ dx = 10 * libinput_event_pointer_get_axis_value_discrete (axis_event, axis); -+ else -+ dx = libinput_event_pointer_get_axis_value (axis_event, axis); - } - - notify_scroll (device, time, dx, dy); -diff --git a/configure.ac b/configure.ac -index 0a9a580..2a47744 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,7 +146,7 @@ m4_define([uprof_req_version], [0.3]) - m4_define([gtk_doc_req_version], [1.20]) - m4_define([xcomposite_req_version], [0.4]) - m4_define([gdk_req_version], [3.3.18]) --m4_define([libinput_req_version], [0.4.0]) -+m4_define([libinput_req_version], [0.8.0]) - m4_define([libudev_req_version], [136]) - - AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) --- -2.2.2 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
