rpm/freeglut
SHA256
1
0
Fork 0
forked from pool/freeglut
Code Pull Requests Activity

Accepting request 134846 from home:coolo:branches:openSUSE:Factory

Browse Source 
- add patch from fedora to fix build with latest GL stack:
   freeglut-glextconflict.patch

OBS-URL: https://build.opensuse.org/request/show/134846
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/freeglut?expand=0&rev=11
This commit is contained in:
Stephan Kulow 2012-09-18 12:36:49 +00:00 committed by Git OBS Bridge
parent 9caf51a6aa
commit ea26de6ee0
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freeglut-glextconflict.patch Normal file
View File

@ -0,0 +1,15 @@
From 4504d201fa35ca2936cb475b59e50bfae93f1650 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 03 Aug 2012 10:46:16 +0000
Subject: Add patch for conflicting types found in GLext to fix FTBFS
--- freeglut-2.8.0/progs/demos/smooth_opengl3/smooth_opengl3.c.orig 2012-08-02 18:52:39.007793150 -0400
+++ freeglut-2.8.0/progs/demos/smooth_opengl3/smooth_opengl3.c 2012-08-02 18:52:41.387901801 -0400
@@ -102,7 +102,6 @@
typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);

6
freeglut.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 18 12:09:12 UTC 2012 - coolo@suse.com
- add patch from fedora to fix build with latest GL stack:
freeglut-glextconflict.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 18 07:46:35 UTC 2012 - coolo@suse.com Tue Sep 18 07:46:35 UTC 2012 - coolo@suse.com

3
freeglut.spec
View File

@ -27,6 +27,8 @@ Group: System/Libraries
Url: http://freeglut.sourceforge.net/ Url: http://freeglut.sourceforge.net/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: glutman.tar.bz2 Source1: glutman.tar.bz2
# PATCH-FIX-UPSTREAM conflicting types with GLext - coolo@suse.de
Patch0: freeglut-glextconflict.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
@ -126,6 +128,7 @@ joystick functions on a wide range of platforms.
%prep %prep
%setup -q -b0 -b1 -n %{name}-%{version} %setup -q -b0 -b1 -n %{name}-%{version}
%patch0 -p1
%build %build
./autogen.sh ./autogen.sh