gentoo auto-resync : 28:01:2023 - 14:51:38

6 files changed, 30 insertions, 142 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e7c8e79ea9d7..d941643552da 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 0299a6a5fbb1..363da96ce747 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,8 +1,5 @@
 AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
 DIST avidemux-i18n-2.8.1.tar.gz 2765272 BLAKE2B ecca8a3d6f278e02e37059c1c1dce4d8164661548f29d5e51273d76e46434bc349d93701209fd6a009364244540d75cae09ce456e968d1761ca5540acc4ba678 SHA512 aa93add0d72170abf009e5bd86eeb5198907ee8961e366ad396d85315b9908f8f94bf920ba2a0cf9c351dd9c50f7ef883480d88e7475f48d085648bfbfa1f4d4
-EBUILD avidemux-2.7.8.ebuild 3819 BLAKE2B 91023ef353dfcd3461659a5508767f17e1ae3144df2d59ecd2647693e04d1b5ad73efbeaf0d6b4ab73368179be8e00d9552ee47678a98917b5197c9b3781db3e SHA512 3ac0fce20d50ddbc2f80902e300e870c35de05047078b44162049bbc996367b53519670e10bd26a6d6b119dbef4f192fefad6bd0e772243db4e19beef3d159cc
 EBUILD avidemux-2.8.1.ebuild 3865 BLAKE2B 9e7f2e39764d932ad1ed0ca3c7aa608ed0cf75b30c5c291d520b535bda96216623ef99090fc20808fefd515e50193e4ad5a2f4619b42a1c4759e04a28f20ade1 SHA512 aa4b58cf408d312a81602f8c7b2868534d7bc70cd44f22edf07b55b94768aebe3b272c04c58152ed2d743796292a14068499843564046bd14c33ed1c0eca5915
 MISC metadata.xml 406 BLAKE2B d6a426301f7ec43489c8b5d8f97f8a00c887088d84ac3dcf0483ab6441bc786e40bce11ec49a5633d3a558f338a82b811cfe47031316103a89ae372ff6295ae2 SHA512 e6710b75d927435f098819d97c004e2ae879d3d1756030d38122c73e2f9465154f83cf2f34c68756931745a1515f0dbeb8a36922c70fd72fb0c3d4eb060acaab
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
deleted file mode 100644
index e4407a08f6d6..000000000000
--- a/media-video/avidemux/avidemux-2.7.8.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake desktop flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="
-	https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz
-"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls opengl qt5 sdl vaapi vdpau xv"
-
-BDEPEND="
-	dev-lang/yasm
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?]
-	opengl? ( virtual/opengl:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	vaapi? ( media-libs/libva:0= )
-"
-RDEPEND="
-	${DEPEND}
-	nls? ( virtual/libintl:0 )
-	!<media-video/avidemux-${PV}
-"
-
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_unpack() {
-	default
-	mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch"
-
-	processes="buildCli:avidemux/cli"
-	use qt5 && processes+=" buildQt4:avidemux/qt4"
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
-	done
-
-	if use qt5; then
-		# Fix icon name -> avidemux-2.7
-		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/"${PN}".desktop || die "Icon name fix failed."
-
-		# The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
-		sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/"${PN}".desktop || die "Desktop file fix failed."
-
-		# QA warnings: missing trailing ';' and 'Application' is deprecated.
-		sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/"${PN}".desktop || die "Desktop file fix failed."
-
-		# Now rename the desktop file to not collide with 2.6.
-		mv appImage/"${PN}".desktop "${PN}-${SLOT}".desktop || die "Collision rename failed."
-	fi
-
-	# Remove "Build Option" dialog because it doesn't reflect
-	# what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	# The build relies on an avidemux-core header that uses 'nullptr'
-	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DGETTEXT="$(usex nls)"
-		-DSDL="$(usex sdl)"
-		-DLibVA="$(usex vaapi)"
-		-DOPENGL="$(usex opengl)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	use qt5 && mycmakeargs+=(
-			-DENABLE_QT5="$(usex qt5)"
-			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-	)
-
-	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_compile
-	done
-}
-
-src_test() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_test
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake_src_install
-	done
-
-	if use qt5; then
-		cd "${S}" || die "Can't enter source folder"
-		newicon "${PN}"_icon.png "${PN}-${SLOT}".png
-		domenu "${PN}-${SLOT}".desktop
-	fi
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 417509835568..16992b489691 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,6 +2,7 @@ AUX 0.3.64/0001-spa-Fix-audioconvert-overflow-when-scaling.patch 2802 BLAKE2B a7
 AUX 0.3.64/0002-filter-chain-fix-AVX-dsp_sum-index-increment.patch 790 BLAKE2B d4ec77a8aa37d090a153d05adbdab2a9664827d554cf325dabfa3ebad18028f02e0645b8a3c7795d9b57604cd31b1d9f847bf798a5c36b99cafeaf7793feea64 SHA512 14b60490c33764fbf9ba63e19325d5441a4604de967fad88210354544f683bdf31e5371af4aef3ef41cf40386a09d69ab3513f10ef012cfa70b0ce1fbe8a3d1f
 AUX 0.3.64/0003-keys-don-t-remove-deprecated-symbols-by-default.patch 2026 BLAKE2B 1320fda269952cccf85490d52b3b1e88d1d118297f9369e1bd4eb3f81ba6d2b0c3db01e2fb4d9b39f422427805ef01b752b4503633883d6c50a81617c6ee9119 SHA512 4e825e7977e5d272b23078f6c2ebc25ee83ff14afae10e70ecf1a7476528f6759047790fc346fd2ee9669a205cdf75a79b07881dc8c2f159110b7b7a92200a3a
 AUX 0.3.65/0001-modules-also-install-module-combine-stream.patch 765 BLAKE2B 6bff3215436405743b53aa7bf1c65ff31d01df2df32262bf168f052b0c77978c1da1158c3c9f4365521f8e277172de1277562d4c61f83ae6a83cc31af8ab67b5 SHA512 5097dae990b8eedcc6f33eb729151d48c377316f1488a09bfcfdc3a4e1416af5e9d825a5bcb42831d2d8830cdcdd911732561f9c593908e8509084e97a135b27
+AUX 0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch 1039 BLAKE2B 9b4cb2901379e8761826d60f1fc0dd4d23c952c3ec96326d45e7d4a6a65010396f17aea49733c394e9d5530fd2bdb2ac5eea8155c368a683cab00f941d5ea617 SHA512 18d7c78862166afec039823076190e2cff0977defba52ef54b8cfb49d3caaee5cd66429d9f6aa132d86059adfb5d43bc410084ab0dc11456c48f3f1d362fcb1e
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
@@ -17,6 +18,6 @@ DIST pipewire-0.3.65.tar.bz2 1522095 BLAKE2B d991820e8780773ccf1cd68baa3156428eb
 EBUILD pipewire-0.3.63-r3.ebuild 16537 BLAKE2B 2fecbd30359107e2c6d82420c3199ddaf1a535a5c7b811db45f8d021ee350f73e92ef3fc3ce56323d5f26954d81d07bd6f970ee04bd91e6c8d4b3bef103fd170 SHA512 e160f3d01d068d093c890a716f4098879b2b6d068d0afcd1e2f08ddc0b845f20f4722a451fc94cc4b07747fa21c9057ae21405c6a3ce76e3d5feb354c6aac52e
 EBUILD pipewire-0.3.64-r2.ebuild 16375 BLAKE2B 776c12e939de524b096165c5b794637e8caee90b437068da593c8bd186128a2948db44d91ac1a20ce981f27a0729078a5a0abb4521c12e77abaf8be6b9682c7c SHA512 40cda83b4df6885887d4bf841a97c6682919ea9d91bc2cbcc7517858b1d04e0ae74b6a79a81270e02d349697f6b39b6bf5f642dcd85e65975f855606bbd9c9fb
 EBUILD pipewire-0.3.64.ebuild 16187 BLAKE2B f9036abc280611f3e9a82733e6f8ecdf9ec123d491f86c46734346ea3e890b19e72e0806fd532f31dbefb9fca964fb8a15a94386d85b7364cb2a30834f005459 SHA512 2311b635e07226a064c5e0ea55ea12fbe58c163dbf8813d343cadfc67f859fb32b6649bcf2134e52f5e34c6e84eaf7b3fb6e138df91442bd7ce0b4777dde6820
-EBUILD pipewire-0.3.65-r2.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
+EBUILD pipewire-0.3.65-r3.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
 EBUILD pipewire-9999.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
new file mode 100644
index 000000000000..2763236693d7
--- /dev/null
+++ b/media-video/pipewire/files/0.3.65/0002-spa-bluez5-fix-dependency-on-glib-in-bluez5_deps.patch
@@ -0,0 +1,28 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1511
+
+From 18fa7a555cc43c7219a53d836d9561faec6d6310 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 28 Jan 2023 11:04:48 +0000
+Subject: [PATCH] spa: bluez5: fix dependency on glib in bluez5_deps
+
+In de595a78ff958b8314d853f6266d5832529d9729, we started to require glib
+for building bluez and introduced dependencies for the needed gio* bits,
+but we only ever check for glib itself for gstreamer or flatpak.
+
+Drop glib from the dep list to match the summary() & subsequent bluez_deps_found
+logic in spa/meson.build.
+
+Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2999
+--- a/spa/plugins/bluez5/meson.build
++++ b/spa/plugins/bluez5/meson.build
+@@ -1,6 +1,6 @@
+ gnome = import('gnome')
+ 
+-bluez5_deps = [ mathlib, dbus_dep, glib2_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
++bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
+ foreach dep: bluez5_deps
+   if not dep.found()
+     subdir_done()
+-- 
+2.39.1
+
diff --git a/media-video/pipewire/pipewire-0.3.65-r2.ebuild b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
index 7e07410dfab4..7e07410dfab4 100644
--- a/media-video/pipewire/pipewire-0.3.65-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.65-r3.ebuild