diff --git a/media-sound/mpd/additional-files/mpd.rdef.in b/media-sound/mpd/additional-files/mpd.rdef.in new file mode 100644 index 000000000..c3a9dcb03 --- /dev/null +++ b/media-sound/mpd/additional-files/mpd.rdef.in @@ -0,0 +1,79 @@ +resource app_flags B_SINGLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "@APP_NAME@", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +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" +}; diff --git a/media-sound/mpd/mpd-0.21.20.recipe b/media-sound/mpd/mpd-0.23.15.recipe similarity index 82% rename from media-sound/mpd/mpd-0.21.20.recipe rename to media-sound/mpd/mpd-0.23.15.recipe index 9f689391f..e1c4dfd3f 100644 --- a/media-sound/mpd/mpd-0.21.20.recipe +++ b/media-sound/mpd/mpd-0.23.15.recipe @@ -1,15 +1,16 @@ -SUMMARY="The Music Player Daemon" +SUMMARY="The Music Player Daemon - a daemon for playing music" 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-2020 The Music Player Daemon Project" +COPYRIGHT="2003-2023 The Music Player Daemon Project" LICENSE="GNU GPL v2" REVISION="9" SOURCE_URI="http://www.musicpd.org/download/mpd/${portVersion%.*}/mpd-$portVersion.tar.xz" -CHECKSUM_SHA256="422ef0a996d961f3ebc6856395f3a855b45fa0059910e878fb98281007e510e1" +CHECKSUM_SHA256="550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a" PATCHES="mpd-$portVersion.patchset" -ADDITIONAL_FILES="userlaunch.in" +ADDITIONAL_FILES="mpd.rdef.in + userlaunch.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -38,16 +39,18 @@ REQUIRES=" # lib:libcdio$secondaryArchSuffix # lib:libcdio_paranoia$secondaryArchSuffix lib:libcurl$secondaryArchSuffix + lib:libchromaprint$secondaryArchSuffix # lib:ldns_sd$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix lib:libfluidsynth$secondaryArchSuffix + lib:libfmt$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libgme$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix >= 66 - lib:libid3tag$secondaryArchSuffix >= 0.3.0 + lib:libicui18n$secondaryArchSuffix + lib:libid3tag$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libiso9660$secondaryArchSuffix lib:libixml$secondaryArchSuffix #libupnp @@ -90,7 +93,7 @@ BUILD_REQUIRES=" devel:libavcodec$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix >= 1.69.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 devel:libbz2$secondaryArchSuffix # devel:libcdio$secondaryArchSuffix >= 19 # devel:libcdio_paranoia$secondaryArchSuffix @@ -102,12 +105,13 @@ BUILD_REQUIRES=" devel:libfaad$secondaryArchSuffix devel:libFLAC$secondaryArchSuffix devel:libfluidsynth$secondaryArchSuffix + devel:libfmt$secondaryArchSuffix devel:libgcrypt$secondaryArchSuffix # devel:libglib_2.0$secondaryArchSuffix >= 0.38 devel:libgme$secondaryArchSuffix devel:libgtest$secondaryArchSuffix devel:libiconv$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix >= 66 + devel:libicui18n$secondaryArchSuffix >= 74 devel:libid3tag$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libiso9660$secondaryArchSuffix >= 11 @@ -131,7 +135,7 @@ BUILD_REQUIRES=" devel:libsndfile$secondaryArchSuffix devel:libsoxr$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix - devel:libtag$secondaryArchSuffix + devel:libtag$secondaryArchSuffix >= 2 devel:libtwolame$secondaryArchSuffix devel:libupnp$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix @@ -143,8 +147,9 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - setuptools_python39 + setuptools_python310 # cmd:avahi_client$secondaryArchSuffix + cmd:cmake cmd:diff cmd:gcc$secondaryArchSuffix cmd:meson >= 0.55.0 @@ -164,6 +169,7 @@ BUILD() meson .. \ --buildtype=release \ --prefix=$prefix \ + --bindir=$commandBinDir \ --datadir=$docDir \ -Dtest=true @@ -175,16 +181,22 @@ INSTALL() cd haiku_build ninja install - # Should be fixed in the build-system - mkdir -p $commandBinDir - cp mpd $commandBinDir - rc -o mpd.rsrc ../src/haiku/mpd.rdef - xres -o $commandBinDir/mpd -- mpd.rsrc + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="MPD" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.mpd" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_NAME@|$APP_NAME|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + $portDir/additional-files/mpd.rdef.in > mpd.rdef - # Cleanup - mv $docDir/doc/mpd/* $docDir - cp ../doc/mpdconf.example $docDir - rm -rf $docDir/{icons,doc} + addResourcesToBinaries mpd.rdef $commandBinDir/mpd mkdir -p $dataDir/user_launch sed \ diff --git a/media-sound/mpd/patches/mpd-0.21.20.patchset b/media-sound/mpd/patches/mpd-0.21.20.patchset deleted file mode 100644 index d50f0188c..000000000 --- a/media-sound/mpd/patches/mpd-0.21.20.patchset +++ /dev/null @@ -1,142 +0,0 @@ -From b1fcd53d895256d41cf95945328c57877cb3c8c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -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.23.0 - - -From 686270399ad8d40c2f3b636c4b1df6be41b3bf89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -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.23.0 - - -From 7be7f641bd39f1499dc14fbb4b4f9a4d998f6312 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 4 May 2019 21:34:56 +0200 -Subject: haiku: enable the output plugin, add libmedia dependency. - - -diff --git a/src/output/plugins/meson.build b/src/output/plugins/meson.build -index bdfd471..9d68274 100644 ---- a/src/output/plugins/meson.build -+++ b/src/output/plugins/meson.build -@@ -28,7 +28,15 @@ endif - - if is_haiku - output_plugins_sources += 'HaikuOutputPlugin.cxx' -+ libmedia_dep = declare_dependency( -+ link_args: [ -+ '-lmedia', '-lbe', -+ ], -+ ) -+else -+ libmedia_dep = dependency('', required: false) - endif -+conf.set('ENABLE_HAIKU', is_haiku) - - conf.set('ENABLE_HTTPD_OUTPUT', get_option('httpd')) - if get_option('httpd') -@@ -148,6 +156,7 @@ output_plugins = static_library( - audiounit_dep, - libao_dep, - libjack_dep, -+ libmedia_dep, - pulse_dep, - libshout_dep, - libsndio_dep, --- -2.23.0 - diff --git a/media-sound/mpd/patches/mpd-0.23.15.patchset b/media-sound/mpd/patches/mpd-0.23.15.patchset new file mode 100644 index 000000000..4160a8fef --- /dev/null +++ b/media-sound/mpd/patches/mpd-0.23.15.patchset @@ -0,0 +1,37 @@ +From c9ad8b43e7209c136f03f0b5fd30e832d115b093 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 4 May 2019 21:34:56 +0200 +Subject: haiku: enable the output plugin, add libmedia dependency. + + +diff --git a/src/output/plugins/meson.build b/src/output/plugins/meson.build +index f6fce21..59a4057 100644 +--- a/src/output/plugins/meson.build ++++ b/src/output/plugins/meson.build +@@ -31,7 +31,15 @@ endif + + if is_haiku + output_plugins_sources += 'HaikuOutputPlugin.cxx' ++ libmedia_dep = declare_dependency( ++ link_args: [ ++ '-lmedia', '-lbe', ++ ], ++ ) ++else ++ libmedia_dep = dependency('', required: false) + endif ++conf.set('ENABLE_HAIKU', is_haiku) + + output_features.set('ENABLE_HTTPD_OUTPUT', get_option('httpd')) + if get_option('httpd') +@@ -173,6 +181,7 @@ output_plugins = static_library( + apple_dep, + libao_dep, + libjack_dep, ++ libmedia_dep, + pipewire_dep, + pulse_dep, + libshout_dep, +-- +2.42.1 +