Merge lp:~albaguirre/mir/move-gl-program into lp:mir

[Alberto Aguirre]

GLProgram should be part of platform/graphics (LP: #1317200)

GLProgram should be part of platform/graphics (LP: #1317200)

OverlayGLProgram uses a unique_ptr<mir::graphics::GLProgram> which needs the definition of ~GLProgram()
GLProgram currently compiles into mirgraphics which is GPL - libmirplatformgraphics should not link against mirgraphics so this MP moves GLProgram to src/platform/graphics

Alternatively it could live in a LGPL sharedgraphics library perhaps under src/shared/graphics

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1608
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1549/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1355
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6907

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1549/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I'm a bit confused by our overuse of generic (meaningless) words like "platform" and "graphics". It's not yet clear to me what the right place for GLProgram is until I dig into it.

review: Abstain

[Daniel van Vugt (vanvugt)]

Alright, after a bit more analysis I agree this is the right answer.

Argue about our library design another day...

review: Approve

[Alan Griffiths (alan-griffiths)]

Yes. This matches the "licensing" plans. (Which we ought to write up in a public document instead of hearsay and notes from internal discussions/.)

review: Approve

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2014-05-01 07:13:02 +0000
+++ src/platform/graphics/CMakeLists.txt	2014-05-07 17:57:08 +0000
@@ -11,6 +11,7 @@
   buffer_basic.cpp
   pixel_format_utils.cpp
   overlapping_output_grouping.cpp
+  gl_program.cpp
 )
 
 add_library(

=== renamed file 'src/server/graphics/gl_program.cpp' => 'src/platform/graphics/gl_program.cpp'
--- src/server/graphics/gl_program.cpp	2014-05-01 07:13:02 +0000
+++ src/platform/graphics/gl_program.cpp	2014-05-07 17:57:08 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * under the terms of the GNU Lesser General Public License version 3,
  * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Kevin DuBois <[e-mail]>

=== modified file 'src/server/graphics/CMakeLists.txt'
--- src/server/graphics/CMakeLists.txt	2014-05-05 03:36:45 +0000
+++ src/server/graphics/CMakeLists.txt	2014-05-07 17:57:08 +0000
@@ -6,7 +6,6 @@
   default_configuration.cpp
   default_display_configuration_policy.cpp
   gl_extensions_base.cpp
-  gl_program.cpp
   program_factory.cpp
   surfaceless_egl_context.cpp
   builtin_cursor_images.cpp