[arch-commits] Commit in apricots/repos (8 files)

2014-06-30 Thread Jan Steffens
Date: Monday, June 30, 2014 @ 20:52:48
  Author: heftig
Revision: 215866

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  apricots/repos/extra-i686/PKGBUILD
(from rev 215865, apricots/trunk/PKGBUILD)
  apricots/repos/extra-i686/apricots-0.2.6-freealut.patch
(from rev 215865, apricots/trunk/apricots-0.2.6-freealut.patch)
  apricots/repos/extra-x86_64/PKGBUILD
(from rev 215865, apricots/trunk/PKGBUILD)
  apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch
(from rev 215865, apricots/trunk/apricots-0.2.6-freealut.patch)
Deleted:
  apricots/repos/extra-i686/PKGBUILD
  apricots/repos/extra-i686/apricots-0.2.6-freealut.patch
  apricots/repos/extra-x86_64/PKGBUILD
  apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch

+
 /PKGBUILD  |   56 +++
 /apricots-0.2.6-freealut.patch |  130 +++
 extra-i686/PKGBUILD|   28 -
 extra-i686/apricots-0.2.6-freealut.patch   |   65 -
 extra-x86_64/PKGBUILD  |   28 -
 extra-x86_64/apricots-0.2.6-freealut.patch |   65 -
 6 files changed, 186 insertions(+), 186 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-06-30 18:50:09 UTC (rev 215865)
+++ extra-i686/PKGBUILD 2014-06-30 18:52:48 UTC (rev 215866)
@@ -1,28 +0,0 @@
-# $Id$
-# Contributor: Damir Perisa damir.per...@bluewin.ch
-
-pkgname=apricots
-pkgver=0.2.6
-pkgrel=5
-pkgdesc=A simple 2D flying/bombing game similar to basic side scrollers
-arch=(i686 x86_64)
-license=('GPL')
-url=http://www.fishies.org.uk/apricots.html;
-depends=('gcc-libs' 'openal' 'sdl' 'freealut')
-#source=(http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz;
-source=(ftp://ftp.archlinux.org/other/apricots/$pkgname-$pkgver.tar.gz;
-apricots-0.2.6-freealut.patch)
-md5sums=('910828d717e46d8cbd9c24f702d09fbc'
- '5f9f74082dfe162ab3ba51f6ec628f99')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
-  ./configure --prefix=/usr
-  make LIBTOOL='/usr/bin/libtool'
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-}

Copied: apricots/repos/extra-i686/PKGBUILD (from rev 215865, 
apricots/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-06-30 18:52:48 UTC (rev 215866)
@@ -0,0 +1,28 @@
+# $Id$
+# Contributor: Damir Perisa damir.per...@bluewin.ch
+
+pkgname=apricots
+pkgver=0.2.6
+pkgrel=6
+pkgdesc=A simple 2D flying/bombing game similar to basic side scrollers
+arch=(i686 x86_64)
+license=('GPL')
+url=http://www.fishies.org.uk/apricots.html;
+depends=('gcc-libs' 'openal' 'sdl' 'freealut')
+#source=(http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz;
+source=(ftp://ftp.archlinux.org/other/apricots/$pkgname-$pkgver.tar.gz;
+apricots-0.2.6-freealut.patch)
+md5sums=('910828d717e46d8cbd9c24f702d09fbc'
+ '5f9f74082dfe162ab3ba51f6ec628f99')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
+  ./configure --prefix=/usr
+  make LIBTOOL='/usr/bin/libtool'
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make prefix=$pkgdir/usr install
+}

Deleted: extra-i686/apricots-0.2.6-freealut.patch
===
--- extra-i686/apricots-0.2.6-freealut.patch2014-06-30 18:50:09 UTC (rev 
215865)
+++ extra-i686/apricots-0.2.6-freealut.patch2014-06-30 18:52:48 UTC (rev 
215866)
@@ -1,65 +0,0 @@
 apricots/apricots.cpp
-+++ apricots/apricots.cpp
-@@ -16,6 +16,7 @@
- int main(int, char**){
- #endif
- 
-+atexit(SDL_Quit);
-   // Initialize data
-   gamedata g;
-   init_data(g);
-
 apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
-   alListenerfv(AL_ORIENTATION, front );
- 
-   // Load in samples
--  ALvoid* data = malloc(5 * (512 * 3) * 1024);
-   alGenBuffers(numsamples, samples);
- 
-   for (int i = 0; i  numsamples; i++){
--ALsizei freq;
--ALboolean fileok;
- // Evil OpenAL portability fix done here
- #ifdef _WIN32
- ALenum format;
-@@ -87,15 +84,12 @@
- alutLoadWAVFile(filenames[i],format,data,filelen,freq,trash);
- fileok = (alGetError() == AL_NO_ERROR);
- #else
--ALsizei format;
--ALsizei trash;
--fileok = alutLoadWAV(filenames[i],data,format,filelen,trash,freq);
-+  samples[i] = alutCreateBufferFromFile(filenames[i]);
- #endif
--if (!fileok){
-+if (samples[i] == AL_NONE){
-   cerr  sampleio: could not open   filenames[i]  endl;
-   exit(1);
- } 
--alBufferData(samples[i], format, data, filelen, freq);
-   }
- 
-   // Generate Sources
-@@ -107,7 +101,6 @@
- alSourcefv(sources[j], AL_ORIENTATION, back );
-   }
-   
--  free(data);
- 

[arch-commits] Commit in apricots/repos (8 files)

2011-11-30 Thread Jan Steffens
Date: Wednesday, November 30, 2011 @ 08:08:53
  Author: heftig
Revision: 143883

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  apricots/repos/extra-i686/PKGBUILD
(from rev 143882, apricots/trunk/PKGBUILD)
  apricots/repos/extra-i686/apricots-0.2.6-freealut.patch
(from rev 143882, apricots/trunk/apricots-0.2.6-freealut.patch)
  apricots/repos/extra-x86_64/PKGBUILD
(from rev 143882, apricots/trunk/PKGBUILD)
  apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch
(from rev 143882, apricots/trunk/apricots-0.2.6-freealut.patch)
Deleted:
  apricots/repos/extra-i686/PKGBUILD
  apricots/repos/extra-i686/apricots-0.2.6-freealut.patch
  apricots/repos/extra-x86_64/PKGBUILD
  apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch

+
 extra-i686/PKGBUILD|   55 +--
 extra-i686/apricots-0.2.6-freealut.patch   |  130 +--
 extra-x86_64/PKGBUILD  |   55 +--
 extra-x86_64/apricots-0.2.6-freealut.patch |  130 +--
 4 files changed, 186 insertions(+), 184 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-30 13:07:39 UTC (rev 143882)
+++ extra-i686/PKGBUILD 2011-11-30 13:08:53 UTC (rev 143883)
@@ -1,27 +0,0 @@
-# $Id$
-# Contributor: Damir Perisa damir.per...@bluewin.ch
-
-pkgname=apricots
-pkgver=0.2.6
-pkgrel=4
-pkgdesc=A simple 2D flying/bombing game similar to basic side scrollers
-arch=(i686 x86_64)
-license=('GPL')
-url=http://www.fishies.org.uk/apricots.html;
-depends=('gcc-libs' 'openal' 'sdl' 'freealut')
-source=(http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz;
-apricots-0.2.6-freealut.patch)
-md5sums=('910828d717e46d8cbd9c24f702d09fbc'
- '5f9f74082dfe162ab3ba51f6ec628f99')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
-  ./configure --prefix=/usr
-  make LIBTOOL='/usr/bin/libtool'
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-}

Copied: apricots/repos/extra-i686/PKGBUILD (from rev 143882, 
apricots/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-30 13:08:53 UTC (rev 143883)
@@ -0,0 +1,28 @@
+# $Id$
+# Contributor: Damir Perisa damir.per...@bluewin.ch
+
+pkgname=apricots
+pkgver=0.2.6
+pkgrel=5
+pkgdesc=A simple 2D flying/bombing game similar to basic side scrollers
+arch=(i686 x86_64)
+license=('GPL')
+url=http://www.fishies.org.uk/apricots.html;
+depends=('gcc-libs' 'openal' 'sdl' 'freealut')
+#source=(http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz;
+source=(ftp://ftp.archlinux.org/other/apricots/$pkgname-$pkgver.tar.gz;
+apricots-0.2.6-freealut.patch)
+md5sums=('910828d717e46d8cbd9c24f702d09fbc'
+ '5f9f74082dfe162ab3ba51f6ec628f99')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
+  ./configure --prefix=/usr
+  make LIBTOOL='/usr/bin/libtool'
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make prefix=$pkgdir/usr install
+}

Deleted: extra-i686/apricots-0.2.6-freealut.patch
===
--- extra-i686/apricots-0.2.6-freealut.patch2011-11-30 13:07:39 UTC (rev 
143882)
+++ extra-i686/apricots-0.2.6-freealut.patch2011-11-30 13:08:53 UTC (rev 
143883)
@@ -1,65 +0,0 @@
 apricots/apricots.cpp
-+++ apricots/apricots.cpp
-@@ -16,6 +16,7 @@
- int main(int, char**){
- #endif
- 
-+atexit(SDL_Quit);
-   // Initialize data
-   gamedata g;
-   init_data(g);
-
 apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
-   alListenerfv(AL_ORIENTATION, front );
- 
-   // Load in samples
--  ALvoid* data = malloc(5 * (512 * 3) * 1024);
-   alGenBuffers(numsamples, samples);
- 
-   for (int i = 0; i  numsamples; i++){
--ALsizei freq;
--ALboolean fileok;
- // Evil OpenAL portability fix done here
- #ifdef _WIN32
- ALenum format;
-@@ -87,15 +84,12 @@
- alutLoadWAVFile(filenames[i],format,data,filelen,freq,trash);
- fileok = (alGetError() == AL_NO_ERROR);
- #else
--ALsizei format;
--ALsizei trash;
--fileok = alutLoadWAV(filenames[i],data,format,filelen,trash,freq);
-+  samples[i] = alutCreateBufferFromFile(filenames[i]);
- #endif
--if (!fileok){
-+if (samples[i] == AL_NONE){
-   cerr  sampleio: could not open   filenames[i]  endl;
-   exit(1);
- } 
--alBufferData(samples[i], format, data, filelen, freq);
-   }
- 
-   // Generate Sources
-@@ -107,7 +101,6 @@
- alSourcefv(sources[j], AL_ORIENTATION, back );
-   }
-   
--  free(data);
-   
- }
- 
-
 configure.in
-+++ configure.in
-@@ -100,7 +100,8 @@
- 
- dnl Check for OpenAL
- AC_CHECK_HEADER(AL/al.h,[CXXFLAGS=$CXXFLAGS -DAP_AUDIO_OPENAL])

[arch-commits] Commit in apricots/repos (8 files)

2011-09-10 Thread Pierre Schmitz
Date: Saturday, September 10, 2011 @ 04:59:53
  Author: pierre
Revision: 137632

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  apricots/repos/extra-i686/PKGBUILD
(from rev 137631, apricots/trunk/PKGBUILD)
  apricots/repos/extra-i686/apricots-0.2.6-freealut.patch
(from rev 137631, apricots/trunk/apricots-0.2.6-freealut.patch)
  apricots/repos/extra-x86_64/PKGBUILD
(from rev 137631, apricots/trunk/PKGBUILD)
  apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch
(from rev 137631, apricots/trunk/apricots-0.2.6-freealut.patch)
Deleted:
  apricots/repos/extra-i686/PKGBUILD
  apricots/repos/extra-i686/apricots-0.2.6-freealut.patch
  apricots/repos/extra-x86_64/PKGBUILD
  apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch

+
 extra-i686/PKGBUILD|   49 +-
 extra-i686/apricots-0.2.6-freealut.patch   |  130 +--
 extra-x86_64/PKGBUILD  |   49 +-
 extra-x86_64/apricots-0.2.6-freealut.patch |  130 +--
 4 files changed, 184 insertions(+), 174 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-10 08:58:53 UTC (rev 137631)
+++ extra-i686/PKGBUILD 2011-09-10 08:59:53 UTC (rev 137632)
@@ -1,22 +0,0 @@
-# $Id$
-# Contributor: Damir Perisa damir.per...@bluewin.ch
-
-pkgname=apricots
-pkgver=0.2.6
-pkgrel=3
-pkgdesc=A simple 2D flying/bombing game similar to basic side scrollers
-arch=(i686 x86_64)
-license=('GPL')
-url=http://www.fishies.org.uk/apricots.html;
-depends=('gcc-libs' 'openal=1.6.372' 'sdl' 'freealut=1.1.0')
-source=(http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz; \
-   apricots-0.2.6-freealut.patch)
-md5sums=('910828d717e46d8cbd9c24f702d09fbc' '5f9f74082dfe162ab3ba51f6ec628f99')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i $startdir/src/apricots-0.2.6-freealut.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make prefix=$pkgdir/usr install || return 1
-}

Copied: apricots/repos/extra-i686/PKGBUILD (from rev 137631, 
apricots/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-10 08:59:53 UTC (rev 137632)
@@ -0,0 +1,27 @@
+# $Id$
+# Contributor: Damir Perisa damir.per...@bluewin.ch
+
+pkgname=apricots
+pkgver=0.2.6
+pkgrel=4
+pkgdesc=A simple 2D flying/bombing game similar to basic side scrollers
+arch=(i686 x86_64)
+license=('GPL')
+url=http://www.fishies.org.uk/apricots.html;
+depends=('gcc-libs' 'openal' 'sdl' 'freealut')
+source=(http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz;
+apricots-0.2.6-freealut.patch)
+md5sums=('910828d717e46d8cbd9c24f702d09fbc'
+ '5f9f74082dfe162ab3ba51f6ec628f99')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
+  ./configure --prefix=/usr
+  make LIBTOOL='/usr/bin/libtool'
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make prefix=$pkgdir/usr install
+}

Deleted: extra-i686/apricots-0.2.6-freealut.patch
===
--- extra-i686/apricots-0.2.6-freealut.patch2011-09-10 08:58:53 UTC (rev 
137631)
+++ extra-i686/apricots-0.2.6-freealut.patch2011-09-10 08:59:53 UTC (rev 
137632)
@@ -1,65 +0,0 @@
 apricots/apricots.cpp
-+++ apricots/apricots.cpp
-@@ -16,6 +16,7 @@
- int main(int, char**){
- #endif
- 
-+atexit(SDL_Quit);
-   // Initialize data
-   gamedata g;
-   init_data(g);
-
 apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
-   alListenerfv(AL_ORIENTATION, front );
- 
-   // Load in samples
--  ALvoid* data = malloc(5 * (512 * 3) * 1024);
-   alGenBuffers(numsamples, samples);
- 
-   for (int i = 0; i  numsamples; i++){
--ALsizei freq;
--ALboolean fileok;
- // Evil OpenAL portability fix done here
- #ifdef _WIN32
- ALenum format;
-@@ -87,15 +84,12 @@
- alutLoadWAVFile(filenames[i],format,data,filelen,freq,trash);
- fileok = (alGetError() == AL_NO_ERROR);
- #else
--ALsizei format;
--ALsizei trash;
--fileok = alutLoadWAV(filenames[i],data,format,filelen,trash,freq);
-+  samples[i] = alutCreateBufferFromFile(filenames[i]);
- #endif
--if (!fileok){
-+if (samples[i] == AL_NONE){
-   cerr  sampleio: could not open   filenames[i]  endl;
-   exit(1);
- } 
--alBufferData(samples[i], format, data, filelen, freq);
-   }
- 
-   // Generate Sources
-@@ -107,7 +101,6 @@
- alSourcefv(sources[j], AL_ORIENTATION, back );
-   }
-   
--  free(data);
-   
- }
- 
-
 configure.in
-+++ configure.in
-@@ -100,7 +100,8 @@
- 
- dnl Check for OpenAL
- AC_CHECK_HEADER(AL/al.h,[CXXFLAGS=$CXXFLAGS -DAP_AUDIO_OPENAL])
--AC_CHECK_LIB( openal, alutInit)
-+AC_CHECK_LIB( openal, alGetError)
-+AC_CHECK_LIB( alut,