diff options
| -rw-r--r-- | abs/core/freeglut/2.6.0-GFX_radeon.patch | 28 | ||||
| -rw-r--r-- | abs/core/freeglut/ChangeLog | 8 | ||||
| -rw-r--r-- | abs/core/freeglut/PKGBUILD | 33 |
3 files changed, 55 insertions, 14 deletions
diff --git a/abs/core/freeglut/2.6.0-GFX_radeon.patch b/abs/core/freeglut/2.6.0-GFX_radeon.patch new file mode 100644 index 0000000..8806fe8 --- /dev/null +++ b/abs/core/freeglut/2.6.0-GFX_radeon.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..7dd6847 --- /dev/null +++ b/abs/core/freeglut/ChangeLog @@ -0,0 +1,8 @@ +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 402ef70..7752309 100644 --- a/abs/core/freeglut/PKGBUILD +++ b/abs/core/freeglut/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id: PKGBUILD 62079 2010-01-01 23:53:58Z eric $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=freeglut -pkgver=2.4.0 -pkgrel=3 +pkgver=2.6.0 +pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64') url="http://freeglut.sourceforge.net/" -license=('custom') -depends=('libxxf86vm' 'mesa') +license=('MIT') +depends=('libxxf86vm' 'mesa' 'libxi') replaces=('glut') provides=('glut') conflicts=('glut') options=('!libtool') source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \ - glut-cursor-inherit.patch) -md5sums=('6d16873bd876fbf4980a927cfbc496a1' 'd6ba7e22ebb0fd7904b8e18c97475ba6') -sha1sums=('91a528aa72758b7288a0d69a964b1b7e3f322a12' '9353d7b811fdfd6f0c5766f0e93924ca63e9d6a9') + 2.6.0-GFX_radeon.patch) +md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3') +sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - patch -Np1 -i ${startdir}/src/glut-cursor-inherit.patch || return 1 - sed -i 's/-Werror//' configure - ./configure --prefix=/usr + 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 - make DESTDIR=${startdir}/pkg install - install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install || return 1 + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 } |