Date: Sunday, December 6, 2015 @ 18:41:36 Author: bpiotrowski Revision: 252895
archrelease: copy trunk to staging-i686, staging-x86_64 Added: apricots/repos/staging-i686/ apricots/repos/staging-i686/PKGBUILD (from rev 252894, apricots/trunk/PKGBUILD) apricots/repos/staging-i686/apricots-0.2.6-freealut.patch (from rev 252894, apricots/trunk/apricots-0.2.6-freealut.patch) apricots/repos/staging-x86_64/ apricots/repos/staging-x86_64/PKGBUILD (from rev 252894, apricots/trunk/PKGBUILD) apricots/repos/staging-x86_64/apricots-0.2.6-freealut.patch (from rev 252894, apricots/trunk/apricots-0.2.6-freealut.patch) ----------------------------------------------+ staging-i686/PKGBUILD | 28 ++++++++++ staging-i686/apricots-0.2.6-freealut.patch | 65 +++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 28 ++++++++++ staging-x86_64/apricots-0.2.6-freealut.patch | 65 +++++++++++++++++++++++++ 4 files changed, 186 insertions(+) Copied: apricots/repos/staging-i686/PKGBUILD (from rev 252894, apricots/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-12-06 17:41:36 UTC (rev 252895) @@ -0,0 +1,28 @@ +# $Id$ +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=apricots +pkgver=0.2.6 +pkgrel=7 +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=("https://sources.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/staging-i686/apricots-0.2.6-freealut.patch (from rev 252894, apricots/trunk/apricots-0.2.6-freealut.patch) =================================================================== --- staging-i686/apricots-0.2.6-freealut.patch (rev 0) +++ staging-i686/apricots-0.2.6-freealut.patch 2015-12-06 17:41:36 UTC (rev 252895) @@ -0,0 +1,65 @@ +--- 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, alutInit) + + KDE_CHECK_EXTRA_LIBS + all_libraries="$all_libraries $USER_LDFLAGS" Copied: apricots/repos/staging-x86_64/PKGBUILD (from rev 252894, apricots/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-12-06 17:41:36 UTC (rev 252895) @@ -0,0 +1,28 @@ +# $Id$ +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=apricots +pkgver=0.2.6 +pkgrel=7 +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=("https://sources.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/staging-x86_64/apricots-0.2.6-freealut.patch (from rev 252894, apricots/trunk/apricots-0.2.6-freealut.patch) =================================================================== --- staging-x86_64/apricots-0.2.6-freealut.patch (rev 0) +++ staging-x86_64/apricots-0.2.6-freealut.patch 2015-12-06 17:41:36 UTC (rev 252895) @@ -0,0 +1,65 @@ +--- 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, alutInit) + + KDE_CHECK_EXTRA_LIBS + all_libraries="$all_libraries $USER_LDFLAGS"