gentoo auto-resync : 12:04:2024 - 11:28:19

5 files changed, 211 insertions, 4 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a1f414678eac..bba34b0f0250 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 66a6f84f496f..2dc4e85f3d28 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,7 @@
 AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
 DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719
+DIST Ardour-8.5.0.tar.bz2 17589054 BLAKE2B 43cb8be9e5afd1957d7b9672d3f0a77d00bef8805363dd0b117cc1037f6fd509da708fe301a2a17b975ab66350c96cfe650be3f61ed66b659a4b8651900960b9 SHA512 515b9684e8394d591d66b7ed65e8cb6525e20fe23c2755ed7bc28ac1311b14c408a9d7a5218cdf40e60983e6cd400fbab7f3cf2c9385e855efdbe2c713fa2fca
 EBUILD ardour-8.4.ebuild 5204 BLAKE2B 16e8c0cf203b95da34fe55fa44b9fa83f17cb675ab76b0d6b19325c164f881fb184e54bb4751434613c3f029da7f5cc644fb7676e08d929365b3973a009a4544 SHA512 8fd20142e6bb42cfc047508f3b2d60f4d58ac11d2c724feccc6e97c62bffd2e5e71aca178f59da2709b43d35f5df06c1292b77d25ba4c8a49da7a89508661535
+EBUILD ardour-8.5.ebuild 5205 BLAKE2B 190e7e14668d84494daaf11352a9c57b45c0e5c31ec32ba378bfa07fd251417a9465afce95aa1a19e637cf9914e7c2bcb92678816090bd3eae40602918f80323 SHA512 6fbd533981465023be86c6c6b5668638c8f5a058c2c1f603b6353f969c2728cddac4ca1a71f011c5f1d1a060fbe5c423e41efffc6493292ac285dae708031f42
 EBUILD ardour-9999.ebuild 5205 BLAKE2B 190e7e14668d84494daaf11352a9c57b45c0e5c31ec32ba378bfa07fd251417a9465afce95aa1a19e637cf9914e7c2bcb92678816090bd3eae40602918f80323 SHA512 6fbd533981465023be86c6c6b5668638c8f5a058c2c1f603b6353f969c2728cddac4ca1a71f011c5f1d1a060fbe5c423e41efffc6493292ac285dae708031f42
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-8.5.ebuild b/media-sound/ardour/ardour-8.5.ebuild
new file mode 100644
index 000000000000..cee5f390d988
--- /dev/null
+++ b/media-sound/ardour/ardour-8.5.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~loong ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="8"
+IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac:=
+	media-libs/freetype:2
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/raptor:2
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	net-libs/libwebsockets
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil[X,gtk2]
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-text/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.patch"
+)
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# delete optimization flags
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+
+	# handle arch
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+
+	# boost and shebang
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+
+	# handle locales
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	plocale_for_each_disabled_locale my_lcmsg
+}
+
+src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
+	local backends="alsa,dummy"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
+	tc-export CC CXX
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
+			echo '' || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls '' "--no-nls")
+		$(usex phonehome '' "--no-phone-home")
+		# not possible right now  --use-external-libs
+		# missing dependency: https://github.com/c4dm/qm-dsp
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+
+src_install() {
+	local s
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
+	find "${D}/usr/share/icons/" -name ardour6.png -delete
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+	rm "${D}/usr/share/mime/packages/ardour.xml" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index abd7efb7e685..e92d31cea3c7 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,5 @@
-DIST qtractor-0.9.38.tar.gz 2611675 BLAKE2B 4b4e2854644f4adde1251638055ed77e5e101718c5b2e069d2beb2f0647d70b49751f70491b3545a95b9d9fe9be5256ebe0566a14f36ebb7fd321bf2556496d9 SHA512 870b586ff0a1c3d990eb473c2c5ba0b0adeece7132faad56b7d7848cc8665531a764982fc0c7a2a46c6b42d84c3cef50ab4164fa556136cd9bd15ff76b4294c6
 DIST qtractor-0.9.39.tar.gz 2619142 BLAKE2B 062b363c2db748da731a2b5ee375e1a820bae9ea2d312a2f9f313fc2df11049e86452308c725fff58d7ffd05e916c3d3bbe42e8fd07f10012a34005edf874967 SHA512 3b2a4dde182147d73c773cff0ee6e3d086dd8b598b884a7ca564f10a1fdb56c3e86b3d135739f2629476a587e13b11d4a42abe7c498b76a0321151d9c0ff2852
-EBUILD qtractor-0.9.38.ebuild 2555 BLAKE2B b2aa00999a00faf8f56a0a8e744ca779f10ae4c514ead037819cc6f9da9e5f8a3f8b2d2d8c899f19c42a2f501a2acfb2ccd0b382f2a66038712d4f89ce3eb510 SHA512 39664cd4d23b0800d9421de74b08451fd1100556d05a26b8b6d7968a4bc9de173a7be8369bafbc0449f93c8a8c0cd341693ec0cc99959a0420aa7c9ca6418318
+DIST qtractor-0.9.90.tar.gz 2647835 BLAKE2B a9bf283f062f946e630e4e878c194326d1cc7028c27dc91dbcb8f8567612d88c4005b73ca9a8270e837b27ea20f419bad4d54d85441338863bf6b7558c07ba50 SHA512 caed9a454e84fd2701c7d37f33bfcff32383127e891af5c2823045f710f953bf2e2040b7261ce5b24b1fc330a06ffb47132fe4b9a378c9cfe3e40f6b4e6f01cb
 EBUILD qtractor-0.9.39.ebuild 2750 BLAKE2B f4ee42322cec50e66966e23869e3f4936f6fd6f49279b0c3b78c62bb0b172d6d998a43324ae4a210edf4be9726e9fdf6dcd59a4e508d533c0a4200fe9d3e1e24 SHA512 891768f6a05c6066f85bdc29a4dd789552d5bd989f8e35bf7dc76cedc1f198eebbd1bb6252c4b98796c195c511714acf8a57d15108319d2142a6a31223168cd5
+EBUILD qtractor-0.9.90.ebuild 2752 BLAKE2B 34e1433213b788ddbdd7fa046722a4e32928ea468233b19fb9ec1b5472b62301ca642b0e611b30ab8ce5b293e67e6e055c394808354900cefa2e12ecea471623 SHA512 7b42de4bbd08b9408dd3159e77321de2fe092446408b9bc3d2bf4cbef48f395c503803cd43b84a8428d9f569e532667bcaef10edf59c003679ab33a62ef32b59
 MISC metadata.xml 945 BLAKE2B 4f88a28c83ce8b2874664ad8bf6a08d5a575a609fab948c47471ed226e284453f87da5b1ae034678295e30e5e1dce357ced317ef5d3ab793e04fb17120ce55b4 SHA512 5ab11543fa297253f5cb15515c16caf967fc69e9cccccb9ac6a6ba26fffce1f8539414edf3b065a61ddce0ff8ce3f04b90a68fd5bb79e0a498ca14c275753947
diff --git a/media-sound/qtractor/qtractor-0.9.38.ebuild b/media-sound/qtractor/qtractor-0.9.90.ebuild
index c7903c3066af..8f2299f5dc0c 100644
--- a/media-sound/qtractor/qtractor-0.9.38.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.90.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
 HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
@@ -54,6 +54,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/927061
+	# https://github.com/rncbc/qtractor/commit/83ed590eed798f24b6aa1a792b38c2fc61051356
+	#
+	# Remove on next version bump.
+	filter-lto
+
 	local mycmakeargs=(
 		-DCONFIG_DSSI=$(usex dssi 1 0)
 		-DCONFIG_GRADIENT=1