gentoo resync : 29.12.2022

6 files changed, 349 insertions, 8 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 2e45aa655d39..b4f2a655ec2c 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,9 @@
+AUX qmmp-1.6.0-udisks_plugin.patch 321 BLAKE2B a3a0e6ca792a9399eef189e319113b63094cbc32a2d8912c7d7174589f34729be4ce0638323f449320cd34df0b1e3780ff43ae3c211cc6c96ba823cb0fed53bd SHA512 d88eadf6e725617cc50ef809532a5eaa0272745c74697953850c52dca3586809bd83f3804925e65607379e7156210686fe906da729371ba251ebfa1168e59b97
 DIST qmmp-1.5.4.tar.bz2 1388941 BLAKE2B e1a205b6315cd841c7d7a94ed85dca7fcbc74416dcc09458637ccadab96c3a2614039007cdbab404098d2818f4b5cdb7a0bc5cf27e1bfdd0f146d73e2834f230 SHA512 5dcc543f75f3baa6115c7c692acaca00b1ad6b62c773ac18ad97447fc17978f067d85b132d1fdb65467474417b7d7e8d8b43e0284196978ca63dd5d431a23bf5
+DIST qmmp-1.6.0.tar.bz2 1364512 BLAKE2B 3af905fa8af1a23f04d3df30856f881184a5150de571ffb82efc98179c2fe67a232207ad1233c57fde9000facc1df07317b10658e5f462f79083e99deeb7bb9f SHA512 a96242b4eb46fce84f7eefb1dd90cf4c51809c7f8471a405462d95cb3ba5c373e217c50ed48b4ad6b94e1a7e0948839433d4085c41a35991bffd08699a4826f1
+DIST qmmp-1.6.1.tar.bz2 1353769 BLAKE2B d12f91166cec051caf604ec27dc563d4cf2a52511eabfc0dee0b0679373e7c5fa0f0faac2b4d25420f33485caf90545c7f0098f1e3814f92d46d82b253410afd SHA512 efaf44002c21544514301b5ec1210507fe3cdeb4c6b8d14fb8a573d32db5bb73a9d6d36d00d9d61592261b69fa4260417e3c65183f13299234bd82dda43536c5
 EBUILD qmmp-1.5.4.ebuild 4110 BLAKE2B 7b193d02974a783fe90f39c8a698420517a64bfd616092873ad64799427c83deb633d128477fd62c7478afd6ed156f47888e57b3d8f6b050c0e198474c361fe8 SHA512 a58932662dbe4b47de5def1597b8d717ee428830248b1d394451660c873978bf880fa0199e43a717c1332020cdb18a2b5126131fae016b18ebb67cb354d7861e
-EBUILD qmmp-9999.ebuild 4112 BLAKE2B bf5c0a3724e3670be2a65a996ced8fdf7bae069fee3d6012c2008b8f53ab23ff3713806ab3d546f413f16e8215ecb44fe7a8d89056eed1559c0124af34f1b80a SHA512 7e3755425e4c04ea312512077a52e90fb5965b701d99919e14f4b8d082e874b947584cec67a2d1399e5cb28aa37dda9ed710b210a4a1c57788efcce4e31ed537
-MISC metadata.xml 1883 BLAKE2B 8f252d3c02181fe5c7897a6f23b689dc75b507af80e765248ba856c8cd6564d162cfa60190fdd57350e1cf00229391f5057c1a51853dd2e291b3bc7311049d8f SHA512 affecdc44bc4b87cae10aba228f52b6eee63f759fa70e609206c9a4e627dab7d89741cdf51a22fe4b502f8c8d62077512494c893c7963afeb7d0cc0c23f945c0
+EBUILD qmmp-1.6.0.ebuild 4143 BLAKE2B df7217bd71bb94f256b23cd2f07cf2bb35f6c1b6d75d8ab032e6c5aadf9a5ca51a97edf84e512e0b2e66c20b6dafcf86617ec92e34d26c0a44578a2bd3aec47f SHA512 2fc2ec9fe2c4ed6221e3efd3083f5b0efff67f64bdf1f7a579bb991a9eb6414437da5b36e9e902f1689ae1373978ed23b60bce109989b139a0af39bfb8770547
+EBUILD qmmp-1.6.1-r1.ebuild 4067 BLAKE2B 959e52da112582e230aa36d57954b5b101f366b2f500444c76e8f24a41a760b003449d91caf032a2804af1141e4ff1d4dd2b174cb6b45f5f63d5f8f94eb586ca SHA512 c0ce3b9e7f247472790e6016c54329fc7deb1a2f21a373adfa3791ec43363a22b47ad9633b7f290527245ba0f6467097ec12de8801229b56fef3618ceca34df9
+EBUILD qmmp-9999.ebuild 4127 BLAKE2B 43dea953fb1b740053fd4a20a5fc145a5c117a36a6f6b49284ea5f8e0cb5d041fc4585877ce37f749c7511be405ef83306b985b62189d38e35e22a5e56a6a959 SHA512 862f30e26cfc586f473e5d8068f8cf96d35ca70b39d25df0ba1dcf2b68b6e92ed1cf203cf6707a8f3b63c989f92dd46ca304f8a2d4389e25332d1b38c7fe6edd
+MISC metadata.xml 1960 BLAKE2B e0e190870cdb4c77e5ea4fb604af1afd571406488baa04daa760db1316cba922533f7e37b184e4e7df7c91e82dc716ea33deeb21102596ad512a9aef70a523a8 SHA512 5e8da850cdce11da134a03e9dda51d52ced62dee1fc80873695fe69f0fa53ba9ff7b9ad38931753819e4522103f3fe2ec49ae3b8d973d914e41d0e942557898d
diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
new file mode 100644
index 000000000000..45512099ffeb
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
@@ -0,0 +1,11 @@
+--- qmmp-1.6.0/src/plugins/General/CMakeLists.txt
++++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt
+@@ -51,7 +51,7 @@
+ ENDIF(USE_HAL AND Qt5DBus_FOUND)
+ 
+ IF(USE_UDISKS2 AND Qt5DBus_FOUND)
+-add_subdirectory(udisks2)
++add_subdirectory(udisks)
+ ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
+ 
+ IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index b8eb53ed4c4a..13b31504cacc 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -30,5 +30,6 @@
 		<flag name="sndfile">Enable wav playback support via <pkg>media-libs/libsndfile</pkg></flag>
 		<flag name="stereo">Enable stereo effect</flag>
 		<flag name="tray">Build tray icon</flag>
+		<flag name="xmp">Enable module files renderer (modplug replacement)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-1.6.0.ebuild b/media-sound/qmmp/qmmp-1.6.0.ebuild
new file mode 100644
index 000000000000..52888ecc3204
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.6.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="amd64 ~x86"
+else
+	inherit subversion
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+	xmp? ( media-libs/libxmp )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
+)
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.6.1-r1.ebuild b/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..74de5e84ffe0
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.6.1-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit subversion
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+	xmp? ( media-libs/libxmp )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index ee881e5be18c..4a8758eff61c 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -21,9 +21,9 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
-ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
 notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
-sndfile soxr stereo tray udisks +vorbis wavpack"
+sndfile soxr stereo tray udisks +vorbis wavpack xmp"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -65,7 +65,6 @@ RDEPEND="
 	)
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
@@ -88,6 +87,7 @@ RDEPEND="
 		media-libs/libvorbis
 	)
 	wavpack? ( media-sound/wavpack )
+	xmp? ( media-libs/libxmp )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
@@ -95,6 +95,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
+)
+
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
@@ -125,14 +129,12 @@ src_configure() {
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
 		-DUSE_JACK="$(usex jack)"
 		-DUSE_LADSPA="$(usex ladspa)"
 		-DUSE_LYRICS="$(usex lyrics)"
 		-DUSE_MAD="$(usex mad)"
 		-DUSE_MIDI="$(usex midi)"
 		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
 		-DUSE_MPLAYER="$(usex mplayer)"
 		-DUSE_MPC="$(usex musepack)"
 		-DUSE_NOTIFIER="$(usex notifier)"
@@ -150,9 +152,10 @@ src_configure() {
 		-DUSE_SOXR="$(usex soxr)"
 		-DUSE_STEREO="$(usex stereo)"
 		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex xmp)"
 	)
 
 	cmake_src_configure