[gentoo-commits] repo/gentoo:master commit in: media-libs/alure/files/, media-libs/alure/

[gentoo-commits] repo/gentoo:master commit in: media-libs/alure/files/, media-libs/alure/

[Michael Palimaka]

commit:     937a0fe10289f67201f7384ef57b0a833e9a1cea
Author:     Joshua Clayton <stillcompiling <AT> gmail <DOT> com>
AuthorDate: Sun Jun  5 16:32:52 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 16:33:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=937a0fe1

media-libs/alure: add patch to fix build with USE="fluidsynth"

Gentoo-bug: 500164

Package-Manager: portage-2.3.0_rc1

 media-libs/alure/alure-1.2.ebuild                     |  5 +++--
 media-libs/alure/files/alure-1.2-include-unistd.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/media-libs/alure/alure-1.2.ebuild b/media-libs/alure/alure-1.2.ebuild
index 3d694ae..8f07f4e 100644
--- a/media-libs/alure/alure-1.2.ebuild
+++ b/media-libs/alure/alure-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=4
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="The OpenAL Utility Toolkit"
 HOMEPAGE="http://kcat.strangesoft.net/alure.html"
@@ -24,6 +24,7 @@ RDEPEND=">=media-libs/openal-1.1
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-include-unistd.patch"
 	sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die
 }
 

diff --git a/media-libs/alure/files/alure-1.2-include-unistd.patch b/media-libs/alure/files/alure-1.2-include-unistd.patch
new file mode 100644
index 0000000..b2db3dc
--- /dev/null
+++ b/media-libs/alure/files/alure-1.2-include-unistd.patch
@@ -0,0 +1,13 @@
+Gentoo-bug: 500164
+
+--- a/src/codec_fluidsynth.cpp
++++ b/src/codec_fluidsynth.cpp
+@@ -30,6 +30,8 @@
+ #ifdef _WIN32
+ #include <io.h>
++#else
++#include <unistd.h>
+ #endif
+ 
+ #include <istream>
+ 

[gentoo-commits] repo/gentoo:master commit in: media-libs/alure/files/, media-libs/alure/

[James Le Cuirot]

commit:     bf1b4d6ef4ae333487f8813c6c3fbbf2fd5cb116
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 15:53:45 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 31 16:19:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1b4d6e

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 <AT> gentoo.org>

 media-libs/alure/alure-1.2-r1.ebuild               |  4 +--
 .../{alure-1.2-r1.ebuild => alure-1.2-r2.ebuild}   | 11 +++++---
 media-libs/alure/files/alure-1.2-new-dumb.patch    | 30 ++++++++++++++++++++++
 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-r1.ebuild
index 69166861c89..3053fbc78e1 100644
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ b/media-libs/alure/alure-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 
 RDEPEND="
 	>=media-libs/openal-1.1
-	dumb? ( media-libs/dumb )
+	dumb? ( =media-libs/dumb-0.9*:= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
 	mp3? ( media-sound/mpg123 )

diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r2.ebuild
similarity index 85%
copy from media-libs/alure/alure-1.2-r1.ebuild
copy to media-libs/alure/alure-1.2-r2.ebuild
index 69166861c89..49baf11fcec 100644
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ b/media-libs/alure/alure-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,12 +11,12 @@ SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 
 RDEPEND="
 	>=media-libs/openal-1.1
-	dumb? ( media-libs/dumb )
+	dumb? ( media-libs/dumb:= )
 	flac? ( media-libs/flac )
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
 	mp3? ( media-sound/mpg123 )
@@ -24,7 +24,10 @@ RDEPEND="
 	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 00000000000..97b8f71b702
--- /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();