ppisar pushed to perl-OpenGL (master). "Unbundle GL headers"

[notifications at fedoraproject.org]

From 859c9cf2c0e5e4578eea1e8e476b8e32679f9b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Mon, 8 Jun 2015 16:45:00 +0200
Subject: Unbundle GL headers


diff --git a/OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch b/OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
new file mode 100644
index 0000000..f5dc2da
--- /dev/null
+++ b/OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
@@ -0,0 +1,29 @@
+From 3f8fa1a5069a6a7e371234f0045819e489242cd3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 8 Jun 2015 16:41:48 +0200
+Subject: [PATCH] Prefer system GL/gl.h on non-Win32
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ gl_util.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gl_util.h b/gl_util.h
+index a5dc862..c1566fd 100644
+--- a/gl_util.h
++++ b/gl_util.h
+@@ -13,7 +13,7 @@
+ #endif
+ 
+ /* Provide GL header files for Windows */
+-#define INCLUDE_LOCAL_HEADER !defined(HAVE_W32API)
++#define INCLUDE_LOCAL_HEADER defined(HAVE_W32API)
+ #if INCLUDE_LOCAL_HEADER
+ #include "./include/GL/gl.h"
+ #else
+-- 
+2.1.0
+
diff --git a/perl-OpenGL.spec b/perl-OpenGL.spec
index 4afb693..b2ac3e9 100644
--- a/perl-OpenGL.spec
+++ b/perl-OpenGL.spec
@@ -7,7 +7,11 @@ Group:          Development/Libraries
 URL:            http://sourceforge.net/projects/pogl/
 Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHM/OpenGL-%{version}.tar.gz
 Patch0:         0001-Don-t-check-current-display-for-extensions.patch
+# Do not require bundled GL/gl.h header file,
+# <https://sourceforge.net/p/pogl/bugs/20/>
+Patch1:         OpenGL-0.6704-Prefer-system-GL-gl.h-on-non-Win32.patch
 BuildRequires:  coreutils
+BuildRequires:  findutils
 BuildRequires:  freeglut-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libXext-devel
@@ -41,6 +45,9 @@ of the OpenGL 1.0, and 1.1 functions, and most of 1.2.
 %prep
 %setup -q -n OpenGL-%{version}
 %patch0 -p1
+%patch1 -p1
+# Unbundle GL headers
+find include -type f  \! -name glprocs.h -exec rm {} +
 
 
 %build
@@ -77,6 +84,7 @@ make test
 %changelog
 * Mon Jun 08 2015 Petr Pisar <ppisar at redhat.com> - 0.6704-1
 - 0.6704 bump
+- Unbundle GL headers
 
 * Fri Jun 05 2015 Jitka Plesnikova <jplesnik at redhat.com> - 0.6702-5
 - Perl 5.22 rebuild
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-OpenGL.git/commit/?h=master&id=859c9cf2c0e5e4578eea1e8e476b8e32679f9b2b