From 979ce46c6403e70bc90348aba260c825e5189b2c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 3 Mar 2013 13:02:10 +0100
Subject: gl_common: get rid of symbol redefinition warnings with recent Mesa

Apparently newer Mesa versions changed their <GL/glx.h> header, and
unconditionally define GLX_CONTEXT_MAJOR_VERSION_ARB and others. This
clashed with gl_header_fixes.h, a header which quarantines bad hacks
to make compilation possible on systems with outdated GL headers.
Specifically, our header was included before glx.h, so the hacks were
always active, and somehow Mesa's glx.h used to deal with this by not
redefining existing identifiers.

Fix the gl_header_fixes.h logic so the hacks are checked after including
glx.h.
---
 video/out/gl_common.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'video/out/gl_common.h')

diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index 415e31e941..0150e9319c 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -47,6 +47,7 @@
 #include <GL/glext.h>
 #endif
 
+#define MP_GET_GL_WORKAROUNDS
 #include "video/out/gl_header_fixes.h"
 
 struct GL;
-- 
cgit v1.2.3