Mercurial > mxe-octave

comparison src/freeglut-1-fixes.patch @ 6191:dba78afaaad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
glut: Update to v3.2.1 * src/freeglut.mk: update version, checksum, build with cmake * src/freeglut-1-fixes.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Sat, 30 Apr 2022 08:03:45 -0400
parents 99516e73b368
children
comparison
equal deleted inserted replaced
6189:4fcf129648a7 6191:dba78afaaad1
1 This file is part of MXE. 1 diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c
2 See index.html for further information. 2 index 38b0acbb..f79c432a 100644
3 3 --- a/src/fg_gl2.c
4 Contains ad hoc patches for cross building. 4 +++ b/src/fg_gl2.c
5 5 @@ -27,6 +27,18 @@
6 From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 6 #include "fg_internal.h"
7 From: MXE 7 #include "fg_gl2.h"
8 Date: Mon, 24 Oct 2011 09:40:10 +0200
9 Subject: [PATCH] add pkg-config support
10
11 based on
12 http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html
13
14 proposed to upstream
15 https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032
16 ---
17 Makefile.am | 3 +++
18 configure.ac | 1 +
19 glut.pc.in | 12 ++++++++++++
20 3 files changed, 16 insertions(+), 0 deletions(-)
21 create mode 100644 glut.pc.in
22
23 diff --git a/Makefile.am b/Makefile.am
24 index 39c5628..b504bc6 100644
25 --- a/Makefile.am
26 +++ b/Makefile.am
27 @@ -68,3 +68,6 @@ dist-hook:
28 8
29 libtool: $(LIBTOOL_DEPS) 9 +#ifdef GL_ES_VERSION_2_0
30 $(SHELL) ./config.status --recheck 10 +/* Use existing functions on GLES 2.0 */
11 +#else
12 +FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
13 +FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
14 +FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
15 +FGH_PFNGLBUFFERDATAPROC fghBufferData;
16 +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
17 +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
18 +FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
19 +#endif
31 + 20 +
32 +pkgconfigdir = $(libdir)/pkgconfig 21 void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
33 +pkgconfig_DATA = glut.pc 22 if (fgStructure.CurrentWindow != NULL)
34 diff --git a/configure.ac b/configure.ac 23 fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
35 index 15dc997..2f25bcb 100644 24 diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
36 --- a/configure.ac 25 index ab8ba5c7..fb3d4676 100644
37 +++ b/configure.ac 26 --- a/src/fg_gl2.h
38 @@ -119,5 +119,6 @@ AC_CONFIG_FILES([ 27 +++ b/src/fg_gl2.h
39 progs/demos/spaceball/Makefile 28 @@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
40 progs/demos/subwin/Makefile 29 typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
41 src/Makefile 30 typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
42 + glut.pc 31
43 ]) 32 -FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
44 AC_OUTPUT 33 -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
45 diff --git a/glut.pc.in b/glut.pc.in 34 -FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
46 new file mode 100644 35 -FGH_PFNGLBUFFERDATAPROC fghBufferData;
47 index 0000000..ea57c4a 36 -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
48 --- /dev/null 37 -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
49 +++ b/glut.pc.in 38 -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
50 @@ -0,0 +1,12 @@ 39 +extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
51 +prefix=@prefix@ 40 +extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
52 +exec_prefix=@exec_prefix@ 41 +extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
53 +libdir=@libdir@ 42 +extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
54 +includedir=@includedir@/@PACKAGE@ 43 +extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
55 + 44 +extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
56 +Name: glut 45 +extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
57 +Description: A freely licensed alternative to the GLUT library 46
58 +Version: @VERSION@ 47 # endif
59 +Libs: -L${libdir} -lglut 48
60 +Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows
61 +Cflags: -DFREEGLUT_STATIC -I${includedir}
62 +
63 --
64 1.7.8
65