Mercurial > mxe-octave

annotate src/freeglut-1-fixes.patch @ 2201:1177e9d46712

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package freeglut
author Mark Brand <mabrand@mabrand.nl>
date Tue, 03 Jan 2012 10:56:09 +0100
parents 8b909011187a
children bec415758d1b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
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
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
6 From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 From: mingw-cross-env
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
2201
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
13 ---
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
14 Makefile.am | 3 +++
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
15 configure.ac | 1 +
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
16 glut.pc.in | 12 ++++++++++++
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
17 3 files changed, 16 insertions(+), 0 deletions(-)
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
18 create mode 100644 glut.pc.in
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 diff --git a/Makefile.am b/Makefile.am
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 index 39c5628..b504bc6 100644
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 --- a/Makefile.am
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 +++ b/Makefile.am
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 @@ -68,3 +68,6 @@ dist-hook:
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 libtool: $(LIBTOOL_DEPS)
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 $(SHELL) ./config.status --recheck
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 +pkgconfigdir = $(libdir)/pkgconfig
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 +pkgconfig_DATA = glut.pc
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 diff --git a/configure.ac b/configure.ac
2201
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
32 index 15dc997..2f25bcb 100644
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 --- a/configure.ac
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 +++ b/configure.ac
2201
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
35 @@ -119,5 +119,6 @@ AC_CONFIG_FILES([
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
36 progs/demos/spaceball/Makefile
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
37 progs/demos/subwin/Makefile
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
38 src/Makefile
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
39 + glut.pc
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
40 ])
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 AC_OUTPUT
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 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
43 new file mode 100644
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 index 0000000..ea57c4a
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 --- /dev/null
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 +++ b/glut.pc.in
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 @@ -0,0 +1,12 @@
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 +prefix=@prefix@
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 +exec_prefix=@exec_prefix@
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 +libdir=@libdir@
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 +includedir=@includedir@/@PACKAGE@
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 +
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 +Name: glut
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 +Description: A freely licensed alternative to the GLUT library
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 +Version: @VERSION@
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 +Libs: -L${libdir} -lglut
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 +Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 +Cflags: -DFREEGLUT_STATIC -I${includedir}
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 +
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 --
2201
1177e9d46712 update package freeglut
Mark Brand <mabrand@mabrand.nl>
parents: 2040
diff changeset
61 1.7.8
2040
8b909011187a package freeglut: add pkg-config support
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62