Mercurial > mxe-octave

changeset 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 7c770444d82e
children 579a86151bbc
files src/freeglut-1-fixes.patch src/freeglut.mk
diffstat 2 files changed, 18 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/freeglut-1-fixes.patch	Mon Jan 02 15:09:33 2012 +0100
+++ b/src/freeglut-1-fixes.patch	Tue Jan 03 10:56:09 2012 +0100
@@ -3,13 +3,19 @@
 
 Contains ad hoc patches for cross building.
 
-From 80e19ec2e4f84fb9d0959993b53ade4bd6cb9195 Mon Sep 17 00:00:00 2001
+From 87a791a05687c7737d1c50381a0de30ba1acf96e Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Mon, 24 Oct 2011 09:40:10 +0200
 Subject: [PATCH] add pkg-config support
 
 based on
 http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html
+---
+ Makefile.am  |    3 +++
+ configure.ac |    1 +
+ glut.pc.in   |   12 ++++++++++++
+ 3 files changed, 16 insertions(+), 0 deletions(-)
+ create mode 100644 glut.pc.in
 
 diff --git a/Makefile.am b/Makefile.am
 index 39c5628..b504bc6 100644
@@ -23,15 +29,15 @@
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = glut.pc
 diff --git a/configure.ac b/configure.ac
-index 2f81174..5f069f7 100644
+index 15dc997..2f25bcb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -95,5 +95,5 @@ if test "x$enable_debug" = xyes; then
- fi
- 
- # Generate output.
--AC_CONFIG_FILES([Makefile doc/Makefile include/GL/Makefile include/Makefile progs/Makefile progs/demos/CallbackMaker/Makefile progs/demos/Fractals/Makefile progs/demos/Fractals_random/Makefile progs/demos/Lorenz/Makefile progs/demos/Makefile progs/demos/One/Makefile progs/demos/shapes/Makefile progs/demos/smooth_opengl3/Makefile progs/demos/spaceball/Makefile src/Makefile])
-+AC_CONFIG_FILES([Makefile doc/Makefile include/GL/Makefile include/Makefile progs/Makefile progs/demos/CallbackMaker/Makefile progs/demos/Fractals/Makefile progs/demos/Fractals_random/Makefile progs/demos/Lorenz/Makefile progs/demos/Makefile progs/demos/One/Makefile progs/demos/shapes/Makefile progs/demos/smooth_opengl3/Makefile progs/demos/spaceball/Makefile src/Makefile glut.pc])
+@@ -119,5 +119,6 @@ AC_CONFIG_FILES([
+ 	progs/demos/spaceball/Makefile
+ 	progs/demos/subwin/Makefile
+ 	src/Makefile
++	glut.pc
+ ])
  AC_OUTPUT
 diff --git a/glut.pc.in b/glut.pc.in
 new file mode 100644
@@ -52,5 +58,5 @@
 +Cflags: -DFREEGLUT_STATIC -I${includedir}
 +
 -- 
-1.7.7
+1.7.8
 
--- a/src/freeglut.mk	Mon Jan 02 15:09:33 2012 +0100
+++ b/src/freeglut.mk	Tue Jan 03 10:56:09 2012 +0100
@@ -4,12 +4,12 @@
 # freeglut
 PKG             := freeglut
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.6.0
-$(PKG)_CHECKSUM := 68306c4486c13d005a4e4d54035e0c0b1bdc220b
+$(PKG)_VERSION  := 2.8.0
+$(PKG)_CHECKSUM := 4debbe559c6c9841ce1abaddc9d461d17c6083b1
 $(PKG)_SUBDIR   := freeglut-$(word 1,$(subst -, ,$($(PKG)_VERSION)))
 $(PKG)_FILE     := freeglut-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://freeglut.sourceforge.net/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
@@ -20,10 +20,6 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./autogen.sh
-    $(SED) -i 's,Windows\.h,windows.h,'   '$(1)/src/freeglut_internal.h'
-    $(SED) -i 's,WindowsX\.h,windowsx.h,' '$(1)/src/freeglut_internal.h'
-    $(SED) -i 's,MMSystem\.h,mmsystem.h,' '$(1)/src/freeglut_internal.h'
-    $(SED) -i 's,Windows\.h,windows.h,'   '$(1)/include/GL/freeglut_std.h'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \