From d2018a1e2a1ca6eac95d6c65e90c273f31d1f196 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 25 Oct 2013 12:23:41 +0200
Subject: fix freeglut compile, add missing dependency glu. needed after
 mesa-lib update. library is split out from mesa-lib

---
 package/freeglut/Makefile                |  7 ++++---
 package/freeglut/patches/patch-ltmain_sh | 11 -----------
 package/glu/Makefile                     | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 14 deletions(-)
 delete mode 100644 package/freeglut/patches/patch-ltmain_sh
 create mode 100644 package/glu/Makefile

diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index 8dbc3f498..c5fcd5a18 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -4,12 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		freeglut
-PKG_VERSION:=		2.6.0
+PKG_VERSION:=		2.8.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		39f0f2de89f399529d2b981188082218
+PKG_MD5SUM:=		918ffbddcffbac83c218bc52355b6d5a
 PKG_DESCR:=		OpenGL Utility Toolkit libraries
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		MesaLib
+PKG_DEPENDS:=		libglu
+PKG_BUILDDEP:=		glu
 PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 PKG_NEED_CXX:=		1
diff --git a/package/freeglut/patches/patch-ltmain_sh b/package/freeglut/patches/patch-ltmain_sh
deleted file mode 100644
index 7ae2ccf9f..000000000
--- a/package/freeglut/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeglut-2.6.0.orig/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
-+++ freeglut-2.6.0/ltmain.sh	2011-01-14 21:40:47.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
diff --git a/package/glu/Makefile b/package/glu/Makefile
new file mode 100644
index 000000000..d24c6fa6f
--- /dev/null
+++ b/package/glu/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		glu
+PKG_VERSION:=		9.0.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		be9249132ff49275461cf92039083030
+PKG_DESCR:=		GLU library
+PKG_SECTION:=		libs
+PKG_URL:=		http://cgit.freedesktop.org/mesa/glu/
+PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/glu/
+PKG_LIBNAME:=		libglu
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBGLU,libglu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libglu-install:
+	$(INSTALL_DIR) $(IDIR_LIBGLU)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libGLU.so* \
+		$(IDIR_LIBGLU)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3