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

[Eric Bélanger]

    Date: Tuesday, February 17, 2009 @ 22:11:26
  Author: eric
Revision: 27266

Merged revisions 356,27262 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openal/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r27262 | eric | 2009-02-17 21:51:13 -0500 (Tue, 17 Feb 2009) | 2 lines
  
  upgpkg: openal 1.6.372-1
      upstream update, updated source url, removed force option, removed cvs makedepends, updated to use cmake for building, removed old patch
........

Modified:
  openal/repos/extra-i686/	(properties)
  openal/repos/extra-i686/PKGBUILD
Deleted:
  openal/repos/extra-i686/openal-c++.patch

------------------+
 PKGBUILD         |   27 +++++++++++----------------
 openal-c++.patch |   21 ---------------------
 2 files changed, 11 insertions(+), 37 deletions(-)


Property changes on: openal/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openal/trunk:1
   + /openal/trunk:1-27265

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-18 03:08:16 UTC (rev 27265)
+++ extra-i686/PKGBUILD	2009-02-18 03:11:26 UTC (rev 27266)
@@ -3,28 +3,23 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 
 pkgname=openal
-pkgver=0.0.8
-pkgrel=4
-force=y
+pkgver=1.6.372
+pkgrel=1
 pkgdesc="OpenAL audio library for use with opengl"
 arch=('i686' 'x86_64')
 url="http://www.openal.org/"
-license="LGPL"
+license=('LGPL')
 depends=('glibc')
-makedepends=('cvs' 'alsa-lib' 'sdl' 'pkgconfig')
+makedepends=('alsa-lib' 'sdl' 'pkgconfig' 'cmake')
 options=('!libtool')
-source=(http://www.openal.org/openal_webstf/downloads/${pkgname}-${pkgver}.tar.gz
-	openal-c++.patch)
-md5sums=('641cf53761f35ee979f3e888614797a0' 'aadaa32edb85c3ea3cc99aa1d3cd7089')
+source=(http://connect.creativelabs.com/openal/Downloads/openal-soft-${pkgver}.tar.bz2)
+md5sums=('8dc255ba24859953335a0402a644c4ca')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/openal-c++.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --enable-alsa --enable-alsa-dlopen \
-	      --enable-sdl --enable-sdl-dlopen
+  cd ${startdir}/src/${pkgname}-soft-${pkgver}
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg/ install
-
-  sed -i -e 's/@requirements@//' ${startdir}/pkg/usr/lib/pkgconfig/openal.pc || return 1
+  make DESTDIR=${startdir}/pkg/ install  || return 1
 }

Deleted: extra-i686/openal-c++.patch
===================================================================
--- extra-i686/openal-c++.patch	2009-02-18 03:08:16 UTC (rev 27265)
+++ extra-i686/openal-c++.patch	2009-02-18 03:11:26 UTC (rev 27266)
@@ -1,21 +0,0 @@
-diff -Naur openal-0.0.8-orig/common/include/AL/alc.h openal-0.0.8/common/include/AL/alc.h
---- openal-0.0.8-orig/common/include/AL/alc.h	2006-02-11 03:36:55.000000000 -0600
-+++ openal-0.0.8/common/include/AL/alc.h	2007-02-13 14:33:57.000000000 -0600
-@@ -187,7 +187,7 @@
- 
- ALC_API void            ALC_APIENTRY alcDestroyContext( ALCcontext *context );
- 
--ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( ALCvoid );
-+ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( void );
- 
- ALC_API ALCdevice*      ALC_APIENTRY alcGetContextsDevice( ALCcontext *context );
- 
-@@ -248,7 +248,7 @@
- typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context );
- typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context );
- typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context );
--typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid );
-+typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void );
- typedef ALCdevice *    (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context );
- typedef ALCdevice *    (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename );
- typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device );