[arch-commits] Commit in freeglut/trunk (2.6.0-GFX_radeon.patch ChangeLog PKGBUILD)

Jan Steffens heftig at archlinux.org
Fri Jan 20 20:49:41 UTC 2012


    Date: Friday, January 20, 2012 @ 15:49:40
  Author: heftig
Revision: 147021

2.8.0

Modified:
  freeglut/trunk/PKGBUILD
Deleted:
  freeglut/trunk/2.6.0-GFX_radeon.patch
  freeglut/trunk/ChangeLog

------------------------+
 2.6.0-GFX_radeon.patch |   28 ----------------------------
 ChangeLog              |    8 --------
 PKGBUILD               |   23 +++++++++++------------
 3 files changed, 11 insertions(+), 48 deletions(-)

Deleted: 2.6.0-GFX_radeon.patch
===================================================================
--- 2.6.0-GFX_radeon.patch	2012-01-20 20:01:07 UTC (rev 147020)
+++ 2.6.0-GFX_radeon.patch	2012-01-20 20:49:40 UTC (rev 147021)
@@ -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
-     );
- 

Deleted: ChangeLog
===================================================================
--- ChangeLog	2012-01-20 20:01:07 UTC (rev 147020)
+++ ChangeLog	2012-01-20 20:49:40 UTC (rev 147021)
@@ -1,8 +0,0 @@
-2009-12-30  Eric Belanger  <eric at 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-20 20:01:07 UTC (rev 147020)
+++ PKGBUILD	2012-01-20 20:49:40 UTC (rev 147021)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at 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,19 +14,18 @@
 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 --disable-static
+  make all
+}
 
-  ./configure --prefix=/usr || return 1
-  make all || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }




More information about the arch-commits mailing list