From a42593e18947a8ada541cbb081042c8590f7be11 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 6 Aug 2012 21:20:54 -0500
Subject: freeglut 2.8

---
 abs/core/freeglut/2.6.0-GFX_radeon.patch | 28 ----------------------------
 abs/core/freeglut/ChangeLog              |  8 --------
 abs/core/freeglut/PKGBUILD               | 24 ++++++++++--------------
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 abs/core/freeglut/2.6.0-GFX_radeon.patch
 delete mode 100644 abs/core/freeglut/ChangeLog

diff --git a/abs/core/freeglut/2.6.0-GFX_radeon.patch b/abs/core/freeglut/2.6.0-GFX_radeon.patch
deleted file mode 100644
index 8806fe8..0000000
--- a/abs/core/freeglut/2.6.0-GFX_radeon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===================================================================
---- src/freeglut_window.c	(Revision 832)
-+++ src/freeglut_window.c	(Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
-     if ( window )
-     {
--        glXMakeContextCurrent(
-+        glXMakeCurrent(
-             fgDisplay.Display,
-             window->Window.Handle,
--            window->Window.Handle,
-             window->Window.Context
-         );
- 
-@@ -932,10 +932,9 @@
-     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
-                      &fgDisplay.DeleteWindow, 1 );
- 
--    glXMakeContextCurrent(
-+    glXMakeCurrent(
-         fgDisplay.Display,
-         window->Window.Handle,
--        window->Window.Handle,
-         window->Window.Context
-     );
- 
diff --git a/abs/core/freeglut/ChangeLog b/abs/core/freeglut/ChangeLog
deleted file mode 100644
index 7dd6847..0000000
--- a/abs/core/freeglut/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2009-12-30  Eric Belanger  <eric@archlinux.org>
-
-	* freeglut 2.6.0-1
-	* Upstream update
-	* Added libxi depends
-	* Changed license to MIT
-	* Added patch to fix an issue with the radeon[hd] ATI opensource drivers
-	* Added ChangeLog
diff --git a/abs/core/freeglut/PKGBUILD b/abs/core/freeglut/PKGBUILD
index 7752309..afd3f36 100644
--- a/abs/core/freeglut/PKGBUILD
+++ b/abs/core/freeglut/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62079 2010-01-01 23:53:58Z eric $
+# $Id: PKGBUILD 147152 2012-01-23 14:30:00Z heftig $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=freeglut
-pkgver=2.6.0
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=('i686' 'x86_64')
@@ -14,22 +14,18 @@ replaces=('glut')
 provides=('glut')
 conflicts=('glut')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \
-        2.6.0-GFX_radeon.patch)
-md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
-sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-# fixes an issue with the radeon[hd] ATI opensource drivers
-# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
-  patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" || return 1
-
-  ./configure --prefix=/usr || return 1
-  make all || return 1
+  ./configure --prefix=/usr --disable-static
+  make all
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-- 
cgit v0.12