From 032365a369319134f0f673c6aea13185cec0c969 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Dec 16 2018 16:37:47 +0000
Subject: Add patch from upstream to deal with new CMake default for OpenGL.


---

diff --git a/blender-cmake_opengl.patch b/blender-cmake_opengl.patch
new file mode 100644
index 0000000..2266a4e
--- /dev/null
+++ b/blender-cmake_opengl.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,14 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
+ 	endif()
+ endif()
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
++
++# Prever LEGACY OpenGL to eb compatible with all the existing releases and
++# platforms which don't hare GLVND yet. Only do it if preference was not set
++# externally.
++if(NOT DEFINED OpenGL_GL_PREFERENCE)
++       set(OpenGL_GL_PREFERENCE "LEGACY")
++endif()
+ 
+ if(NOT EXECUTABLE_OUTPUT_PATH)
+ 	set(FIRST_RUN TRUE)
+@@ -987,7 +994,7 @@ if(WITH_SYSTEM_GLES)
+ endif()
+ 
+ if(WITH_GL_PROFILE_COMPAT OR WITH_GL_PROFILE_CORE)
+-	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
++	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}")
+ 
+ elseif(WITH_GL_PROFILE_ES20)
+ 	if(WITH_SYSTEM_GLES)
diff --git a/blender.spec b/blender.spec
index ff61627..1d59892 100644
--- a/blender.spec
+++ b/blender.spec
@@ -53,6 +53,9 @@ Patch10:     %{name}-2.79-python37.patch
 # https://developer.blender.org/rB66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7
 # https://github.com/OpenImageIO/oiio/wiki/OIIO-2.0-Porting-Guide
 Patch11:     blender-oiio2.patch
+# Commit to make OpenGL_GL_PREFERENCES=GLVND work
+# https://developer.blender.org/rB0658d047a94a86060f039790898a80a7adb0dcd9
+Patch12:     blender-cmake_opengl.patch
 
 # Development stuff
 BuildRequires:  boost-devel
@@ -195,7 +198,7 @@ export CXXFLAGS="$CXXFLAGS -mno-altivec"
     -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_SKIP_RPATH=ON \
     -DPYTHON_VERSION=$(%{__python3} -c "import sys ; print(sys.version[:3])") \
-    -DOpenGL_GL_PREFERENCE=LEGACY \
+    -DOpenGL_GL_PREFERENCE=GLVND \
     -DWITH_ALEMBIC=ON \
     -DWITH_BUILDINFO=ON \
     %{?_with_ffmpeg:-DWITH_CODEC_FFMPEG=ON} \