[arch-commits] Commit in apricots/repos/extra-x86_64 (6 files)

Jan Steffens heftig at archlinux.org
Sat Sep 21 11:34:36 UTC 2019


    Date: Saturday, September 21, 2019 @ 11:34:36
  Author: heftig
Revision: 363193

archrelease: copy trunk to extra-x86_64

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

-------------------------------+
 PKGBUILD                      |   70 +++++++++++--------
 apricots-0.2.6-freealut.patch |  141 +++++++++++++++++++++-------------------
 apricots.desktop              |   10 ++
 3 files changed, 128 insertions(+), 93 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-21 11:34:26 UTC (rev 363192)
+++ PKGBUILD	2019-09-21 11:34:36 UTC (rev 363193)
@@ -1,28 +0,0 @@
-# $Id$
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-
-pkgname=apricots
-pkgver=0.2.6
-pkgrel=8
-pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
-arch=("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")
-sha512sums=('cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5'
-            '1a3efc32776ab364ca242611ec8a5ee6018b470a122430e22b222934361ceafd09e3fbc2c60e273990263c599f08d097887babde10500a78269356611fde75ad')
-
-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-x86_64/PKGBUILD (from rev 363192, apricots/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-21 11:34:36 UTC (rev 363193)
@@ -0,0 +1,42 @@
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=apricots
+pkgver=0.2.6
+pkgrel=9
+pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
+url="http://www.fishies.org.uk/apricots.html"
+arch=(x86_64)
+license=(GPL)
+depends=(gcc-libs sdl freealut hicolor-icon-theme)
+#source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz"
+backup=(etc/apricots.cfg)
+source=("https://sources.archlinux.org/other/apricots/$pkgname-$pkgver.tar.gz"
+        apricots.desktop apricots.png
+        apricots-0.2.6-freealut.patch)
+sha512sums=('cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5'
+            '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
+  make LIBTOOL=/usr/bin/libtool
+}
+
+package() {
+  make -C $pkgname-$pkgver install prefix="$pkgdir/usr" LIBTOOL=/usr/bin/libtool
+
+  mkdir "$pkgdir/etc"
+  mv "$pkgdir/usr/share/apricots/apricots.cfg" "$pkgdir/etc"
+  ln -sr "$pkgdir/etc/apricots.cfg" "$pkgdir/usr/share/apricots"
+
+  install -Dt "$pkgdir/usr/share/applications" -m644 apricots.desktop
+  install -Dt "$pkgdir/usr/share/icons/hicolor/24x24/apps" -m644 apricots.png
+}

Deleted: apricots-0.2.6-freealut.patch
===================================================================
--- apricots-0.2.6-freealut.patch	2019-09-21 11:34:26 UTC (rev 363192)
+++ apricots-0.2.6-freealut.patch	2019-09-21 11:34:36 UTC (rev 363193)
@@ -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, alutInit)
- 
- KDE_CHECK_EXTRA_LIBS
- all_libraries="$all_libraries $USER_LDFLAGS"

Copied: apricots/repos/extra-x86_64/apricots-0.2.6-freealut.patch (from rev 363192, apricots/trunk/apricots-0.2.6-freealut.patch)
===================================================================
--- apricots-0.2.6-freealut.patch	                        (rev 0)
+++ apricots-0.2.6-freealut.patch	2019-09-21 11:34:36 UTC (rev 363193)
@@ -0,0 +1,76 @@
+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"

Copied: apricots/repos/extra-x86_64/apricots.desktop (from rev 363192, apricots/trunk/apricots.desktop)
===================================================================
--- apricots.desktop	                        (rev 0)
+++ apricots.desktop	2019-09-21 11:34:36 UTC (rev 363193)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Apricots
+GenericName=Apricots
+Comment=2D air combat game
+Exec=apricots
+Icon=apricots
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Game;ArcadeGame;

Copied: apricots/repos/extra-x86_64/apricots.png (from rev 363192, apricots/trunk/apricots.png)
===================================================================
(Binary files differ)


More information about the arch-commits mailing list