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

[Ronald van Haren]

    Date: Wednesday, October 22, 2008 @ 03:25:00
  Author: ronald
Revision: 16807

Merged revisions 16806 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/clanlib/trunk

........
  r16806 | ronald | 2008-10-22 09:24:09 +0200 (Wed, 22 Oct 2008) | 1 line
  
  upgpkg: clanlib 0.8.1-1
........

Added:
  clanlib/repos/extra-x86_64/clanlib-gcc43.patch
    (from rev 16806, clanlib/trunk/clanlib-gcc43.patch)
Modified:
  clanlib/repos/extra-x86_64/	(properties)
  clanlib/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   28 ++++++++++++++++++++--------
 clanlib-gcc43.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 8 deletions(-)


Property changes on: clanlib/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /clanlib/trunk:1-8985
   + /clanlib/trunk:1-16806

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-22 07:24:09 UTC (rev 16806)
+++ extra-x86_64/PKGBUILD	2008-10-22 07:25:00 UTC (rev 16807)
@@ -1,21 +1,29 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: 
+# Contributor: damir <damir at archlinux.org>
 # Contributor: Orelien <aurelien.foret at wanadoo.fr>
 
 pkgname=clanlib
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc="A multi-platform game development library"
+license=('custom')
 arch=("i686" "x86_64")
 url="http://www.clanlib.org/"
-depends=('libxmu' 'libxi' 'mesa' 'libjpeg' 'libpng' 'libmikmod' 'libvorbis' 'sdl_gfx>=2.0.13')
+depends=('libxmu' 'libxi' 'mesa' 'libjpeg' 'libpng' 'libmikmod' 'libvorbis' \
+	'sdl_gfx>=2.0.13' 'alsa-lib')
 options=('!libtool')
-#source=(http://www.clanlib.org/download/files/ClanLib-$pkgver-1.tar.gz)
-source=("http://www.clanlib.org/download/releases-0.8/ClanLib-$pkgver.tgz")
-md5sums=('3e183a801a31f646b012db2d82f97ff3')
+source=("http://www.clanlib.org/download/releases-0.8/ClanLib-$pkgver.tgz"
+	clanlib-gcc43.patch)
+md5sums=('24e86202eb6d702f788ff16a2718aa97'
+         'af2942a8ab1868ac4d7ceb1c9587c4ad')
 
 build() {
-    cd $startdir/src/ClanLib-$pkgver
+    cd $srcdir/ClanLib-$pkgver
+
+    # patch for building with gcc4.3
+    patch -Np0 -i $srcdir/clanlib-gcc43.patch || return 1
+
     ./configure --prefix=/usr \
                 --disable-static \
                 --enable-clanDisplay \
@@ -27,5 +35,9 @@
                 --enable-clanVorbis
 
     make || return 1
-    make DESTDIR=$startdir/pkg install
+    make DESTDIR=$pkgdir install || return 1
+
+# install custom license
+install -Dm644 $srcdir/ClanLib-$pkgver/COPYING \
+	$pkgdir/usr/share/licenses/$pkgname/COPYING || return 1
 }

Copied: clanlib/repos/extra-x86_64/clanlib-gcc43.patch (from rev 16806, clanlib/trunk/clanlib-gcc43.patch)
===================================================================
--- extra-x86_64/clanlib-gcc43.patch	                        (rev 0)
+++ extra-x86_64/clanlib-gcc43.patch	2008-10-22 07:25:00 UTC (rev 16807)
@@ -0,0 +1,28 @@
+--- Sources/GL/opengl.cpp
++++ Sources/GL/opengl.cpp
+@@ -51,6 +51,8 @@
+ #endif
+ #endif
+ 
++#include <cstring>
++
+ std::vector<std::string> CL_OpenGL::m_ignored_gl_extension;
+ 
+ CL_ProcAddress *CL_OpenGL::get_proc_address(const std::string& function_name)
+@@ -414,4 +416,4 @@
+ #endif
+ 	
+ 	m_ignored_gl_extension.push_back(extension_name);
+-}
+\ No newline at end of file
++}
+--- Sources/Network/Socket/ip_address_getsock.cpp
++++ Sources/Network/Socket/ip_address_getsock.cpp
+@@ -40,6 +40,7 @@
+ #include "ip_address_getsock.h"
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #ifndef WIN32
+ 	#include <sys/socket.h>