haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

MPD : version bump (#2096)

Browse Source 
* MPD bump version

* Remove obsolate

* MPD : bump
This commit is contained in:
miqlas
2018-01-10 13:27:09 +01:00
committed by GitHub
parent e44204077d
commit 86f36ed089
6 changed files with 2 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
media-sound/mpd/mpd-0.20.11.recipe
View File

@@ -1,158 +0,0 @@
SUMMARY="The Music Player Daemon"
DESCRIPTION="Music Player Daemon (MPD) is a flexible, powerful, server-side \
application for playing music. Through plugins and libraries it can play a \
variety of sound files while being controlled by its network protocol."
HOMEPAGE="http://www.musicpd.org/"
COPYRIGHT="2003-2017 The Music Player Daemon Project"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://www.musicpd.org/download/mpd/0.20/mpd-$portVersion.tar.xz"
CHECKSUM_SHA256="e9227d9daf32a63d6f34bf2ea18b3179b4a383e9d2b49d548702a37451e514bc"
PATCHES="mpd-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
mpd$secondaryArchSuffix = $portVersion
cmd:mpd$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
#lib:libadplug$secondaryArchSuffix
#lib:libao$secondaryArchSuffix >= 4
#lib:libaudiofile$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcdio$secondaryArchSuffix
#lib:libcdio_paranoia$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
#lib:ldns_sd$secondaryArchSuffix
lib:libexpat$secondaryArchSuffix
lib:libfaad$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
lib:libfluidsynth$secondaryArchSuffix
#lib:libgme$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libicui18n$secondaryArchSuffix
lib:libid3tag$secondaryArchSuffix >= 0.3.0
lib:libintl$secondaryArchSuffix
lib:libiso9660$secondaryArchSuffix
lib:libixml$secondaryArchSuffix #libupnp
lib:libmad$secondaryArchSuffix
#lib:libmms$secondaryArchSuffix
lib:libmodplug$secondaryArchSuffix
lib:libmp3lame$secondaryArchSuffix
lib:libmpcdec$secondaryArchSuffix
lib:libmpdclient$secondaryArchSuffix
lib:libmpg123$secondaryArchSuffix
#lib:libnfs$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
lib:libopus$secondaryArchSuffix
lib:libsamplerate$secondaryArchSuffix
#lib:libshine$secondaryArchSuffix
#lib:libshout$secondaryArchSuffix
#lib:libsidplay2$secondaryArchSuffix
lib:libsmbclient$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
lib:libsoxr$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
lib:libthreadutil$secondaryArchSuffix #libupnp
lib:libtwolame$secondaryArchSuffix
lib:libupnp$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
#lib:libwavpack$secondaryArchSuffix
#lib:libwildmidi$secondaryArchSuffix
#lib:libwrap$secondaryArchSuffix
#lib:libyajl$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
#devel:libadplug$secondaryArchSuffix
#devel:libao$secondaryArchSuffix >= 4
#devel:libaudiofile$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libavutil$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix
#devel:libcdio_paranoia$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
#devel:ldns_sd$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libfaad$secondaryArchSuffix
devel:libFLAC$secondaryArchSuffix
devel:libfluidsynth$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix >= 0.38
#devel:libgme$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libicui18n$secondaryArchSuffix
devel:libid3tag$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libiso9660$secondaryArchSuffix
devel:libmad$secondaryArchSuffix
#devel:libmms$secondaryArchSuffix
devel:libmodplug$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libmpcdec$secondaryArchSuffix
devel:libmpdclient$secondaryArchSuffix
devel:libmpg123$secondaryArchSuffix
#devel:libnfs$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libopus$secondaryArchSuffix
devel:libsamplerate$secondaryArchSuffix
#devel:libshine$secondaryArchSuffix
#devel:libshout$secondaryArchSuffix
#devel:libsidplay2$secondaryArchSuffix
devel:libsmbclient$secondaryArchSuffix
devel:libsndfile$secondaryArchSuffix
devel:libsoxr$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
devel:libtag$secondaryArchSuffix
devel:libtwolame$secondaryArchSuffix
devel:libupnp$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libvorbisenc$secondaryArchSuffix
#devel:libwavpack$secondaryArchSuffix
#devel:libwildmidi$secondaryArchSuffix
#devel:libwrap$secondaryArchSuffix
#devel:libyajl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:autoconf
#cmd:avahi_client$secondaryArchSuffix
cmd:awk
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:grep
# cmd:ld$secondaryArchSuffix
# cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:m4
cmd:perl
cmd:pkg_config$secondaryArchSuffix
# cmd:ranlib$secondaryArchSuffix
cmd:sed
"
BUILD()
{
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
}

158
media-sound/mpd/mpd-0.20.12.recipe
View File

@@ -1,158 +0,0 @@
SUMMARY="The Music Player Daemon"
DESCRIPTION="Music Player Daemon (MPD) is a flexible, powerful, server-side \
application for playing music. Through plugins and libraries it can play a \
variety of sound files while being controlled by its network protocol."
HOMEPAGE="https://www.musicpd.org/"
COPYRIGHT="2003-2017 The Music Player Daemon Project"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://www.musicpd.org/download/mpd/0.20/mpd-$portVersion.tar.xz"
CHECKSUM_SHA256="e159ac0608fb85c891bd19375ed7056d5f9ec4ba492b052f24820513e774f709"
PATCHES="mpd-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
mpd$secondaryArchSuffix = $portVersion
cmd:mpd$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
# lib:libadplug$secondaryArchSuffix
# lib:libao$secondaryArchSuffix >= 4
# lib:libaudiofile$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcdio$secondaryArchSuffix
# lib:libcdio_paranoia$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
# lib:ldns_sd$secondaryArchSuffix
lib:libexpat$secondaryArchSuffix
lib:libfaad$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
lib:libfluidsynth$secondaryArchSuffix
# lib:libgme$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libicui18n$secondaryArchSuffix
lib:libid3tag$secondaryArchSuffix >= 0.3.0
lib:libintl$secondaryArchSuffix
lib:libiso9660$secondaryArchSuffix
lib:libixml$secondaryArchSuffix #libupnp
lib:libmad$secondaryArchSuffix
# lib:libmms$secondaryArchSuffix
lib:libmodplug$secondaryArchSuffix
lib:libmp3lame$secondaryArchSuffix
lib:libmpcdec$secondaryArchSuffix
lib:libmpdclient$secondaryArchSuffix
lib:libmpg123$secondaryArchSuffix
# lib:libnfs$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
lib:libopus$secondaryArchSuffix
lib:libsamplerate$secondaryArchSuffix
# lib:libshine$secondaryArchSuffix
# lib:libshout$secondaryArchSuffix
# lib:libsidplay2$secondaryArchSuffix
lib:libsmbclient$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
lib:libsoxr$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
lib:libthreadutil$secondaryArchSuffix #libupnp
lib:libtwolame$secondaryArchSuffix
lib:libupnp$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
# lib:libwavpack$secondaryArchSuffix
# lib:libwildmidi$secondaryArchSuffix
# lib:libwrap$secondaryArchSuffix
# lib:libyajl$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
# devel:libadplug$secondaryArchSuffix
# devel:libao$secondaryArchSuffix >= 4
# devel:libaudiofile$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libavutil$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix
# devel:libcdio_paranoia$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
# devel:ldns_sd$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libfaad$secondaryArchSuffix
devel:libFLAC$secondaryArchSuffix
devel:libfluidsynth$secondaryArchSuffix
# devel:libglib_2.0$secondaryArchSuffix >= 0.38
devel:libgme$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libicui18n$secondaryArchSuffix
devel:libid3tag$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libiso9660$secondaryArchSuffix
devel:libmad$secondaryArchSuffix
# devel:libmms$secondaryArchSuffix
devel:libmodplug$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libmpcdec$secondaryArchSuffix
devel:libmpdclient$secondaryArchSuffix
devel:libmpg123$secondaryArchSuffix
# devel:libnfs$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libopus$secondaryArchSuffix
devel:libsamplerate$secondaryArchSuffix
# devel:libshine$secondaryArchSuffix
# devel:libshout$secondaryArchSuffix
# devel:libsidplay2$secondaryArchSuffix
devel:libsmbclient$secondaryArchSuffix
devel:libsndfile$secondaryArchSuffix
devel:libsoxr$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
devel:libtag$secondaryArchSuffix
devel:libtwolame$secondaryArchSuffix
devel:libupnp$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libvorbisenc$secondaryArchSuffix
# devel:libwavpack$secondaryArchSuffix
# devel:libwildmidi$secondaryArchSuffix
# devel:libwrap$secondaryArchSuffix
# devel:libyajl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:autoconf
# cmd:avahi_client$secondaryArchSuffix
cmd:awk
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:grep
# cmd:ld$secondaryArchSuffix
# cmd:libtoolize$secondaryArchSuffix
cmd:m4
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
# cmd:ranlib$secondaryArchSuffix
cmd:sed
"
BUILD()
{
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
}

4
media-sound/mpd/mpd-0.20.13.recipe → media-sound/mpd/mpd-0.20.15.recipe
View File

@@ -5,9 +5,9 @@ variety of sound files while being controlled by its network protocol."
HOMEPAGE="https://www.musicpd.org/"
COPYRIGHT="2003-2017 The Music Player Daemon Project"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="http://www.musicpd.org/download/mpd/0.20/mpd-$portVersion.tar.xz"
CHECKSUM_SHA256="46c1c534d80a52de00263e8ef43a6011ff9d765232443749539ef26b1b48ff40"
CHECKSUM_SHA256="c69c4f67e665380ea3bbde6cff8958edc85f7cd40e7918ae5ce0a2184ca9eb40"
PATCHES="mpd-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"

187
media-sound/mpd/patches/mpd-0.20.12.patchset
View File

@@ -1,187 +0,0 @@
From 6f251f3e33a06b2b22585afd82da64dc6d9da65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:09:29 +0200
Subject: Haiku: add icon as resource definition file
diff --git a/src/haiku/mpd.rdef b/src/haiku/mpd.rdef
new file mode 100644
index 0000000..30fcfe4
--- /dev/null
+++ b/src/haiku/mpd.rdef
@@ -0,0 +1,64 @@
+
+resource vector_icon {
+ $"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"
+ $"70D073FFFF020116033EB0000000000000003EB000482000482000BE4B0084FF"
+ $"32020316023CAF103CF749BCF7493CAF104A07A44A1DB7A143FFFF02031602BC"
+ $"AB8FBCFA713CFA71BCAB8F4A05E34A004BAB08FFFF03010000020016023CC7EE"
+ $"389BC0BA16573E39B04977C842ADC700FFFFD3020006023C529D3753A2B8966F"
+ $"3D9D084B6044496AAF00474747FFA5A0A002001602BC4E76BC411B3C90DABCA0"
+ $"0D47587D4ABA850090FFD40200160238313C3B5CF0BFCD963C7AAC4C13943FCA"
+ $"F901ECFFC3054B04017E020106023E1C1538010FB7C32B3DF5E649B8BE48DD4A"
+ $"000593DCFF00337F020006023879063B8224BE2CC83B10DB4A1F6F49B894FF9A"
+ $"9A9A00242222020006033C69A60000000000003E186148800049800058F3F3F3"
+ $"00D4CECEFFD9D9D9038DFF06050002001602B2E4F7386B91BA78F7B4F4FD49FB"
+ $"A94AE12500CEFF6603010000020006023C55B638309FBA16573E39B049E9FF43"
+ $"840A008B8787FF161515020016023C57B5364381B785863DA4F54B27C349B7BB"
+ $"0010FF4C02001602BC4E76BC411B3C90DABCA00D47587D4ABA850060FF500200"
+ $"160238313C3B5CF0BFCD963C7AAC4C13943FCAF90174FF22055C04017E020016"
+ $"023879063B8224BE2CC83B10DB4A1F6F49B894FF59001E020016033C3DA60000"
+ $"000000003E186148AC0049800058AD0076FA800333C805020106023A40000000"
+ $"000000003980004A300048400000767676FC403E3E020106023E1C1538010FB7"
+ $"C32B3DF5E649B8BE48DD4A000593DCFF00337F05002102044022C65922B92622"
+ $"224022B92622C659405EB9265EC6595E5E405EC6595EB9260A062E262E4B4C5A"
+ $"5650562C38220A064C5C545C604FCA1BC4875C4A58480A042E264C32562C3822"
+ $"0A044C324C5A5650562C0A042E262E4B4C5A4C320A044934494E3043302A0A04"
+ $"BA29C0283043302ABA31B7540A04494B494E304332C0270A044934494B3241BA"
+ $"31B7540A043E25432252264D2A08043E2543225226522C0A034D2A5226522C08"
+ $"02464F47C5ED0A043246324A4453444E0A04344834494250424E08025436503A"
+ $"0A06262E264C485E5252523430280A04262E483C523430280A04483C485E5252"
+ $"52340A04262E264C485E483C0A04443D4456284928320A04B6F9C28C28492832"
+ $"B701BA840A044454445728492AC28B0A04443D44542A47B701BA840A04382B3D"
+ $"284E2D49310804382B3D284E2D4E330A0349304E2C4E320802425843C9830A06"
+ $"486054606052CA1BC5B95C4D524802044530C2D730C0A430403540BAB540BC06"
+ $"4538C0A438C2D7384A354ABC064ABAB50803452145335B250A044934494B3241"
+ $"BA31B754240A0B0102023EF45B0000000000003EF45B487749B685270A05010B"
+ $"1A3EF45B0000000000003EF45B487749B6852715FF01178400040A09010A0A3E"
+ $"F45B0000000000003EF45B487749B6852715FF0A0A010C023EF45B0000000000"
+ $"003EF45B487749B685270A050101123EF45B0000000000003EF45B487749B685"
+ $"2701178400040A060103023EF45B0000000000003EF45B487749B685270A0701"
+ $"04023EF45B0000000000003EF45B487749B685270A08020506023EF45B000000"
+ $"0000003EF45B487749B685270A0C0109023EF45B0000000000003EF45B487749"
+ $"B685270A0D01070A3EF45B0000000000003EF45B487749B6852715FF0A0E0108"
+ $"0A3EF45B0000000000003EF45B487749B6852715FF0A0F010D1A3EF45B000000"
+ $"0000003EF45B487749B6852715FF01178220040A0A010E0A3EF45B0000000000"
+ $"003EF45B487749B6852715FF0A11010F0A3EF45B0000000000003EF45B487749"
+ $"B6852715FF0A0B01000A3D43F93C2B26BD304E3DF9DE48FCA544AB2E15FF0A00"
+ $"0100123CF8FE3C832FBCE7163E4DA3480D86C5C7B501178400040A010100023C"
+ $"F8FE3C832FBCE7163E4DA3480D86C5C7B50A020100023AC6433A584EBAB58C3C"
+ $"265448124D45D0400A0301001A3CB1A73C46E3BCA16C3E165C480E5DC4720015"
+ $"FF01178200040A0401001A3C808E3C1D64BC71B33DE0FC480EF2C30DBC15FF01"
+ $"178200040A18011D023EAAAA0000000000003EAAAA47155548B0480A12011A1A"
+ $"3EAAAA0000000000003EAAAA47155548B04815FF01178400040A1601190A3EAA"
+ $"AA0000000000003EAAAA47155548B04815FF0A17011B0A3EAAAA000000000000"
+ $"3EAAAA47155548B04815FF0A120111123EAAAA0000000000003EAAAA47155548"
+ $"B04801178400040A130112023EAAAA0000000000003EAAAA47155548B0480A14"
+ $"0113023EAAAA0000000000003EAAAA47155548B0480A15021415023EAAAA0000"
+ $"000000003EAAAA47155548B0480A1D01180A3EAAAA0000000000003EAAAA4715"
+ $"5548B04815FF0A1D01180A3EAAAA0000000000003EAAAA47155548B04800150A"
+ $"1901160A3EAAAA0000000000003EAAAA47155548B04815FF0A1A01170A3EAAAA"
+ $"0000000000003EAAAA47155548B04815FF0A1B011C1A3EAAAA0000000000003E"
+ $"AAAA47155548B04815FF01178220040A1C011E023EAAAA0000000000003EAAAA"
+ $"47155548B0480A12011F1A3EAAAA0000000000003EAAAA47155548B04815FF01"
+ $"178222040A12011F1A3EAAAA0000000000003EAAAA47155548B0480015011784"
+ $"2204"
+};
--
2.2.2
From 31267ac24c9f074af7fe11d90648ff227950e6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:12:56 +0200
Subject: Haiku: add resources: application signature and flags
Since we do not handle B_QUIT_REQUESTED because the BApplication
does not Run(), use the background flag to avoid showing up in Deskbar.
diff --git a/src/haiku/mpd.rdef b/src/haiku/mpd.rdef
index 30fcfe4..6f1aca2 100644
--- a/src/haiku/mpd.rdef
+++ b/src/haiku/mpd.rdef
@@ -1,3 +1,8 @@
+resource app_signature "application/x-vnd.MusicPD";
+
+resource app_flags B_BACKGROUND_APP;
+
+// TODO: resource app_version {};
resource vector_icon {
$"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"
--
2.2.2
From 1603fa73da3c8821fd9c5f93dc8078330b7e9d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 21 Feb 2017 08:13:22 +0100
Subject: [PATCH] MPD: fix build (from mmu_man, already upstreamed)
---
src/mixer/plugins/HaikuMixerPlugin.cxx | 20 ++++++++++----------
src/output/plugins/HaikuOutputPlugin.cxx | 1 +
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx
index d66e765..07da755 100644
--- a/src/mixer/plugins/HaikuMixerPlugin.cxx
+++ b/src/mixer/plugins/HaikuMixerPlugin.cxx
@@ -25,6 +25,8 @@
#include "output/plugins/HaikuOutputPlugin.hxx"
#include "Compiler.h"
+#include "util/RuntimeError.hxx"
+
class HaikuMixer final : public Mixer {
/** the base mixer class */
HaikuOutput &self;
@@ -35,36 +37,34 @@ public:
self(_output) {}
/* virtual methods from class Mixer */
- virtual bool Open(gcc_unused Error &error) override {
- return true;
+ virtual void Open() override {
}
virtual void Close() override {
}
- virtual int GetVolume(Error &error) override;
- virtual bool SetVolume(unsigned volume, Error &error) override;
+ virtual int GetVolume() override;
+ virtual void SetVolume(unsigned volume) override;
};
static Mixer *
haiku_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
- gcc_unused const ConfigBlock &block,
- gcc_unused Error &error)
+ gcc_unused const ConfigBlock &block)
{
return new HaikuMixer((HaikuOutput &)ao, listener);
}
int
-HaikuMixer::GetVolume(gcc_unused Error &error)
+HaikuMixer::GetVolume()
{
return haiku_output_get_volume(self);
}
-bool
-HaikuMixer::SetVolume(unsigned volume, gcc_unused Error &error)
+void
+HaikuMixer::SetVolume(unsigned volume)
{
- return haiku_output_set_volume(self, volume);
+ haiku_output_set_volume(self, volume);
}
const MixerPlugin haiku_mixer_plugin = {
diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx
index 5d0371e..6a637e5 100644
--- a/src/output/plugins/HaikuOutputPlugin.cxx
+++ b/src/output/plugins/HaikuOutputPlugin.cxx
@@ -24,6 +24,7 @@
#include "../Wrapper.hxx"
#include "mixer/MixerList.hxx"
#include "util/Domain.hxx"
+#include "system/Error.hxx"
#include "Log.hxx"
#include <AppFileInfo.h>
--
2.11.0

187
media-sound/mpd/patches/mpd-0.20.13.patchset
View File

@@ -1,187 +0,0 @@
From 6f251f3e33a06b2b22585afd82da64dc6d9da65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:09:29 +0200
Subject: Haiku: add icon as resource definition file
diff --git a/src/haiku/mpd.rdef b/src/haiku/mpd.rdef
new file mode 100644
index 0000000..30fcfe4
--- /dev/null
+++ b/src/haiku/mpd.rdef
@@ -0,0 +1,64 @@
+
+resource vector_icon {
+ $"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"
+ $"70D073FFFF020116033EB0000000000000003EB000482000482000BE4B0084FF"
+ $"32020316023CAF103CF749BCF7493CAF104A07A44A1DB7A143FFFF02031602BC"
+ $"AB8FBCFA713CFA71BCAB8F4A05E34A004BAB08FFFF03010000020016023CC7EE"
+ $"389BC0BA16573E39B04977C842ADC700FFFFD3020006023C529D3753A2B8966F"
+ $"3D9D084B6044496AAF00474747FFA5A0A002001602BC4E76BC411B3C90DABCA0"
+ $"0D47587D4ABA850090FFD40200160238313C3B5CF0BFCD963C7AAC4C13943FCA"
+ $"F901ECFFC3054B04017E020106023E1C1538010FB7C32B3DF5E649B8BE48DD4A"
+ $"000593DCFF00337F020006023879063B8224BE2CC83B10DB4A1F6F49B894FF9A"
+ $"9A9A00242222020006033C69A60000000000003E186148800049800058F3F3F3"
+ $"00D4CECEFFD9D9D9038DFF06050002001602B2E4F7386B91BA78F7B4F4FD49FB"
+ $"A94AE12500CEFF6603010000020006023C55B638309FBA16573E39B049E9FF43"
+ $"840A008B8787FF161515020016023C57B5364381B785863DA4F54B27C349B7BB"
+ $"0010FF4C02001602BC4E76BC411B3C90DABCA00D47587D4ABA850060FF500200"
+ $"160238313C3B5CF0BFCD963C7AAC4C13943FCAF90174FF22055C04017E020016"
+ $"023879063B8224BE2CC83B10DB4A1F6F49B894FF59001E020016033C3DA60000"
+ $"000000003E186148AC0049800058AD0076FA800333C805020106023A40000000"
+ $"000000003980004A300048400000767676FC403E3E020106023E1C1538010FB7"
+ $"C32B3DF5E649B8BE48DD4A000593DCFF00337F05002102044022C65922B92622"
+ $"224022B92622C659405EB9265EC6595E5E405EC6595EB9260A062E262E4B4C5A"
+ $"5650562C38220A064C5C545C604FCA1BC4875C4A58480A042E264C32562C3822"
+ $"0A044C324C5A5650562C0A042E262E4B4C5A4C320A044934494E3043302A0A04"
+ $"BA29C0283043302ABA31B7540A04494B494E304332C0270A044934494B3241BA"
+ $"31B7540A043E25432252264D2A08043E2543225226522C0A034D2A5226522C08"
+ $"02464F47C5ED0A043246324A4453444E0A04344834494250424E08025436503A"
+ $"0A06262E264C485E5252523430280A04262E483C523430280A04483C485E5252"
+ $"52340A04262E264C485E483C0A04443D4456284928320A04B6F9C28C28492832"
+ $"B701BA840A044454445728492AC28B0A04443D44542A47B701BA840A04382B3D"
+ $"284E2D49310804382B3D284E2D4E330A0349304E2C4E320802425843C9830A06"
+ $"486054606052CA1BC5B95C4D524802044530C2D730C0A430403540BAB540BC06"
+ $"4538C0A438C2D7384A354ABC064ABAB50803452145335B250A044934494B3241"
+ $"BA31B754240A0B0102023EF45B0000000000003EF45B487749B685270A05010B"
+ $"1A3EF45B0000000000003EF45B487749B6852715FF01178400040A09010A0A3E"
+ $"F45B0000000000003EF45B487749B6852715FF0A0A010C023EF45B0000000000"
+ $"003EF45B487749B685270A050101123EF45B0000000000003EF45B487749B685"
+ $"2701178400040A060103023EF45B0000000000003EF45B487749B685270A0701"
+ $"04023EF45B0000000000003EF45B487749B685270A08020506023EF45B000000"
+ $"0000003EF45B487749B685270A0C0109023EF45B0000000000003EF45B487749"
+ $"B685270A0D01070A3EF45B0000000000003EF45B487749B6852715FF0A0E0108"
+ $"0A3EF45B0000000000003EF45B487749B6852715FF0A0F010D1A3EF45B000000"
+ $"0000003EF45B487749B6852715FF01178220040A0A010E0A3EF45B0000000000"
+ $"003EF45B487749B6852715FF0A11010F0A3EF45B0000000000003EF45B487749"
+ $"B6852715FF0A0B01000A3D43F93C2B26BD304E3DF9DE48FCA544AB2E15FF0A00"
+ $"0100123CF8FE3C832FBCE7163E4DA3480D86C5C7B501178400040A010100023C"
+ $"F8FE3C832FBCE7163E4DA3480D86C5C7B50A020100023AC6433A584EBAB58C3C"
+ $"265448124D45D0400A0301001A3CB1A73C46E3BCA16C3E165C480E5DC4720015"
+ $"FF01178200040A0401001A3C808E3C1D64BC71B33DE0FC480EF2C30DBC15FF01"
+ $"178200040A18011D023EAAAA0000000000003EAAAA47155548B0480A12011A1A"
+ $"3EAAAA0000000000003EAAAA47155548B04815FF01178400040A1601190A3EAA"
+ $"AA0000000000003EAAAA47155548B04815FF0A17011B0A3EAAAA000000000000"
+ $"3EAAAA47155548B04815FF0A120111123EAAAA0000000000003EAAAA47155548"
+ $"B04801178400040A130112023EAAAA0000000000003EAAAA47155548B0480A14"
+ $"0113023EAAAA0000000000003EAAAA47155548B0480A15021415023EAAAA0000"
+ $"000000003EAAAA47155548B0480A1D01180A3EAAAA0000000000003EAAAA4715"
+ $"5548B04815FF0A1D01180A3EAAAA0000000000003EAAAA47155548B04800150A"
+ $"1901160A3EAAAA0000000000003EAAAA47155548B04815FF0A1A01170A3EAAAA"
+ $"0000000000003EAAAA47155548B04815FF0A1B011C1A3EAAAA0000000000003E"
+ $"AAAA47155548B04815FF01178220040A1C011E023EAAAA0000000000003EAAAA"
+ $"47155548B0480A12011F1A3EAAAA0000000000003EAAAA47155548B04815FF01"
+ $"178222040A12011F1A3EAAAA0000000000003EAAAA47155548B0480015011784"
+ $"2204"
+};
--
2.2.2
From 31267ac24c9f074af7fe11d90648ff227950e6ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:12:56 +0200
Subject: Haiku: add resources: application signature and flags
Since we do not handle B_QUIT_REQUESTED because the BApplication
does not Run(), use the background flag to avoid showing up in Deskbar.
diff --git a/src/haiku/mpd.rdef b/src/haiku/mpd.rdef
index 30fcfe4..6f1aca2 100644
--- a/src/haiku/mpd.rdef
+++ b/src/haiku/mpd.rdef
@@ -1,3 +1,8 @@
+resource app_signature "application/x-vnd.MusicPD";
+
+resource app_flags B_BACKGROUND_APP;
+
+// TODO: resource app_version {};
resource vector_icon {
$"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"
--
2.2.2
From 1603fa73da3c8821fd9c5f93dc8078330b7e9d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 21 Feb 2017 08:13:22 +0100
Subject: [PATCH] MPD: fix build (from mmu_man, already upstreamed)
---
src/mixer/plugins/HaikuMixerPlugin.cxx | 20 ++++++++++----------
src/output/plugins/HaikuOutputPlugin.cxx | 1 +
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx
index d66e765..07da755 100644
--- a/src/mixer/plugins/HaikuMixerPlugin.cxx
+++ b/src/mixer/plugins/HaikuMixerPlugin.cxx
@@ -25,6 +25,8 @@
#include "output/plugins/HaikuOutputPlugin.hxx"
#include "Compiler.h"
+#include "util/RuntimeError.hxx"
+
class HaikuMixer final : public Mixer {
/** the base mixer class */
HaikuOutput &self;
@@ -35,36 +37,34 @@ public:
self(_output) {}
/* virtual methods from class Mixer */
- virtual bool Open(gcc_unused Error &error) override {
- return true;
+ virtual void Open() override {
}
virtual void Close() override {
}
- virtual int GetVolume(Error &error) override;
- virtual bool SetVolume(unsigned volume, Error &error) override;
+ virtual int GetVolume() override;
+ virtual void SetVolume(unsigned volume) override;
};
static Mixer *
haiku_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
- gcc_unused const ConfigBlock &block,
- gcc_unused Error &error)
+ gcc_unused const ConfigBlock &block)
{
return new HaikuMixer((HaikuOutput &)ao, listener);
}
int
-HaikuMixer::GetVolume(gcc_unused Error &error)
+HaikuMixer::GetVolume()
{
return haiku_output_get_volume(self);
}
-bool
-HaikuMixer::SetVolume(unsigned volume, gcc_unused Error &error)
+void
+HaikuMixer::SetVolume(unsigned volume)
{
- return haiku_output_set_volume(self, volume);
+ haiku_output_set_volume(self, volume);
}
const MixerPlugin haiku_mixer_plugin = {
diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx
index 5d0371e..6a637e5 100644
--- a/src/output/plugins/HaikuOutputPlugin.cxx
+++ b/src/output/plugins/HaikuOutputPlugin.cxx
@@ -24,6 +24,7 @@
#include "../Wrapper.hxx"
#include "mixer/MixerList.hxx"
#include "util/Domain.hxx"
+#include "system/Error.hxx"
#include "Log.hxx"
#include <AppFileInfo.h>
--
2.11.0

0
media-sound/mpd/patches/mpd-0.20.11.patchset → media-sound/mpd/patches/mpd-0.20.15.patchset
View File