...
 
Commits (4)
glew (2.1.0-4) unstable; urgency=medium
* 0003-Fix_glex-moved-header.patch: also patch include/GL/glew.h to account
for glext.h moving to /usr/include/GL. Closes: #915112, #916710
* Standards-Version: 4.3.0
-- Alastair McKinstry <mckinstry@debian.org> Sat, 12 Jan 2019 09:21:51 +0000
glew (2.1.0-3) unstable; urgency=medium glew (2.1.0-3) unstable; urgency=medium
* Fix from repo for glext.h collision: Closes: #915112 * Fix from repo for glext.h collision: Closes: #915112
......
...@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11~), ...@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11~),
libx11-dev, libx11-dev,
libxi-dev, libxi-dev,
libxmu-dev libxmu-dev
Standards-Version: 4.1.4 Standards-Version: 4.3.0
Homepage: http://glew.sourceforge.net Homepage: http://glew.sourceforge.net
Vcs-Git: https://salsa.debian.org/debian/glew Vcs-Git: https://salsa.debian.org/debian/glew
Vcs-Browser: https://salsa.debian.org/debian/glew Vcs-Browser: https://salsa.debian.org/debian/glew
......
...@@ -25,3 +25,33 @@ Index: glew-2.1.0/auto/src/glew_head.h ...@@ -25,3 +25,33 @@ Index: glew-2.1.0/auto/src/glew_head.h
#define __gl_ATI_h_ #define __gl_ATI_h_
#if defined(_WIN32) #if defined(_WIN32)
Index: glew-2.1.0/include/GL/glew.h
===================================================================
--- glew-2.1.0.orig/include/GL/glew.h
+++ glew-2.1.0/include/GL/glew.h
@@ -72,7 +72,7 @@
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+,** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
@@ -93,7 +93,7 @@
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
#error glext.h included before glew.h
#endif
#if defined(__gl_ATI_h_)
@@ -108,6 +108,7 @@
#define __REGAL_H__
#define __X_GL_H
#define __glext_h_
+#define __gl_glext_h_
#define __GLEXT_H_
#define __gl_ATI_h_
0001-Fix_FTBFS_on_kFreeBSD.patch 0001-Fix_FTBFS_on_kFreeBSD.patch
0002-Fix_pkgconfig_path.patch 0002-Fix_pkgconfig_path.patch
glex-fix.patch 0003-Fix_glex-moved-header.patch