From ea26de6ee0ccfb5ec57f7c5c5248dfa261dd4634a67028eda2f6c71b12b6c16c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Sep 2012 12:36:49 +0000 Subject: [PATCH] Accepting request 134846 from home:coolo:branches:openSUSE:Factory - 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 --- freeglut-glextconflict.patch | 15 +++++++++++++++ freeglut.changes | 6 ++++++ freeglut.spec | 3 +++ 3 files changed, 24 insertions(+) create mode 100644 freeglut-glextconflict.patch diff --git a/freeglut-glextconflict.patch b/freeglut-glextconflict.patch new file mode 100644 index 0000000..53e02a5 --- /dev/null +++ b/freeglut-glextconflict.patch @@ -0,0 +1,15 @@ +From 4504d201fa35ca2936cb475b59e50bfae93f1650 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +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); diff --git a/freeglut.changes b/freeglut.changes index a80d161..c48aef5 100644 --- a/freeglut.changes +++ b/freeglut.changes @@ -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 diff --git a/freeglut.spec b/freeglut.spec index a7781b1..37dbf94 100644 --- a/freeglut.spec +++ b/freeglut.spec @@ -27,6 +27,8 @@ Group: System/Libraries Url: http://freeglut.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 Source1: glutman.tar.bz2 +# PATCH-FIX-UPSTREAM conflicting types with GLext - coolo@suse.de +Patch0: freeglut-glextconflict.patch BuildRequires: Mesa-devel BuildRequires: gcc-c++ BuildRequires: libdrm-devel @@ -126,6 +128,7 @@ joystick functions on a wide range of platforms. %prep %setup -q -b0 -b1 -n %{name}-%{version} +%patch0 -p1 %build ./autogen.sh