| 1 |
commit: bf1b4d6ef4ae333487f8813c6c3fbbf2fd5cb116 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 15:53:45 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 16:19:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1b4d6e |
| 7 |
|
| 8 |
media-libs/alure: Fix building with newer media-libs/dumb versions |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/alure/alure-1.2-r1.ebuild | 4 +-- |
| 14 |
.../{alure-1.2-r1.ebuild => alure-1.2-r2.ebuild} | 11 +++++--- |
| 15 |
media-libs/alure/files/alure-1.2-new-dumb.patch | 30 ++++++++++++++++++++++ |
| 16 |
3 files changed, 39 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild |
| 19 |
index 69166861c89..3053fbc78e1 100644 |
| 20 |
--- a/media-libs/alure/alure-1.2-r1.ebuild |
| 21 |
+++ b/media-libs/alure/alure-1.2-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2019 Gentoo Authors |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=7 |
| 28 |
@@ -16,7 +16,7 @@ IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis" |
| 29 |
|
| 30 |
RDEPEND=" |
| 31 |
>=media-libs/openal-1.1 |
| 32 |
- dumb? ( media-libs/dumb ) |
| 33 |
+ dumb? ( =media-libs/dumb-0.9*:= ) |
| 34 |
flac? ( media-libs/flac ) |
| 35 |
fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) |
| 36 |
mp3? ( media-sound/mpg123 ) |
| 37 |
|
| 38 |
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r2.ebuild |
| 39 |
similarity index 85% |
| 40 |
copy from media-libs/alure/alure-1.2-r1.ebuild |
| 41 |
copy to media-libs/alure/alure-1.2-r2.ebuild |
| 42 |
index 69166861c89..49baf11fcec 100644 |
| 43 |
--- a/media-libs/alure/alure-1.2-r1.ebuild |
| 44 |
+++ b/media-libs/alure/alure-1.2-r2.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2019 Gentoo Authors |
| 47 |
+# Copyright 1999-2020 Gentoo Authors |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=7 |
| 51 |
@@ -11,12 +11,12 @@ SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2" |
| 52 |
|
| 53 |
LICENSE="MIT" |
| 54 |
SLOT="0" |
| 55 |
-KEYWORDS="amd64 ~ppc ~ppc64 x86" |
| 56 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 57 |
IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis" |
| 58 |
|
| 59 |
RDEPEND=" |
| 60 |
>=media-libs/openal-1.1 |
| 61 |
- dumb? ( media-libs/dumb ) |
| 62 |
+ dumb? ( media-libs/dumb:= ) |
| 63 |
flac? ( media-libs/flac ) |
| 64 |
fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) |
| 65 |
mp3? ( media-sound/mpg123 ) |
| 66 |
@@ -24,7 +24,10 @@ RDEPEND=" |
| 67 |
vorbis? ( media-libs/libvorbis )" |
| 68 |
DEPEND="${RDEPEND}" |
| 69 |
|
| 70 |
-PATCHES=( "${FILESDIR}/${P}-include-unistd.patch" ) |
| 71 |
+PATCHES=( |
| 72 |
+ "${FILESDIR}"/${P}-include-unistd.patch |
| 73 |
+ "${FILESDIR}"/${P}-new-dumb.patch |
| 74 |
+) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
cmake_src_prepare |
| 78 |
|
| 79 |
diff --git a/media-libs/alure/files/alure-1.2-new-dumb.patch b/media-libs/alure/files/alure-1.2-new-dumb.patch |
| 80 |
new file mode 100644 |
| 81 |
index 00000000000..97b8f71b702 |
| 82 |
--- /dev/null |
| 83 |
+++ b/media-libs/alure/files/alure-1.2-new-dumb.patch |
| 84 |
@@ -0,0 +1,30 @@ |
| 85 |
+# Already fixed upstream: |
| 86 |
+# https://repo.or.cz/alure.git/commitdiff/9939cdfbf9c6c7a2690db7fb8dd2892389adcd5f |
| 87 |
+ |
| 88 |
+diff -Naur a/src/codec_dumb.cpp b/src/codec_dumb.cpp |
| 89 |
+--- a/src/codec_dumb.cpp 2011-07-29 09:37:48.000000000 +0100 |
| 90 |
++++ b/src/codec_dumb.cpp 2020-05-10 15:59:48.502632496 +0100 |
| 91 |
+@@ -272,7 +272,11 @@ |
| 92 |
+ |
| 93 |
+ private: |
| 94 |
+ // DUMBFILE iostream callbacks |
| 95 |
++#if DUMB_VERSION >= 2*10000 |
| 96 |
++ static int skip(void *user_data, dumb_off_t offset) |
| 97 |
++#else |
| 98 |
+ static int skip(void *user_data, long offset) |
| 99 |
++#endif |
| 100 |
+ { |
| 101 |
+ std::istream *stream = static_cast<dumbStream*>(user_data)->fstream; |
| 102 |
+ stream->clear(); |
| 103 |
+@@ -282,7 +286,11 @@ |
| 104 |
+ return -1; |
| 105 |
+ } |
| 106 |
+ |
| 107 |
++#if DUMB_VERSION >= 2*10000 |
| 108 |
++ static dumb_ssize_t read(char *ptr, size_t size, void *user_data) |
| 109 |
++#else |
| 110 |
+ static long read(char *ptr, long size, void *user_data) |
| 111 |
++#endif |
| 112 |
+ { |
| 113 |
+ std::istream *stream = static_cast<dumbStream*>(user_data)->fstream; |
| 114 |
+ stream->clear(); |
Archives