From fdf405e2c5ecca00af471bd377b07c2950124fb9 Mon Sep 17 00:00:00 2001 From: DarkSS <> Date: Sep 12 2022 17:19:20 +0000 Subject: Update alure to version 1.2 / rev 4 via SR 1002725 https://build.opensuse.org/request/show/1002725 by user DarkSS + dimstar_suse --- diff --git a/.files b/.files index 5901f1e..61e15a0 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 2b36268..866f6b5 100644 --- a/.rev +++ b/.rev @@ -23,4 +23,12 @@ 955915 + + 977e54d5fbbced989ec9014bb7cf1a03 + 1.2 + + dimstar_suse + + 1002725 + diff --git a/alure.changes b/alure.changes index aa653fa..33cf2fe 100644 --- a/alure.changes +++ b/alure.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 7 05:16:39 UTC 2022 - munix9@googlemail.com + +- Change URL/Source to https://kcat.tomasu.net/alure.html +- Replace CXXFLAGS "-fpermissive" with fix-dumb2.patch + +------------------------------------------------------------------- Mon Feb 14 14:28:23 UTC 2022 - Ferdinand Thiessen - Changes authored by munix9@googlemail.com diff --git a/alure.spec b/alure.spec index 99cdee7..8a0c98c 100644 --- a/alure.spec +++ b/alure.spec @@ -25,13 +25,14 @@ Summary: Audio Library Tools REloaded # ALURE code is LGPL-2.0+; note -devel subpackage has its own license tag License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ -URL: https://github.com/kcat/alure -Source0: %{name}-%{version}.tar.bz2 +URL: https://kcat.tomasu.net/alure.html +Source0: https://kcat.tomasu.net/alure-releases/%{name}-%{version}.tar.bz2 Patch0: fix-cmake_minimum_required.patch Patch1: fix-missing-include.patch Patch2: fix-lib-suffix.patch Patch3: fix-link-flac.patch Patch4: fix-FLUIDSYNTH_CFLAGS.patch +Patch5: fix-dumb2.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja @@ -75,7 +76,6 @@ developing applications that use %{name}. %build %define __builder ninja -export CXXFLAGS="%{optflags} -fpermissive" %cmake \ -DBUILD_STATIC=OFF \ -DDYNLOAD=OFF \ diff --git a/fix-dumb2.patch b/fix-dumb2.patch new file mode 100644 index 0000000..97b8f71 --- /dev/null +++ b/fix-dumb2.patch @@ -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(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(user_data)->fstream; + stream->clear();