Merge lp:~elementary-apps/pantheon-greeter/optional-gl into lp:~elementary-pantheon/pantheon-greeter/trunk

[Raphael Isemann]

Some lines are changed as scratch removed trailing white-space (which is good!).

Otherwise we only use the OpenGL-function for max-texture-size now if the gl-package is available. The greeter will probably crash on devices that use a gigantic screen (like post-4K resolution) or that have a ultra-bad GPU that i can't even imagine in combination with a big screen.

We should make the package that provides gl in debian listed as recommended instead of depends. AFAIK it should work as it only installs the package if it is available. And if the package is not available on ARM, CMake decides to compile without OpenGL which should solve all problems without extra-branches.

[Raphael Isemann (teemperor)]

Oh, and kudos to cody for the help with conditional compiling.

[Cody Garver (codygarver)]

CMake stuff works but it fails to compile:

codygarver@cubie:~/greeter/build$ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- checking for modules 'granite;liblightdm-gobject-1>=1.2.1;gdk-x11-3.0;clutter-gtk-1.0;indicator3-0.4;gdk-pixbuf-2.0;gl'
-- found granite, version 0.2.2
-- found liblightdm-gobject-1, version 1.2.1
-- found gdk-x11-3.0, version 3.4.1
-- found clutter-gtk-1.0, version 1.4.2
-- found indicator3-0.4, version 0.5.0
-- found gdk-pixbuf-2.0, version 2.26.1
-- found gl, version 8.0.4
-- Found Vala: /usr/bin/valac
-- checking for a minimum Vala version of 0.16.1
-- found Vala, version 0.16.1
-- GSettings schemas will be installed locally.
-- GSettings shemas will be compiled.
-- GSettings schemas will be installed into /usr/share/glib-2.0/schemas/
-- Configuring done
-- Generating done
-- Build files have been written to: /home/codygarver/greeter/build'

codygarver@cubie:~/greeter/build$ make
[ 11%] Generating src/Utilities.c, src/Wallpaper.c, src/ShadowedLabel.c, src/Indicators.c, src/LoginBox.c, src/PantheonGreeter.c, build/src/config.c
Scanning dependencies of target pantheon-greeter
[ 22%] Building C object CMakeFiles/pantheon-greeter.dir/src/Utilities.c.o
/home/codygarver/greeter/build/src/Utilities.c: In function ‘_cogl_material_ref0’:
/home/codygarver/greeter/build/src/Utilities.c:226:2: warning: ‘cogl_material_ref’ is deprecated (declared at /usr/include/cogl/cogl/cogl-material-compat.h:175) [-Wdeprecated-declarations]
/home/codygarver/greeter/build/src/Utilities.c: In function ‘mirror_effect_real_paint_target’:
/home/codygarver/greeter/build/src/Utilities.c:304:9: warning: assignment from incompatible pointer type [enabled by default]
/home/codygarver/greeter/build/src/Utilities.c:363:2: warning: ‘clutter_actor_get_depth’ is deprecated (declared at /usr/include/clutter-1.0/clutter/deprecated/clutter-actor.h:91): Use 'clutter_actor_get_z_position' instead [-Wdeprecated-declarations]
/home/codygarver/greeter/build/src/Utilities.c:379:2: warning: ‘clutter_actor_get_depth’ is deprecated (declared at /usr/include/clutter-1.0/clutter/deprecated/clutter-actor.h:91): Use 'clutter_actor_get_z_position' instead [-Wdeprecated-declarations]
/home/codygarver/greeter/build/src/Utilities.c:396:2: warning: ‘clutter_actor_get_depth’ is deprecated (declared at /usr/include/clutter-1.0/clutter/deprecated/clutter-actor.h:91): Use 'clutter_actor_get_z_position' instead [-Wdeprecated-declarations]
/home/codygarver/greeter/build/src/Utilities.c:411:2: warning: ‘clutter_actor_get_depth’ is deprecated (declared at /usr/include/clutter-1.0/clutter/deprecated/clutter-actor.h:91): Use 'clutter_actor_get_z_position' instead [-Wdeprecated-declarations]
/home/codygarver/greeter/build/src/Utilities.c:420:2: warn...

review: Needs Fixing

[Corentin Noël (tintou)]

It needs to be recynced to trunk.

[Corentin Noël (tintou)]

review: Needs Fixing

[Cameron Norman (cameronnemo)]

@Corentin I rebased it here: https://code.launchpad.net/~cameronnemo/pantheon-greeter/optional-gl/+merge/229897

Unmerged revisions

214. By Raphael Isemann on 2013-08-29

made gl optional

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-23 10:08:27 +0000
+++ CMakeLists.txt	2013-08-29 19:35:58 +0000
@@ -36,23 +36,47 @@
 file(GLOB_RECURSE sources src/*.vala)
 
 include (ValaPrecompile)
-vala_precompile (VALA_C
-    ${sources}
-    ${CMAKE_BINARY_DIR}/src/config.vala
-PACKAGES
-    granite
-    liblightdm-gobject-1
-    posix
-    gdk-pixbuf-2.0
-    gdk-x11-3.0
-    x11
-    clutter-gtk-1.0
-    indicator-0.4
-    gl
-    posix-fixes
-OPTIONS
-    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
-)
+
+pkg_check_modules (GL QUIET gl)
+if (GL_FOUND)
+    pkg_check_modules(GL REQUIRED gl)
+    vala_precompile (VALA_C
+        ${sources}
+        ${CMAKE_BINARY_DIR}/src/config.vala
+    PACKAGES
+        granite
+        liblightdm-gobject-1
+        posix
+        gdk-pixbuf-2.0
+        gdk-x11-3.0
+        x11
+        clutter-gtk-1.0
+        indicator-0.4
+        gl
+        posix-fixes
+    OPTIONS
+        --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
+        --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi-gl
+        --define=USE_GL
+    )
+else (GL_FOUND)
+    vala_precompile (VALA_C
+        ${sources}
+        ${CMAKE_BINARY_DIR}/src/config.vala
+    PACKAGES
+        granite
+        liblightdm-gobject-1
+        posix
+        gdk-pixbuf-2.0
+        gdk-x11-3.0
+        x11
+        clutter-gtk-1.0
+        indicator-0.4
+        posix-fixes
+    OPTIONS
+        --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
+    )
+endif (GL_FOUND)
 
 add_subdirectory (po)
 

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2013-05-21 21:39:19 +0000
+++ src/Wallpaper.vala	2013-08-29 19:35:58 +0000
@@ -25,7 +25,9 @@
 
     bool second = false;
 
+#if USE_GL
     int gpu_limit;
+#endif
 
     string[] cache_path = {};
     Gdk.Pixbuf[] cache_pixbuf = {};
@@ -47,9 +49,11 @@
         add_child (background);
         add_child (background_s);
 
+#if USE_GL
         GL.GLint result = 1;
         GL.glGetIntegerv(GL.GL_MAX_TEXTURE_SIZE, out result);
         gpu_limit = result;
+#endif
     }
 
     string get_default () {
@@ -67,7 +71,7 @@
         }
 
         //same wallpaper => abort
-        if(file_path == last_loaded) 
+        if(file_path == last_loaded)
             return;
         //mark now loading wallpaper as the last one started loading async
         last_loaded = file_path;
@@ -85,7 +89,7 @@
         second = !second;
     }
 
-    public async void load_wallpaper (string path, File file, GtkClutter.Texture bot, 
+    public async void load_wallpaper (string path, File file, GtkClutter.Texture bot,
                                         GtkClutter.Texture top) {
 
         try {
@@ -94,7 +98,9 @@
             if (buf == null) {
                 InputStream stream = yield file.read_async (GLib.Priority.DEFAULT);
                 buf = yield Gdk.Pixbuf.new_from_stream_async (stream, cancellable);
+#if USE_GL
                 buf = validate_pixbuf (buf);
+#endif
                 //add loaded wallpapers and paths to cache
                 cache_path += path;
                 cache_pixbuf += buf;
@@ -111,13 +117,13 @@
                     top.visible = false;
                     set_child_above_sibling (bot, top);
             });
-        } catch (Error e) { 
+        } catch (Error e) {
             if (get_default() != path) {
                 set_wallpaper (get_default());
             }
             warning ("Can't load: "+path);
             warning ("Falling back to default if possible because:");
-            warning (e.message); 
+            warning (e.message);
         }
     }
 
@@ -144,15 +150,17 @@
         return null;
     }
 
+#if USE_GL
     /**
-     * makes the pixbuf fit inside the GPU limit and scales it to 
+     * makes the pixbuf fit inside the GPU limit and scales it to
      * screen size to save memory.
-     */
+     */ 
     public Gdk.Pixbuf validate_pixbuf (Gdk.Pixbuf pixbuf) {
         Gdk.Pixbuf result = scale_to_rect (pixbuf, gpu_limit, gpu_limit);
         result = scale_to_rect (pixbuf, screen_width, screen_height);
         return result;
     }
+#endif
 
     /**
      * Scales the pixbuf down to fit in the given dimensions
@@ -160,7 +168,7 @@
     public Gdk.Pixbuf scale_to_rect (Gdk.Pixbuf pixbuf, int rw, int rh) {
         int h = pixbuf.height;
         int w = pixbuf.width;
-        
+
         if (h > rh || w > rw) {
             float hw = (float)h/w*rw;
             float wh = (float)w/h*rh;
@@ -168,7 +176,7 @@
                 return pixbuf.scale_simple (rw, (int) (hw), Gdk.InterpType.BILINEAR);
             } else {
                 return pixbuf.scale_simple ((int) (wh), rh, Gdk.InterpType.BILINEAR);
-            } 
+            }
         }
         return pixbuf;
     }

=== added directory 'vapi-gl'
=== added file 'vapi-gl/gl.vapi'
--- vapi-gl/gl.vapi	1970-01-01 00:00:00 +0000
+++ vapi-gl/gl.vapi	2013-08-29 19:35:58 +0000
@@ -0,0 +1,17 @@
+/* gl.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "GL", gir_namespace = "GL", gir_version = "1.0", lower_case_cprefix = "gl_")]
+namespace GL {
+	[CCode (cheader_filename = "GL/gl.h", cname = "GLint")]
+	[SimpleType]
+	public struct GLint : int {
+	}
+	[CCode (cheader_filename = "GL/gl.h", cname = "GLenum")]
+	[SimpleType]
+	public struct GLenum : uint {
+	}
+	[CCode (cheader_filename = "GL/gl.h", cname = "GL_MAX_TEXTURE_SIZE")]
+	public const int GL_MAX_TEXTURE_SIZE;
+	[CCode (cheader_filename = "GL/gl.h", cname = "glGetIntegerv")]
+	public static void glGetIntegerv (GL.GLenum pname, out unowned GL.GLint @params);
+}

=== removed file 'vapi/gl.vapi'
--- vapi/gl.vapi	2013-02-17 13:12:35 +0000
+++ vapi/gl.vapi	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/* gl.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "GL", gir_namespace = "GL", gir_version = "1.0", lower_case_cprefix = "gl_")]
-namespace GL {
-	[CCode (cheader_filename = "GL/gl.h", cname = "GLint")]
-	[SimpleType]
-	public struct GLint : int {
-	}
-	[CCode (cheader_filename = "GL/gl.h", cname = "GLenum")]
-	[SimpleType]
-	public struct GLenum : uint {
-	}
-	[CCode (cheader_filename = "GL/gl.h", cname = "GL_MAX_TEXTURE_SIZE")]
-	public const int GL_MAX_TEXTURE_SIZE;
-	[CCode (cheader_filename = "GL/gl.h", cname = "glGetIntegerv")]
-	public static void glGetIntegerv (GL.GLenum pname, out unowned GL.GLint @params);
-}