summaryrefslogtreecommitdiff
path: root/package/freeglut
diff options
context:
space:
mode:
Diffstat (limited to 'package/freeglut')
-rw-r--r--package/freeglut/Makefile7
-rw-r--r--package/freeglut/patches/patch-Makefile_in31
-rw-r--r--package/freeglut/patches/patch-progs_Makefile_in11
3 files changed, 4 insertions, 45 deletions
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index cee02625d..84f8246c5 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= freeglut
-PKG_VERSION:= 3.0.0
+PKG_VERSION:= 3.6.0
PKG_RELEASE:= 1
-PKG_HASH:= 2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2
+PKG_HASH:= 9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52
PKG_DESCR:= opengl utility toolkit libraries
PKG_SECTION:= libs/video
PKG_DEPENDS:= libglu
@@ -18,13 +18,14 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el x86 x86_64
+PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el sh x86 x86_64
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= cmake
+CMAKE_FLAGS+= -DFREEGLUT_BUILD_DEMOS=OFF
freeglut-install:
$(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib
diff --git a/package/freeglut/patches/patch-Makefile_in b/package/freeglut/patches/patch-Makefile_in
deleted file mode 100644
index 143efe98a..000000000
--- a/package/freeglut/patches/patch-Makefile_in
+++ /dev/null
@@ -1,31 +0,0 @@
---- freeglut-2.6.0.orig/Makefile.in 2009-11-25 20:14:30.000000000 +0100
-+++ freeglut-2.6.0/Makefile.in 2012-03-12 15:05:53.767407283 +0100
-@@ -220,28 +220,6 @@ EXTRA_DIST = \
- freeglut_static_vs2008.vcproj \
- freeglut_vs2008.sln \
- freeglut_vs2008.vcproj \
-- progs/demos/CallbackMaker/CallbackMakerStatic.dsp \
-- progs/demos/CallbackMaker/CallbackMakerStatic_vs2008.vcproj \
-- progs/demos/CallbackMaker/CallbackMaker_vs2008.vcproj \
-- progs/demos/Fractals/FractalsStatic.dsp \
-- progs/demos/Fractals/FractalsStatic_vs2008.vcproj \
-- progs/demos/Fractals/Fractals_vs2008.vcproj \
-- progs/demos/Fractals_random/Fractals_randomStatic.dsp \
-- progs/demos/Fractals_random/Fractals_randomStatic_vs2008.vcproj \
-- progs/demos/Fractals_random/Fractals_random_vs2008.vcproj \
-- progs/demos/Lorenz/lorenzStatic.dsp \
-- progs/demos/Lorenz/lorenzStatic_vs2008.vcproj \
-- progs/demos/Lorenz/lorenz_vs2008.vcproj \
-- progs/demos/One/oneStatic.dsp \
-- progs/demos/One/oneStatic_vs2008.vcproj \
-- progs/demos/One/one_vs2008.vcproj \
-- progs/demos/demos_vs2008.sln \
-- progs/demos/shapes/shapesStatic.dsp \
-- progs/demos/shapes/shapesStatic_vs2008.vcproj \
-- progs/demos/shapes/shapes_vs2008.vcproj \
-- progs/demos/smooth_opengl3/smooth_opengl3Static.dsp \
-- progs/demos/smooth_opengl3/smooth_opengl3Static_vs2008.vcproj \
-- progs/demos/smooth_opengl3/smooth_opengl3_vs2008.vcproj
-
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/package/freeglut/patches/patch-progs_Makefile_in b/package/freeglut/patches/patch-progs_Makefile_in
deleted file mode 100644
index e5d2993d1..000000000
--- a/package/freeglut/patches/patch-progs_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeglut-2.6.0.orig/progs/Makefile.in 2009-11-25 20:14:29.000000000 +0100
-+++ freeglut-2.6.0/progs/Makefile.in 2012-03-12 15:06:38.667411355 +0100
-@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = demos
-+SUBDIRS =
- all: all-recursive
-
- .SUFFIXES: