summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2020-05-31 16:53:45 +0100
committerJames Le Cuirot <chewi@gentoo.org>2020-05-31 17:19:35 +0100
commitbf1b4d6ef4ae333487f8813c6c3fbbf2fd5cb116 (patch)
treecb2b1891855d2ccb88cc45ff9bd5c77fb1635e01 /media-libs/alure/files
parentmedia-libs/dumb: Bump to 2.0.3, EAPI 7, new upstream (diff)
downloadgentoo-bf1b4d6ef4ae333487f8813c6c3fbbf2fd5cb116.tar.gz
gentoo-bf1b4d6ef4ae333487f8813c6c3fbbf2fd5cb116.tar.bz2
gentoo-bf1b4d6ef4ae333487f8813c6c3fbbf2fd5cb116.zip
media-libs/alure: Fix building with newer media-libs/dumb versions
Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs/alure/files')
-rw-r--r--media-libs/alure/files/alure-1.2-new-dumb.patch30
1 files changed, 30 insertions, 0 deletions
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();