[121606] trunk/dports/science/root6

[mojca at macports.org]

Revision: 121606
          https://trac.macports.org/changeset/121606
Author:   mojca at macports.org
Date:     2014-07-01 15:26:24 -0700 (Tue, 01 Jul 2014)
Log Message:
-----------
root6: +opengl works with +x11 again

Modified Paths:
--------------
    trunk/dports/science/root6/Portfile

Added Paths:
-----------
    trunk/dports/science/root6/files/patch-graf3d-gl-CMakeLists.txt.diff

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-07-01 21:06:22 UTC (rev 121605)
+++ trunk/dports/science/root6/Portfile	2014-07-01 22:26:24 UTC (rev 121606)
@@ -59,7 +59,8 @@
 select.group        root
 select.file         ${filespath}/${name}
 
-patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
+patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff \
+                    patch-graf3d-gl-CMakeLists.txt.diff
 
 # Force a compatible compiler
 # (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4)
@@ -213,7 +214,7 @@
 
 universal_variant   no
 
-default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +soversion
+default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
 
 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
 # We also make it default on 10.7
@@ -474,13 +475,6 @@
     default_variants-append ${default_gui_variant}
 }
 
-if { [variant_isset cocoa] } {
-    # Some changes are needed to make OpenGL and X11 work properly together
-    # If these get fixed, make +opengl default also for X11
-    # https://sft.its.cern.ch/jira/browse/ROOT-6393
-    default_variants-append +opengl
-}
-
 # ========================================================================================
 # Setup various clang variants, to provide alternative C++ compilers that support cocoa
 # ========================================================================================

Added: trunk/dports/science/root6/files/patch-graf3d-gl-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/root6/files/patch-graf3d-gl-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/root6/files/patch-graf3d-gl-CMakeLists.txt.diff	2014-07-01 22:26:24 UTC (rev 121606)
@@ -0,0 +1,13 @@
+https://sft.its.cern.ch/jira/browse/ROOT-6393
+
+--- graf3d/gl/CMakeLists.txt.orig
++++ graf3d/gl/CMakeLists.txt
+@@ -24,7 +24,7 @@ if(WIN32)
+ elseif(cocoa)
+   set(gllibs "-framework OpenGL")
+ else()
+-  set(gllibs ${OPENGL_LIBRARIES})
++  set(gllibs ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
+ endif()
+ 
+ if(MACOSX_GLU_DEPRECATED)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140701/6c8ced12/attachment-0001.html>