diff options
Diffstat (limited to 'media-libs/alure')
| -rw-r--r-- | media-libs/alure/alure-1.2-r3.ebuild (renamed from media-libs/alure/alure-1.2-r1.ebuild) | 13 | ||||
| -rw-r--r-- | media-libs/alure/files/alure-1.2-new-dumb.patch | 30 | ||||
| -rw-r--r-- | media-libs/alure/metadata.xml | 2 |
3 files changed, 39 insertions, 6 deletions
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r3.ebuild index 69166861c89a..ee620b3c4b69 100644 --- a/media-libs/alure/alure-1.2-r1.ebuild +++ b/media-libs/alure/alure-1.2-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -16,15 +16,18 @@ IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis" RDEPEND=" >=media-libs/openal-1.1 - dumb? ( media-libs/dumb ) - flac? ( media-libs/flac ) + dumb? ( media-libs/dumb:= ) + flac? ( media-libs/flac:= ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${P}-include-unistd.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-include-unistd.patch + "${FILESDIR}"/${P}-new-dumb.patch +) src_prepare() { cmake_src_prepare diff --git a/media-libs/alure/files/alure-1.2-new-dumb.patch b/media-libs/alure/files/alure-1.2-new-dumb.patch new file mode 100644 index 000000000000..97b8f71b7024 --- /dev/null +++ b/media-libs/alure/files/alure-1.2-new-dumb.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<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(); diff --git a/media-libs/alure/metadata.xml b/media-libs/alure/metadata.xml index 92fae40d6f3c..d8acb74eb280 100644 --- a/media-libs/alure/metadata.xml +++ b/media-libs/alure/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sound@gentoo.org</email> |