Date: Monday, May 2, 2022 @ 20:53:15 Author: arojas Revision: 1192331
archrelease: copy trunk to community-x86_64 Added: alure/repos/community-x86_64/PKGBUILD (from rev 1192330, alure/trunk/PKGBUILD) alure/repos/community-x86_64/build.patch (from rev 1192330, alure/trunk/build.patch) alure/repos/community-x86_64/dumb-2.patch (from rev 1192330, alure/trunk/dumb-2.patch) Deleted: alure/repos/community-x86_64/PKGBUILD alure/repos/community-x86_64/build.patch --------------+ PKGBUILD | 92 +++++++++++++++++++++++++++++---------------------------- build.patch | 24 +++++++------- dumb-2.patch | 30 ++++++++++++++++++ 3 files changed, 89 insertions(+), 57 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-02 20:53:01 UTC (rev 1192330) +++ PKGBUILD 2022-05-02 20:53:15 UTC (rev 1192331) @@ -1,45 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Markus Martin <mar...@archwyrm.net> - -pkgname=alure -pkgver=1.2 -pkgrel=7 -pkgdesc='Utility library to help manage common tasks with OpenAL applications.' -arch=('x86_64') -url='https://kcat.strangesoft.net/alure.html' -license=('MIT') -depends=('openal') -makedepends=('cmake' 'libsndfile' 'libvorbis' 'flac' 'mpg123' 'dumb' 'fluidsynth') -optdepends=('libsndfile: for uncompressed audio support' - 'libvorbis: for OGG Vorbis support' - 'flac: for FLAC support' - '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) -md5sums=('3088aba074ad02d95ea51e705053b9f5' - '6a8dfd62ccae920d393b4202736aba46') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../build.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # workaround for recent gcc build issue - CXXFLAGS="$CXXFLAGS -fpermissive" - - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -Dm0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} Copied: alure/repos/community-x86_64/PKGBUILD (from rev 1192330, alure/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-02 20:53:15 UTC (rev 1192331) @@ -0,0 +1,47 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Markus Martin <mar...@archwyrm.net> + +pkgname=alure +pkgver=1.2 +pkgrel=8 +pkgdesc='Utility library to help manage common tasks with OpenAL applications.' +arch=('x86_64') +url='https://kcat.tomasu.net/alure.html' +license=('MIT') +depends=('openal') +makedepends=('cmake' 'libsndfile' 'libvorbis' 'flac' 'mpg123' 'dumb' 'fluidsynth') +optdepends=('libsndfile: for uncompressed audio support' + 'libvorbis: for OGG Vorbis support' + 'flac: for FLAC support' + 'mpg123: for MPEG support' + 'dumb: for IT, XM, S3M and MOD support' + 'fluidsynth: for SoundFont 2 support') +source=("https://kcat.tomasu.net/alure-releases/${pkgname}-${pkgver}.tar.bz2" + build.patch + dumb-2.patch) +md5sums=('3088aba074ad02d95ea51e705053b9f5' + '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 ${pkgname}-${pkgver} + + 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 ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -Dm0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} Deleted: build.patch =================================================================== --- build.patch 2022-05-02 20:53:01 UTC (rev 1192330) +++ build.patch 2022-05-02 20:53:15 UTC (rev 1192331) @@ -1,12 +0,0 @@ -diff -rupN a/src/codec_fluidsynth.cpp b/src/codec_fluidsynth.cpp ---- a/src/codec_fluidsynth.cpp 2011-07-29 08:37:48.000000000 +0000 -+++ b/src/codec_fluidsynth.cpp 2014-01-03 10:42:13.280792235 +0000 -@@ -32,7 +32,7 @@ - #endif - - #include <istream> -- -+#include <unistd.h> - #include <fluidsynth.h> - - Copied: alure/repos/community-x86_64/build.patch (from rev 1192330, alure/trunk/build.patch) =================================================================== --- build.patch (rev 0) +++ build.patch 2022-05-02 20:53:15 UTC (rev 1192331) @@ -0,0 +1,12 @@ +diff -rupN a/src/codec_fluidsynth.cpp b/src/codec_fluidsynth.cpp +--- a/src/codec_fluidsynth.cpp 2011-07-29 08:37:48.000000000 +0000 ++++ b/src/codec_fluidsynth.cpp 2014-01-03 10:42:13.280792235 +0000 +@@ -32,7 +32,7 @@ + #endif + + #include <istream> +- ++#include <unistd.h> + #include <fluidsynth.h> + + Copied: alure/repos/community-x86_64/dumb-2.patch (from rev 1192330, alure/trunk/dumb-2.patch) =================================================================== --- dumb-2.patch (rev 0) +++ dumb-2.patch 2022-05-02 20:53:15 UTC (rev 1192331) @@ -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();