drop glew

xbmc · Oct 31, 2016 · 11371c4 · Memphiz · Nov 20, 2016 · akva2
1 parent e6be163
commit 11371c4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 76 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,11 +19,9 @@ if (NOT WIN32)
   add_options(CXX ALL_BUILDS -std=c++11)
   find_package(OpenGL)
   if(OPENGL_FOUND)
-    find_package(GLEW REQUIRED)
-    set(INCLUDES ${OpenGL_INCLUDE_DIR}
-                 ${GLEW_INCLUDE_DIR})
+    set(INCLUDES ${OpenGL_INCLUDE_DIR})
     add_definitions(-DHAS_OPENGL)
-    set(DEPLIBS ${DEPLIBS} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES})
+    set(DEPLIBS ${DEPLIBS} ${OPENGL_LIBRARIES})
   else()
     find_package(OpenGLES2)
     if(OPENGLES2_FOUND)
@@ -36,7 +34,6 @@ if (NOT WIN32)
   endif()
 
   include_directories(${OpenGL_INCLUDE_DIR}
-                      ${GLEW_INCLUDE_DIR}
                       ${KODI_INCLUDE_DIR}
                       ${p8-platform_INCLUDE_DIRS}
                       ${PROJECT_SOURCE_DIR}/lib/kissfft
@@ -45,7 +42,7 @@ if (NOT WIN32)
   set(SHADERTOY_SOURCES src/lodepng.cpp
                         src/main.cpp)
 
-  set(DEPLIBS ${DEPLIBS} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES})
+  set(DEPLIBS ${DEPLIBS} ${OPENGL_LIBRARIES})
 
 elseif(WIN32)
   include_directories(${KODI_INCLUDE_DIR}

diff --git a/FindGLEW.cmake b/FindGLEW.cmake
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-visualization-shadertoy
 Priority: extra
 Maintainer: wsnipex <wsnipex@a1.net>
 Build-Depends: debhelper (>= 8.0.0), cmake, libp8-platform-dev, kodi-addon-dev,
-               kodi-visualization-dev, libgl1-mesa-dev, libglew-dev,
+               kodi-visualization-dev, libgl1-mesa-dev,
                automake, autoconf, libtool
 Standards-Version: 3.9.8
 Section: libs

diff --git a/depends/osx/glew/01-fix-makefile.patch b/depends/osx/glew/01-fix-makefile.patch
diff --git a/depends/osx/glew/CMakeLists.txt b/depends/osx/glew/CMakeLists.txt
diff --git a/depends/osx/glew/glew.txt b/depends/osx/glew/glew.txt
diff --git a/src/main.cpp b/src/main.cpp
@@ -26,7 +26,9 @@
 #include <assert.h>
 #define TO_STRING(...) #__VA_ARGS__
 #else
-#include <GL/glew.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
 #endif
 #include <iostream>
 #include <algorithm>
@@ -1056,11 +1058,6 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props)
 
   cfg = kiss_fft_alloc(AUDIO_BUFFER, 0, NULL, NULL);
 
-#if !defined(HAS_GLES)
-  if (GLEW_OK != glewInit()) {
-	  std::cout << "Failed to initialize glew";
-  }
-#endif
   if (!initialized)
   {
 #if defined(HAS_GLES)