[arch-commits] Commit in alure/trunk (PKGBUILD dumb-2.patch)

[Antonio Rojas]

    Date: Monday, May 2, 2022 @ 20:53:01
  Author: arojas
Revision: 1192330

-ffat-lto-objects

Added:
  alure/trunk/dumb-2.patch
Modified:
  alure/trunk/PKGBUILD

--------------+
 PKGBUILD     |   24 +++++++++++++-----------
 dumb-2.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-02 20:25:02 UTC (rev 1192329)
+++ PKGBUILD	2022-05-02 20:53:01 UTC (rev 1192330)
@@ -3,10 +3,10 @@
 
 pkgname=alure
 pkgver=1.2
-pkgrel=7
+pkgrel=8
 pkgdesc='Utility library to help manage common tasks with OpenAL applications.'
 arch=('x86_64')
-url='https://kcat.strangesoft.net/alure.html'
+url='https://kcat.tomasu.net/alure.html'
 license=('MIT')
 depends=('openal')
 makedepends=('cmake' 'libsndfile' 'libvorbis' 'flac' 'mpg123' 'dumb' 'fluidsynth')
@@ -16,28 +16,30 @@
             'mpg123: for MPEG support'
             'dumb: for IT, XM, S3M and MOD support'
             'fluidsynth: for SoundFont 2 support')
-source=("https://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2"
-        build.patch)
+source=("https://kcat.tomasu.net/alure-releases/${pkgname}-${pkgver}.tar.bz2"
+        build.patch
+        dumb-2.patch)
 md5sums=('3088aba074ad02d95ea51e705053b9f5'
-         '6a8dfd62ccae920d393b4202736aba46')
+         '6a8dfd62ccae920d393b4202736aba46'
+         'f6569e1fee4015a9e0a68df37798c8aa')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../build.patch
+  patch -p1 -i ../dumb-2.patch # Fix build with dumb 2 (Gentoo)
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-  # workaround for recent gcc build issue
-  CXXFLAGS="$CXXFLAGS -fpermissive"
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects"
+# Fix build with fluidsynth 2.4
+  find -name build.make | xargs sed -e 's|\;| |g' -i
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 

Added: dumb-2.patch
===================================================================
--- dumb-2.patch	                        (rev 0)
+++ dumb-2.patch	2022-05-02 20:53:01 UTC (rev 1192330)
@@ -0,0 +1,30 @@
+# Already fixed upstream:
+# https://repo.or.cz/alure.git/commitdiff/9939cdfbf9c6c7a2690db7fb8dd2892389adcd5f
+
+diff -Naur a/src/codec_dumb.cpp b/src/codec_dumb.cpp
+--- a/src/codec_dumb.cpp	2011-07-29 09:37:48.000000000 +0100
++++ b/src/codec_dumb.cpp	2020-05-10 15:59:48.502632496 +0100
+@@ -272,7 +272,11 @@
+ 
+ private:
+     // DUMBFILE iostream callbacks
++#if DUMB_VERSION >= 2*10000
++    static int skip(void *user_data, dumb_off_t offset)
++#else
+     static int skip(void *user_data, long offset)
++#endif
+     {
+         std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
+         stream->clear();
+@@ -282,7 +286,11 @@
+         return -1;
+     }
+ 
++#if DUMB_VERSION >= 2*10000
++    static dumb_ssize_t read(char *ptr, size_t size, void *user_data)
++#else
+     static long read(char *ptr, long size, void *user_data)
++#endif
+     {
+         std::istream *stream = static_cast<dumbStream*>(user_data)->fstream;
+         stream->clear();