[147300] users/devans/GNOME-3/stable/dports/graphics/clutter

[devans at macports.org]

Revision: 147300
          https://trac.macports.org/changeset/147300
Author:   devans at macports.org
Date:     2016-04-01 13:20:50 -0700 (Fri, 01 Apr 2016)
Log Message:
-----------
GNOME-3/stable: clutter, update to version 1.26.0.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/graphics/clutter/Portfile
    users/devans/GNOME-3/stable/dports/graphics/clutter/files/patch-use-x11-backend-as-default.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/graphics/clutter/


Property changes on: users/devans/GNOME-3/stable/dports/graphics/clutter
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/graphics/clutter:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/clutter:118239-141337
/users/devans/GNOME-3/unstable/dports/graphics/clutter:117866-118100,120511-125728,132302-134403
   + /branches/mld-qt-481/dports/graphics/clutter:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/clutter:118239-141337
/users/devans/GNOME-3/unstable/dports/graphics/clutter:117866-118100,120511-125728,132302-134403,143679-147064

Modified: users/devans/GNOME-3/stable/dports/graphics/clutter/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/clutter/Portfile	2016-04-01 20:18:08 UTC (rev 147299)
+++ users/devans/GNOME-3/stable/dports/graphics/clutter/Portfile	2016-04-01 20:20:50 UTC (rev 147300)
@@ -5,7 +5,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                clutter
-version             1.24.2
+version             1.26.0
 license             LGPL-2.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          graphics
@@ -20,8 +20,8 @@
 
 use_xz              yes
 
-checksums           rmd160  580363f9fb7076ab945f351e13cce69568a8f79b \
-                    sha256  9631c98cb4bcbfec15e1bbe9eaa6eef0f127201552fce40d7d28f2133803cd63
+checksums           rmd160  4f268074904a5d97970145a64de8e6ec7e3922aa \
+                    sha256  67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06
 
 depends_build       port:pkgconfig
 

Modified: users/devans/GNOME-3/stable/dports/graphics/clutter/files/patch-use-x11-backend-as-default.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/clutter/files/patch-use-x11-backend-as-default.diff	2016-04-01 20:18:08 UTC (rev 147299)
+++ users/devans/GNOME-3/stable/dports/graphics/clutter/files/patch-use-x11-backend-as-default.diff	2016-04-01 20:20:50 UTC (rev 147300)
@@ -1,26 +1,32 @@
---- clutter/clutter-backend.c.orig	2015-07-10 18:13:50.000000000 -0700
-+++ clutter/clutter-backend.c	2015-07-10 18:17:25.000000000 -0700
-@@ -512,6 +512,11 @@
- 	backend = g_intern_string (backend_env);
-     }
+--- clutter/clutter-backend.c.orig	2015-12-11 07:53:24.000000000 -0800
++++ clutter/clutter-backend.c	2015-12-17 08:43:49.000000000 -0800
+@@ -618,6 +618,14 @@
+   if (input_backend != NULL)
+     input_backend = g_intern_string (input_backend);
  
-+#ifdef CLUTTER_WINDOWING_X11
-+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
-+    retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
++#ifdef CLUTTER_INPUT_X11
++  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
++      (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_X11)))
++    {
++      _clutter_backend_x11_events_init (backend);
++    }
 +  else
 +#endif
- #ifdef CLUTTER_WINDOWING_OSX
-   if (backend == NULL || backend == I_(CLUTTER_WINDOWING_OSX))
-     retval = g_object_new (CLUTTER_TYPE_BACKEND_OSX, NULL);
-@@ -527,11 +533,6 @@
-     retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
+ #ifdef CLUTTER_INPUT_OSX
+   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_OSX) &&
+       (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_OSX)))
+@@ -634,14 +642,6 @@
+     }
    else
  #endif
--#ifdef CLUTTER_WINDOWING_X11
--  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
--    retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
+-#ifdef CLUTTER_INPUT_X11
+-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
+-      (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_X11)))
+-    {
+-      _clutter_backend_x11_events_init (backend);
+-    }
 -  else
 -#endif
- #ifdef CLUTTER_WINDOWING_WAYLAND
-   if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WAYLAND))
-     retval = g_object_new (CLUTTER_TYPE_BACKEND_WAYLAND, NULL);
+ #ifdef CLUTTER_INPUT_GDK
+   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK) &&
+       (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_GDK)))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160401/0f095edd/attachment.html>