[arch-commits] Commit in ftgl/repos (3 files)

[Eric Bélanger]

    Date: Saturday, March 21, 2009 @ 03:48:33
  Author: eric
Revision: 30664

Merged revisions 30663 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ftgl/trunk

........
  r30663 | eric | 2009-03-21 03:48:11 -0400 (Sat, 21 Mar 2009) | 2 lines
  
  upgpkg: ftgl 2.1.3rc5-1
      Upstream update, Updated url, Added license, Removed old patch
........

Modified:
  ftgl/repos/extra-x86_64/	(properties)
  ftgl/repos/extra-x86_64/PKGBUILD
Deleted:
  ftgl/repos/extra-x86_64/ftgl-gcc411.patch

-------------------+
 PKGBUILD          |   31 +++++++++++++++----------------
 ftgl-gcc411.patch |   12 ------------
 2 files changed, 15 insertions(+), 28 deletions(-)


Property changes on: ftgl/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ftgl/trunk:1-20857
   + /ftgl/trunk:1-30663

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-21 07:48:11 UTC (rev 30663)
+++ extra-x86_64/PKGBUILD	2009-03-21 07:48:33 UTC (rev 30664)
@@ -1,25 +1,24 @@
 # $Id$
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: tobias <tobias at archlinux.org>
+
 pkgname=ftgl
-pkgver=2.1.2
-pkgrel=3
+pkgver=2.1.3rc5
+pkgrel=1
 pkgdesc="OpenGL library to use arbitrary fonts"
-arch=(i686 x86_64)
-source=(http://opengl.geek.nz/ftgl/$pkgname-$pkgver.tar.gz ftgl-gcc411.patch)
-url="http://homepages.paradise.net.nz/henryj/code/"
-options=(!libtool)
-depends=(freetype2 glut)
-makedepends=(doxygen)
+arch=('i686' 'x86_64')
+url="http://ftgl.wiki.sourceforge.net/"
+license=('MIT')
+depends=('freetype2' 'glut')
+makedepends=('doxygen')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/ftgl/$pkgname-2.1.3-rc5.tar.bz2)
+md5sums=('c7879018cde844059495b3029b0b6503')
 
 build() {
-  cd $startdir/src/FTGL/
-  patch -Np1 -i ${startdir}/src/ftgl-gcc411.patch || return 1
-  cd unix
-  sed -i 's|^    \$|	$|g' src/Makefile
-  ./configure --prefix=/usr --with-pic
+  cd $srcdir/ftgl-2.1.3~rc5
+  ./configure --prefix=/usr --with-pic || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
-
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
 }
-md5sums=('3eabec9ad37371c4d139408c7ffd2429' '2a4ad16c1bfae869a8bf0ddababfd25a')

Deleted: extra-x86_64/ftgl-gcc411.patch
===================================================================
--- extra-x86_64/ftgl-gcc411.patch	2009-03-21 07:48:11 UTC (rev 30663)
+++ extra-x86_64/ftgl-gcc411.patch	2009-03-21 07:48:33 UTC (rev 30664)
@@ -1,12 +0,0 @@
-diff -ruN FTGL.org/include/FTTextureGlyph.h FTGL/include/FTTextureGlyph.h
---- FTGL.org/include/FTTextureGlyph.h	2006-07-11 17:49:42.000000000 +0200
-+++ FTGL/include/FTTextureGlyph.h	2006-07-11 17:50:23.000000000 +0200
-@@ -52,7 +52,7 @@
-          * Reset the currently active texture to zero to get into a known state before
-          * drawing a string. This is to get round possible threading issues.
-          */
--        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
-+        static void ResetActiveTexture(){ activeTextureID = 0;}
-         
-     private:
-         /**