Mercurial > mxe-octave
annotate src/freeglut-1-fixes.patch @ 3988:5b8ff612595a
of-nan: update to v2.8.1
* src/of-nan.mk: update version, checksum
* src/build_packages.m: update nan version
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Tue, 07 Jul 2015 20:16:48 -0400 |
parents | 99516e73b368 |
children | dba78afaaad1 |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2328
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
2040
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
2201 | 6 From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2328
diff
changeset
|
7 From: MXE |
2040
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
8 Date: Mon, 24 Oct 2011 09:40:10 +0200 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
9 Subject: [PATCH] add pkg-config support |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
10 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
11 based on |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html |
2328
bec415758d1b
freeglut: Mention corresponding issue tracker entry in patch
Volker Grabsch <vog@notjusthosting.com>
parents:
2201
diff
changeset
|
13 |
bec415758d1b
freeglut: Mention corresponding issue tracker entry in patch
Volker Grabsch <vog@notjusthosting.com>
parents:
2201
diff
changeset
|
14 proposed to upstream |
bec415758d1b
freeglut: Mention corresponding issue tracker entry in patch
Volker Grabsch <vog@notjusthosting.com>
parents:
2201
diff
changeset
|
15 https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032 |
2201 | 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 | |
2040
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 diff --git a/Makefile.am b/Makefile.am |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 index 39c5628..b504bc6 100644 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
25 --- a/Makefile.am |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 +++ b/Makefile.am |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 @@ -68,3 +68,6 @@ dist-hook: |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 libtool: $(LIBTOOL_DEPS) |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 $(SHELL) ./config.status --recheck |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
31 + |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 +pkgconfigdir = $(libdir)/pkgconfig |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
33 +pkgconfig_DATA = glut.pc |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 diff --git a/configure.ac b/configure.ac |
2201 | 35 index 15dc997..2f25bcb 100644 |
2040
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
36 --- a/configure.ac |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
37 +++ b/configure.ac |
2201 | 38 @@ -119,5 +119,6 @@ AC_CONFIG_FILES([ |
39 progs/demos/spaceball/Makefile | |
40 progs/demos/subwin/Makefile | |
41 src/Makefile | |
42 + glut.pc | |
43 ]) | |
2040
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
44 AC_OUTPUT |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
45 diff --git a/glut.pc.in b/glut.pc.in |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 new file mode 100644 |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
47 index 0000000..ea57c4a |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
48 --- /dev/null |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
49 +++ b/glut.pc.in |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
50 @@ -0,0 +1,12 @@ |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
51 +prefix=@prefix@ |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
52 +exec_prefix=@exec_prefix@ |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
53 +libdir=@libdir@ |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
54 +includedir=@includedir@/@PACKAGE@ |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
55 + |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
56 +Name: glut |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
57 +Description: A freely licensed alternative to the GLUT library |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
58 +Version: @VERSION@ |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
59 +Libs: -L${libdir} -lglut |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
60 +Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
61 +Cflags: -DFREEGLUT_STATIC -I${includedir} |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
62 + |
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
63 -- |
2201 | 64 1.7.8 |
2040
8b909011187a
package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
65 |