gentoo auto-resync : 28:12:2024 - 06:30:54

5 files changed, 185 insertions, 6 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index ef048797fef1..402aba7205cb 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,6 +1,7 @@
 AUX mixxx-2.3.0-cmake.patch 556 BLAKE2B 2757a1c72f4ad052aacd17fba1934a106c34971ac3fb0af2b3a65ebc0eacdcc9809949697aaba6166ae45ab1876a4cc6e6759eb90317efff73b8ab629b506078 SHA512 277fe726ad2d656f97a7350bf6e32bc77b93fb5d6ccddf5bacb7cfa35a9e78dd772b9823097b672ce6a0a4ef8d62222629a375b77ed6cd4e3d201593833d6252
 AUX mixxx-2.3.0-docs.patch 626 BLAKE2B 73eca9849d69112edd254bd28329b360c31434eb1a4bcb626ca9fcfc0b00dee2c9f9d81d83302fbe0718be9e5a47a1748835013f20398eeb4e50c5e81b78a172 SHA512 2de279b48463d214ef7c9da58c58fb10d0fb300afe80b01e1981f4df15a5f7da1079b53ca1422dc0d69da8a367fe4693ba002a351e57f95fa1b24d5ec7fb12a4
 AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e741d366341fadcb8d142961cf25d6b57aabcc453f74cbb0d3f63b01df5e65e7151a9e59545c50b52e732234ae6a734eb171cef82 SHA512 d301a87760a0162a9e09e08dd544183219776c61d2810d75c37d39a9ac9fcf8a329681e53ca922864ccafeb98231cbeea565db2196e56bf62417a09b40bae4b8
+AUX mixxx-2.3.6-fix-build-taglib2.patch 855 BLAKE2B 91204d0c26b7ef1b2b81d9aed99d923d31c7f01c227594e853e4c8c885cd4ab7938a2efc57a920de213ea3cb927e1e0a3698fd2aa713e7ede17e1767c5635ed9 SHA512 26b3d7999c1af146434db9acf5ffe442c27c6afe84609bbcf2897bd0ee96cca8b6134d4a5a8ceeebf3b1bd62941e8f72d7537828857368f7235bd13677902b39
 AUX mixxx-9999-docs.patch 695 BLAKE2B 5f639550ff8aca7f7aeed8d4d6dfd44e2b0eb8c3cc3f5c6578ff802dfd4c11fa8a9fdf3f820ec8e4fdb1449abcc50673a06b4dac74ba4916b6111e8117474002 SHA512 cd34b4faeb939a1d802936b9b4f740f252ba572926815726f1957df6cc07a362ae03d9772484188dfc0ebcc942808c06ef2c9bab8df6164de4b2b65a447d9f92
 DIST mixxx-2.3.6.tar.gz 41285084 BLAKE2B 35bedb5f41a56577bc59411ca979e3e780c1da2420bc0a7ad98d998c89f8c272202ba42e8b8089904ca8e1a1b6ac5155d08d556538245ce3242b4ea5a670e6d2 SHA512 a92c2c92dc7619ac135d940f23ffdc101c528eca6322517805afb9eb48a84c6339cefb88b96bdac6ffb23967c2f93f621daf3e98bfecbf7f3fe7626ddcec4398
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
@@ -26,7 +27,8 @@ DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b5300176316
 DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
+EBUILD mixxx-2.3.6-r1.ebuild 3841 BLAKE2B fd5195846ace14fc9509a2fdf621d4c69881f7198e115c919ce812cfd0cf013a4aaebfc85216432f8835ca94f10ea466873792a82bf22be3cb0f7d01038c3fbe SHA512 609fef3e6fafd9777881aee08ef262fb6e93db50d59308cbf8f0ee6113256e6c9010fd574109d45a9c4c087f9c264cf79cc86585c6b13ef7ad2af3b769d558d2
 EBUILD mixxx-2.3.6.ebuild 3786 BLAKE2B cfd13b9e0ec845245e086e90895658dd1b4011071525b1166de348bfca7ef45c566d4b5095a81dc44fb264b5ea78e172ba3d173fb5dc61d32cf2dbb28754c2d0 SHA512 6c64e16c7f47237fa1e7ed0577e9060246a7ee453e5b388157b9556a9f53f1381e32e3a7ebef3982a04bef13324edf7c0e20d5999e51214288620285e0980c59
-EBUILD mixxx-2.3.9999.ebuild 3686 BLAKE2B a3693db71d5c8c264e008cc0e813d46a887e2e1cc7430a3e47316338710d1a49c8922ebd731fdd32d89ee7b70da2b52639f8348438ca353f52a55177f31810ba SHA512 948003c5a5e08fc001b298a006230621c51dd5dbd51f86c737cf446e4f8d6d8fa8e3474fdfc3538d8480cef4b828d4b1444f338ab025cba50d3162ee62aeb3ff
-EBUILD mixxx-9999.ebuild 2829 BLAKE2B f21165282b08bcd40f3a345bf523c3881efc1268634a2a2f19fa387ad946d447f94c2f22300d5ecb2c553461d1b93edcc2e879962cd83bff9da73cb264664cf0 SHA512 eb55e944cda6a0eff9416415c84cff5e1ad6d35b808b19699e852740587f4020f44b1978236e14254cb8e66bfcede63c88e0eb69b611afdb67932886167c1221
+EBUILD mixxx-2.3.9999.ebuild 3739 BLAKE2B ce5ecbc9d227613d92799575e5f7612a983ea6fefac0009092ca8938db6125cde8e58bd1909887d17b99c4490620f7eac2e986ae7ad82eca7644e5226ddea03e SHA512 5df57ad58680227ce2cbfd817c0ab74259ba53d30e0069e7ea120d1b53b85cd5afa4e0ea6649857c97e2e10f64ff19e3fb1f38738fe81a319343285b30c5d25a
+EBUILD mixxx-9999.ebuild 2831 BLAKE2B 0aa6b464ed622b963dcf37eef6f8f6c35a0f8a005acfc344bff28bd076946acf67f309af2e309cf494becc2d9917dd86488f140821115d90611b21466fd30712 SHA512 def50a0fb5ba8bfd33a49920d5bfe7cd0c7f8f00e75ec816353f9103bf299d1f1c25f7691c2c466362548acbafdbbf506a56d90c658da3e8a994005b74280d2c
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch b/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch
new file mode 100644
index 000000000000..1a00a455e6ea
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch
@@ -0,0 +1,14 @@
+https://github.com/mixxxdj/mixxx/commit/1dd2ae25e065401371800ad76cb813021702a9e1.patch
+diff --git a/src/track/taglib/trackmetadata_ape.cpp b/src/track/taglib/trackmetadata_ape.cpp
+index c370c6a7f93..b4af3b5afbc 100644
+--- a/src/track/taglib/trackmetadata_ape.cpp
++++ b/src/track/taglib/trackmetadata_ape.cpp
+@@ -59,7 +59,7 @@ bool importCoverImageFromTag(QImage* pCoverArt, const TagLib::APE::Tag& tag) {
+     if (tag.itemListMap().contains("COVER ART (FRONT)")) {
+         const TagLib::ByteVector nullStringTerminator(1, 0);
+         TagLib::ByteVector item =
+-                tag.itemListMap()["COVER ART (FRONT)"].value();
++                tag.itemListMap()["COVER ART (FRONT)"].binaryData();
+         int pos = item.find(nullStringTerminator); // skip the filename
+         if (++pos > 0) {
+             const TagLib::ByteVector data(item.mid(pos));
diff --git a/media-sound/mixxx/mixxx-2.3.6-r1.ebuild b/media-sound/mixxx/mixxx-2.3.6-r1.ebuild
new file mode 100644
index 000000000000..d1cbb797177d
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.6-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg udev
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	if [[ ${PV} == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac:=
+	media-libs/libebur128
+	media-libs/libid3tag:=
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio[alsa]
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib:=
+	media-libs/vamp-plugin-sdk
+	media-sound/lame
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
+	wavpack? ( media-sound/wavpack )
+"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-docs.patch
+	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
+	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
+	"${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch
+)
+
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/${MY_PV}"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-${MY_PV}-en.pdf"
+}
+mixxx_set_globals
+
+src_configure() {
+	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
+		-DOPTIMIZE="off"
+		-DOPUS="$(usex opus on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DVINYLCONTROL="on"
+		-DWAVPACK="$(usex wavpack on off)"
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc "${DISTDIR}"/${PN}-manual-${MY_PV}-${locale/ja/ja-JP}.pdf
+		fi
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 55d859df3021..442ba0752f5f 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,7 +49,7 @@ RDEPEND="
 	media-libs/portaudio[alsa]
 	media-libs/portmidi
 	media-libs/rubberband
-	media-libs/taglib
+	media-libs/taglib:=
 	media-libs/vamp-plugin-sdk
 	media-sound/lame
 	sci-libs/fftw:3.0=
@@ -90,6 +90,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-docs.patch
+	"${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch
 )
 
 PLOCALES="
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 0447de377599..7f200f135d0b 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,7 +50,7 @@ RDEPEND="
 	media-libs/portaudio
 	media-libs/portmidi
 	media-libs/rubberband
-	media-libs/taglib
+	media-libs/taglib:=
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower