Date: Sunday, May 23, 2021 @ 02:02:28 Author: heftig Revision: 942547
archrelease: copy trunk to community-x86_64 Added: apricots/repos/community-x86_64/PKGBUILD (from rev 942546, apricots/trunk/PKGBUILD) Deleted: apricots/repos/community-x86_64/PKGBUILD apricots/repos/community-x86_64/apricots-0.2.6-freealut.patch apricots/repos/community-x86_64/apricots.desktop apricots/repos/community-x86_64/apricots.png -------------------------------+ PKGBUILD | 81 +++++++++++++++++++--------------------- apricots-0.2.6-freealut.patch | 76 ------------------------------------- apricots.desktop | 10 ---- 3 files changed, 40 insertions(+), 127 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-05-23 02:02:16 UTC (rev 942546) +++ PKGBUILD 2021-05-23 02:02:28 UTC (rev 942547) @@ -1,41 +0,0 @@ -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=apricots -pkgver=0.2.6 -pkgrel=12 -pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers" -url="https://web.archive.org/web/20060426053238/http://www.fishies.org.uk/apricots.html" -arch=(x86_64) -license=(GPL) -depends=(gcc-libs sdl freealut hicolor-icon-theme) -backup=(etc/apricots.cfg) -source=("https://web.archive.org/web/20060426053238/http://www.fishies.org.uk/apricots-0.2.6.tar.gz" - apricots.desktop apricots.png - apricots-0.2.6-freealut.patch) -sha512sums=('37f72f527eff0df9de8e7b69c8c6efc8857445095282e6a6a5493533aa75d967ddfc33a4f3776972f46b43d7040aff011e3888e91eff4ee831fab610bf9695b6' - '9f2255f440fef17dccb38474edc5bef9f9770d026bbbc074e0a4dbd4bcc6fb639e00e7c6f370c67f478d6bc0d869f3c40bcfc0b493a08bff531fd754b7282d75' - '77061be211c4f03e21af3b6c0f43d1be6b1d2b323415d7e0c03daf1b29d6010ac69b1f7e27057ff399f91987f6b10b8e78f66d669cb81f396ae2cfc209b41983' - '002cc098dc0239c2fb771560d0957b93242d03055ade9a02e015e8a1e867ef06feb66499e3a39d1fea5261ede98b7193e256a0fc2cccb785df4e709cd3ca6efc') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../apricots-0.2.6-freealut.patch - autoreconf -fvi -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - install -Dt . /usr/bin/libtool - make -} - -package() { - make -C $pkgname-$pkgver install prefix="$pkgdir/usr" - - install -Dt "$pkgdir/etc" -m644 "$pkgdir/usr/share/apricots/apricots.cfg" - ln -srft "$pkgdir/usr/share/apricots" "$pkgdir/etc/apricots.cfg" - - install -Dt "$pkgdir/usr/share/applications" -m644 apricots.desktop - install -Dt "$pkgdir/usr/share/icons/hicolor/24x24/apps" -m644 apricots.png -} Copied: apricots/repos/community-x86_64/PKGBUILD (from rev 942546, apricots/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-23 02:02:28 UTC (rev 942547) @@ -0,0 +1,40 @@ +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=apricots +pkgver=0.2.7 +pkgrel=1 +pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers" +url="https://github.com/moggers87/apricots" +arch=(x86_64) +license=(GPL2) +depends=(gcc-libs sdl2 freealut hicolor-icon-theme) +makedepends=(git) +_commit=e03bcbeef0b28b361ad2270e31947b0d0ee276a9 # tags/v0.2.7^0 +source=("git+$url#commit=$_commit") +b2sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + cd $pkgname + sed -i 's/inline int sign/int sign/' apricots/all.cpp + autoreconf -fvi +} + +build() { + cd $pkgname + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $pkgname + make install prefix="$pkgdir/usr" + + install -Dm644 contrib/apricots.desktop -t "$pkgdir/usr/share/applications" + install -Dm644 contrib/desktop-icon.png "$pkgdir/usr/share/icons/hicolor/24x24/apps/apricots.png" + install -Dm644 README -t "$pkgdir/usr/share/doc/$pkgname" +} Deleted: apricots-0.2.6-freealut.patch =================================================================== --- apricots-0.2.6-freealut.patch 2021-05-23 02:02:16 UTC (rev 942546) +++ apricots-0.2.6-freealut.patch 2021-05-23 02:02:28 UTC (rev 942547) @@ -1,76 +0,0 @@ -diff -u -r apricots-0.2.6/apricots/apricots.cpp apricots-0.2.6-freealut/apricots/apricots.cpp ---- apricots-0.2.6/apricots/apricots.cpp 2003-08-05 22:01:16.000000000 +0000 -+++ apricots-0.2.6-freealut/apricots/apricots.cpp 2019-09-21 11:16:31.723765376 +0000 -@@ -16,6 +16,7 @@ - int main(int, char**){ - #endif - -+atexit(SDL_Quit); - // Initialize data - gamedata g; - init_data(g); -diff -u -r apricots-0.2.6/apricots/sampleio.cpp apricots-0.2.6-freealut/apricots/sampleio.cpp ---- apricots-0.2.6/apricots/sampleio.cpp 2003-08-05 23:21:22.000000000 +0000 -+++ apricots-0.2.6-freealut/apricots/sampleio.cpp 2019-09-21 11:17:03.164207665 +0000 -@@ -13,6 +13,9 @@ - // Code cleanup - - #include "sampleio.h" -+#include <AL/al.h> -+#include <AL/alc.h> -+#include <AL/alut.h> - - // Empty Noaudio sound routines - #if AP_AUDIO==AUDIO_NOAUDIO -@@ -74,12 +77,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 +87,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 +104,6 @@ - alSourcefv(sources[j], AL_ORIENTATION, back ); - } - -- free(data); - - } - -diff -u -r apricots-0.2.6/configure.in apricots-0.2.6-freealut/configure.in ---- apricots-0.2.6/configure.in 2003-08-13 01:11:25.000000000 +0000 -+++ apricots-0.2.6-freealut/configure.in 2019-09-21 11:16:31.723765376 +0000 -@@ -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" Deleted: apricots.desktop =================================================================== --- apricots.desktop 2021-05-23 02:02:16 UTC (rev 942546) +++ apricots.desktop 2021-05-23 02:02:28 UTC (rev 942547) @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Apricots -GenericName=Apricots -Comment=2D air combat game -Exec=apricots -Icon=apricots -Terminal=false -StartupNotify=false -Type=Application -Categories=Game;ArcadeGame; Deleted: apricots.png =================================================================== (Binary files differ)