[114877] trunk/dports/gnome/gnome-session

devans at macports.org devans at macports.org
Wed Dec 18 13:10:07 PST 2013


Revision: 114877
          https://trac.macports.org/changeset/114877
Author:   devans at macports.org
Date:     2013-12-18 13:10:07 -0800 (Wed, 18 Dec 2013)
Log Message:
-----------
gnome-session: for now, report but don't error out if X server doesn't pass gnome-shell acceleration tests, add dependencies to support a gnome-flashback session.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-session/Portfile
    trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff

Modified: trunk/dports/gnome/gnome-session/Portfile
===================================================================
--- trunk/dports/gnome/gnome-session/Portfile	2013-12-18 20:21:21 UTC (rev 114876)
+++ trunk/dports/gnome/gnome-session/Portfile	2013-12-18 21:10:07 UTC (rev 114877)
@@ -5,7 +5,7 @@
 
 name                gnome-session
 version             3.8.4
-revision            1
+revision            2
 license             LGPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Session component for the GNOME 3 desktop.
@@ -28,6 +28,8 @@
  
 depends_lib         port:desktop-file-utils \
                     port:gnome-desktop \
+                    port:metacity \
+                    port:gnome-panel \
                     port:gtk3 \
                     port:dbus-glib \
                     port:upower \

Modified: trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff	2013-12-18 20:21:21 UTC (rev 114876)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff	2013-12-18 21:10:07 UTC (rev 114877)
@@ -1,6 +1,5 @@
-diff -ur tools.orig/gnome-session-check-accelerated-helper.c tools/gnome-session-check-accelerated-helper.c
---- tools.orig/gnome-session-check-accelerated-helper.c	2013-03-05 19:59:51.000000000 -0800
-+++ tools/gnome-session-check-accelerated-helper.c	2013-12-04 20:17:43.000000000 -0800
+--- tools/gnome-session-check-accelerated-helper.c.orig	2013-03-05 19:59:51.000000000 -0800
++++ tools/gnome-session-check-accelerated-helper.c	2013-12-17 10:03:36.000000000 -0800
 @@ -84,6 +84,75 @@
  #include <GL/gl.h>
  #include <GL/glx.h>
@@ -77,3 +76,45 @@
  #define SIZE_UNSET 0
  #define SIZE_ERROR -1
  static int max_texture_size = SIZE_UNSET;
+@@ -422,24 +491,41 @@
+                 goto out;
+         }
+ 
++/* 
++ *  Mac OS X always fails these checks due to the following
++ *      - No composite extension
++ *      - No GLX_EXT_texture_from_pixmap support
++ *  This is mainly for gnome-shell which we don't support yet.
++ *  For now, print the error but allow gnome-session to
++ *  continue to start up.  We'll deal with any consequences
++ *  down the line.
++ */
+         if (!_has_composite (display)) {
+                 _print_error ("No composite extension.");
++#ifndef __APPLE__
+                 goto out;
++#endif
+         }
+ 
+         if (!_has_hardware_gl (display)) {
+                 _print_error ("No hardware 3D support.");
++#ifndef __APPLE__
+                 goto out;
++#endif
+         }
+ 
+         if (!_has_texture_from_pixmap (display)) {
+                 _print_error ("No GLX_EXT_texture_from_pixmap support.");
++#ifndef __APPLE__
+                 goto out;
++#endif
+         }
+ 
+         if (!_is_max_texture_size_big_enough (display)) {
+                 _print_error ("GL_MAX_{TEXTURE,RENDERBUFFER}_SIZE is too small.");
++#ifndef __APPLE__
+                 goto out;
++#endif
+         }
+ 
+         ret = 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131218/0fa4908e/attachment.html>


More information about the macports-changes mailing list