gentoo auto-resync : 29:03:2023 - 21:54:14

10 files changed, 287 insertions, 19 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 03147a681d1f..52a4d1f4d29c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 0fd814b0dd8c..2374684f5d87 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,6 +1,10 @@
 AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c
 AUX gpac-2.0.0-configure.patch 3674 BLAKE2B 423016315ac7e7ac6959813dada7cfa97a415c62200fb6e9dce74a89b28124a042f5e9736ac815827ee30001cf7c973495dd3577b8963e1bcab3b8d54a50f41f SHA512 b1f620a9c5be2a889805976a985e7ecf89e736f2b11a5a4c07f6d5fe39e511a603f048760cb6b0d6e9cb0e217acad2897839ef5289c2b4de088b95f75577c4f0
+AUX gpac-2.2.0-configure.patch 3504 BLAKE2B a32633e3b3384e48341ea011119191b0bbe44c3b433ddf413bbf64829e7a642653e1c78c240690df2cc12e6c5f88376275ecbc5a5951dc83d81ba90135ea9bdb SHA512 634236a1a5f14fe5fe5138b16fdf95da1c30aece41525a6ab183b845dd0d37313241319fd305e457623c8b30c600ac9263c4e2b5989cb75e77b3624542fe2c3b
+AUX gpac-2.2.0-ffmpeg6.patch 1162 BLAKE2B bed72ce7db91a5c25f74ae33561fa47c2951dbf454714ef912fd0a97fb5701d7beaaff48608f985b9824e00deea957d3bf7859b2ff3fa6cc6a41e7147b5f2f94 SHA512 6aac7c2a7f5f91d95f6908d798d253dab61cb234bda743df4d477e84be5ee77375e3ea3572fb3b8090e095c441756a2b97d65615853a4a584d0387eb4a32f532
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
+DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089 SHA512 4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2
 EBUILD gpac-2.0.0.ebuild 3259 BLAKE2B 6abca7a4e0f0ef384e5b81fc24a511effc6925610ddf079f8934e20ea4b227831aad72b11deb5cf547d87eca5c57c4cea84dac2403ed4e0d9394d5298bd6b3a1 SHA512 930f88012e50dba329040c7ccce94eadeb4e63b7ae9dd6c6797c894c052d0f28944b7d65f7fea42bd1889f46bfa3c0b061eecfc59019155d674ccdb958aece3e
-EBUILD gpac-9999.ebuild 3267 BLAKE2B 55e60cb52475cc931e6f08123ada4e21df385efa8db15bc87e391679cbd29c4e174561ff43019664db4ba16a3cf78932e35249caa4546061bccacfd0deb8aa1e SHA512 5dba3c1418c2cfd267442a0a25bff00674522ddeda456842b288fcaa00445cb16dd10029ab37dadc68f2d689f435de549a0f9a79112d3d9ea75bab34e73dee0c
+EBUILD gpac-2.2.0.ebuild 3156 BLAKE2B 2c07b67cc8c71ef5d07a76c118ef4e1d2f586af3aade8f2f5452e50df53cfb3078848d930b4badb5c67f330f0c3c3f2f3dde8f02591d56ce844b4a99b0c680a8 SHA512 f70726c988e766c9c728f3ca67caf54fcd4a36e8523900c2419e4444def8aad9b56c15b1a8b7da50a1b5959857f493c1120f7c9f6bedd8f7789c2346c74f818c
+EBUILD gpac-9999.ebuild 3156 BLAKE2B 2c07b67cc8c71ef5d07a76c118ef4e1d2f586af3aade8f2f5452e50df53cfb3078848d930b4badb5c67f330f0c3c3f2f3dde8f02591d56ce844b4a99b0c680a8 SHA512 f70726c988e766c9c728f3ca67caf54fcd4a36e8523900c2419e4444def8aad9b56c15b1a8b7da50a1b5959857f493c1120f7c9f6bedd8f7789c2346c74f818c
 MISC metadata.xml 357 BLAKE2B d08714f001a00d250eaffef3818ed1cf0ea1dfd907799ac7f87c13d32f34106a3dc3982c24729d09c9eaec20143b68b2e966db97a061ee8a4592a8a5d20b8ab2 SHA512 7417738d0c891a1544fa25a9fe4785025e83ed7e5d498335215f70e61b3b599b17cbd9114e660fc5db4315dfeddee99a351b76ff0b801657f990827187f416c5
diff --git a/media-video/gpac/files/gpac-2.2.0-configure.patch b/media-video/gpac/files/gpac-2.2.0-configure.patch
new file mode 100644
index 000000000000..1d26b52a6d90
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-configure.patch
@@ -0,0 +1,104 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+
+Index: gpac-2.2.0/Makefile
+===================================================================
+--- gpac-2.2.0.orig/Makefile
++++ gpac-2.2.0/Makefile
+@@ -276,7 +276,9 @@ install-lib:
+ 	$(INSTALL) $(INSTFLAGS) -m 644 config.h "$(DESTDIR)$(prefix)/include/gpac/configuration.h" || true
+ 
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(lib_dir)" || true
++endif
+ 
+ 	$(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+ 	$(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+Index: gpac-2.2.0/configure
+===================================================================
+--- gpac-2.2.0.orig/configure
++++ gpac-2.2.0/configure
+@@ -74,6 +74,7 @@ enable_sanitizer="no"
+ libgpac_cflags=""
+ libgpac_extralibs=""
+ static_build="no"
++static_libs="no"
+ static_bin="no"
+ static_modules="no"
+ lm_lib=""
+@@ -273,6 +274,7 @@ GPAC build options:
+   --disable-opt            disable GCC optimizations
+   --static-build           link statically against libgpac but still allow dependencies to shared libraries (enable --static-modules)
+   --static-bin             enable static linking of MP4Box and gpac only (will enable --static-build), disable all libraries not linkable statically.
++  --enable-static-lib      GPAC static libraries build
+   --sdl-cfg=SDL_PATH       specify path to sdl-config for local install [$sdl_path]
+   --enable-sdl-static      use static SDL linking [default=no]
+   --X11-path=X11_PATH      specify path for X11 includes and libraries [$X11_PATH]
+@@ -552,6 +554,8 @@ for opt do
+             echo "$opt deprecated, use --static-build instead"
+             static_build="yes";
+             ;;
++        --enable-static-libs) static_libs="yes";
++            ;;
+         --enable-fixed-point) use_fixed_point="yes"
+             ;;
+         --strip) INSTFLAGS="-s $INSTFLAGS"
+@@ -943,14 +947,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+ 
+ 
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-    CFLAGS="-O3 $CFLAGS"
+-else
+-    CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+     want_pic="no"
+@@ -978,11 +974,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-if docc -msse2 $LDFLAGS ; then
+-  CFLAGS="$CFLAGS -msse2"
+-fi
+-
+-
+ #check dlopen support
+ has_dlopen="no"
+ cat > $TMPC << EOF
+@@ -1888,6 +1879,7 @@ else
+ fi
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -2604,6 +2596,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.m
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATIC_BINARY=$static_bin" >> config.mak
+ echo "STATIC_BUILD=$static_build" >> config.mak
++echo "STATIC_LIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+Index: gpac-2.2.0/src/Makefile
+===================================================================
+--- gpac-2.2.0.orig/src/Makefile
++++ gpac-2.2.0/src/Makefile
+@@ -369,8 +369,10 @@ endif
+ 
+ else
+ 
++ifeq ($(STATIC_LIBS), yes)
+ 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATIC_BUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
+ 	mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch b/media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch
new file mode 100644
index 000000000000..89bd0492b7ed
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch
@@ -0,0 +1,24 @@
+Index: gpac-2.2.0/src/filters/ff_mx.c
+===================================================================
+--- gpac-2.2.0.orig/src/filters/ff_mx.c
++++ gpac-2.2.0/src/filters/ff_mx.c
+@@ -503,7 +503,7 @@ static GF_Err ffmx_close_seg(GF_Filter *
+ 		evt.seg_size.is_init = 0;
+ 	}
+ 	evt.seg_size.media_range_start = ctx->offset_at_seg_start;
+-	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->written-1) : 0;
++	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->bytes_written-1) : 0;
+ 	ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+ 
+ 	gf_filter_pid_send_event(pid, &evt);
+@@ -1013,8 +1013,8 @@ static GF_Err ffmx_configure_pid(GF_Filt
+ 		ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag);
+ 	}
+ 
+-	if (ctx->muxer->oformat && ctx->muxer->oformat->query_codec) {
+-		res = ctx->muxer->oformat->query_codec(ff_codec_id, 1);
++	if (ctx->muxer->oformat) {
++		res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, 1);
+ 		if (!res) {
+ 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
+ 			return GF_NOT_SUPPORTED;
diff --git a/media-video/gpac/gpac-2.2.0.ebuild b/media-video/gpac/gpac-2.2.0.ebuild
new file mode 100644
index 000000000000..d8ee67521cd8
--- /dev/null
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/gpac/gpac"
+else
+	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit toolchain-funcs ${SCM} xdg
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/"
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/11"
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg jack jpeg jpeg2k mad opengl oss png
+	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	media-libs/libogg
+	sys-libs/zlib
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	jack? ( virtual/jack )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	jpeg2k? ( media-libs/openjpeg:2 )
+	mad? ( media-libs/libmad )
+	opengl? (
+		media-libs/freeglut
+		virtual/glu
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	theora? ( media-libs/libtheora )
+	truetype? ( media-libs/freetype:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+	)
+	xml? ( dev-libs/libxml2:2= )
+	xvid? ( media-libs/xvid )
+"
+DEPEND="
+	${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-configure.patch"
+	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+	"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
+)
+
+DOCS=(
+	share/doc/CODING_STYLE
+	share/doc/GPAC\ UPnP.doc
+	share/doc/ISO\ 639-2\ codes.txt
+	share/doc/SceneGenerators
+	share/doc/ipmpx_syntax.bt
+	Changelog
+	README.md
+)
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX AR RANLIB
+
+	local myeconfargs=(
+		--cc="$(tc-getCC)"
+		--libdir="$(get_libdir)"
+		--verbose
+		--enable-pic
+		--enable-svg
+		--use-ogg=system
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable dvb dvb4linux)
+		$(use_enable jack jack yes)
+		$(use_enable opengl 3d)
+		$(use_enable oss oss-audio)
+		$(use_enable pulseaudio pulseaudio yes)
+		$(use_enable sdl)
+		$(use_enable ssl)
+		$(use_enable static-libs static-lib)
+		$(use_enable X x11)
+		$(use_enable X x11-shm)
+		$(use_enable X x11-xv)
+		$(my_use a52)
+		$(my_use aac faad)
+		$(use_enable dvb dvbx)
+		$(my_use ffmpeg)
+		$(my_use jpeg)
+		$(my_use jpeg2k openjpeg)
+		$(my_use mad)
+		$(my_use png)
+		$(my_use theora)
+		$(my_use truetype freetype)
+		$(my_use vorbis)
+		$(my_use xvid)
+	)
+
+	if use amd64 || use x86 ; then
+		# Don't pass -mno-sse2 on non amd64/x86
+		myeconfargs+=(
+			--extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
+		)
+	else
+		myeconfargs+=(
+			--extra-cflags="${CFLAGS}"
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	einstalldocs
+	emake STRIP="true" DESTDIR="${ED}" install
+	emake STRIP="true" DESTDIR="${ED}" install-lib
+}
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 777f20e6208b..d8ee67521cd8 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,8 +63,9 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-configure.patch"
+	"${FILESDIR}/${PN}-2.2.0-configure.patch"
 	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+	"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
 )
 
 DOCS=(
@@ -77,8 +78,6 @@ DOCS=(
 	README.md
 )
 
-HTML_DOCS="share/doc/*.html"
-
 my_use() {
 	local flag="$1" pflag="${2:-$1}"
 	if use ${flag}; then
@@ -88,11 +87,6 @@ my_use() {
 	fi
 }
 
-src_prepare() {
-	default
-	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
 src_configure() {
 	tc-export CC CXX AR RANLIB
 
@@ -100,11 +94,8 @@ src_configure() {
 		--cc="$(tc-getCC)"
 		--libdir="$(get_libdir)"
 		--verbose
-		--enable-ipv6
 		--enable-pic
 		--enable-svg
-		--disable-amr
-		--use-js=no
 		--use-ogg=system
 		$(use_enable alsa)
 		$(use_enable debug)
@@ -121,14 +112,14 @@ src_configure() {
 		$(use_enable X x11-xv)
 		$(my_use a52)
 		$(my_use aac faad)
-		$(my_use dvb dvbx)
+		$(use_enable dvb dvbx)
 		$(my_use ffmpeg)
 		$(my_use jpeg)
 		$(my_use jpeg2k openjpeg)
 		$(my_use mad)
 		$(my_use png)
 		$(my_use theora)
-		$(my_use truetype ft)
+		$(my_use truetype freetype)
 		$(my_use vorbis)
 		$(my_use xvid)
 	)
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index fbfc7020e345..9680b80d05fb 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -10,6 +10,6 @@ DIST pipewire-0.3.66.tar.bz2 1532022 BLAKE2B aa0db6426a04728b633ce9a40aa1b10eca6
 DIST pipewire-0.3.67.tar.bz2 1531871 BLAKE2B 59ea184ae11ad2999f37f0ded785551894ce6fbf478146c53f1dc6cdfeae7aa50cf6151b1e5e9c63c4f288682e5da7fde523251096af7da9d79bf96dd9d94809 SHA512 538b8ee905760775a0522dd3883d5db9bcaafe93d80eb5b588e21e73de22637a49cd139d3ed4dcfd1a5822af85e4cede624eee899c1e51a115f1ba0a6966c7a5
 EBUILD pipewire-0.3.65-r3.ebuild 16976 BLAKE2B f0f75822c4ddf0a9f1e4ff6e78f069075222343f24c0cefb4a2a965cd17b71eed75b7d25a8410f905e792590df65fe00752d02669be66c9f6fa968508be27742 SHA512 e1ae16ec05931256d9ea5fafedea8a0f7240ba64701ab957aa994356075518c635b83ad470dd110865b7a16a6d04d5c5f8bba4636bb20aa256a7c5d7c07c8533
 EBUILD pipewire-0.3.66-r1.ebuild 17366 BLAKE2B 1525b6cfdcc5f0d632c7603ede0300c792825071a8cc48e9c117c9d8665ef5269feb880b992fcf782743f4d28c8582245159f2c603cc66c6ba3ed25566e407cf SHA512 b81a40d2ab045a938b79c56c3c135b8f61cef36ea1c010d7fb500c695174f91a0944059f8f632a04ac9a3d6c5343d0afc0d870c00fedc7154b69a74f2a647934
-EBUILD pipewire-0.3.67.ebuild 17355 BLAKE2B 1bb661f01f7511993d924afd11510e84793b835f0574305f313e43bd65f41babed4b813e90e29fe4c77842318d66940720573ca1b078efbedd36f03e32a7b3cc SHA512 7f32f9ce4519bef8fc85d3a1e0653fdad375a1d3de51f7681c664bb60bd965861cb99423fbea96a5e09625406059920eaa9cbcbe07e642dbfda9c7c3527c2963
+EBUILD pipewire-0.3.67.ebuild 17352 BLAKE2B 5f2ad802c35012fb82c8f39c003d182d675e702950d29b985dbbee649f3b2e1dedf967f269c100a5557e2f76616378dd3d5467080a25b2a4ff6d98c9799343a0 SHA512 df76c1ba4fcf250c135d20b0762e52beab6d965fe065324a9ef5c254def959f9cd4ffba928abc4ffe1eb9789adec63b1e87ba254b9ff5948e005890868117480
 EBUILD pipewire-9999.ebuild 17355 BLAKE2B 1bb661f01f7511993d924afd11510e84793b835f0574305f313e43bd65f41babed4b813e90e29fe4c77842318d66940720573ca1b078efbedd36f03e32a7b3cc SHA512 7f32f9ce4519bef8fc85d3a1e0653fdad375a1d3de51f7681c664bb60bd965861cb99423fbea96a5e09625406059920eaa9cbcbe07e642dbfda9c7c3527c2963
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/pipewire-0.3.67.ebuild b/media-video/pipewire/pipewire-0.3.67.ebuild
index b5b2c3d9ab32..ae11b71c4ff1 100644
--- a/media-video/pipewire/pipewire-0.3.67.ebuild
+++ b/media-video/pipewire/pipewire-0.3.67.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 7e792ddf01f1..b935a024c1db 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -2,6 +2,6 @@ AUX wireplumber-0.4.10-config-disable-sound-server-parts.patch 1017 BLAKE2B 09ea
 DIST wireplumber-0.4.13.tar.bz2 320378 BLAKE2B c245c7e716ba64e28aef6278b1f9d8fdc89881a35c99c645cacf3b356fe90dbdc93a99b0c09792649faadcb685f47a65faeacbeff4ecf3e728f34c1fb4611120 SHA512 b8a43a0ec56037b51a1ddc8ae7f369e0494eab9baf3acded965e2923c5cf8263860d5f1973c83d25a33388243db3ac6e1321ed3b42a01e8cac813d9b47554dbf
 DIST wireplumber-0.4.14.tar.bz2 323688 BLAKE2B feb6cd4bc4e6617395fc8cc6a6f0c8d61026250f1d4691e60f2778ac6bb92e05a6a4078df95c932931bbf8c57f74c592cacbb2adeb6b2f332514eb50e04746b5 SHA512 51dc830d4dfe000cf6091d728d9ce6248585f5fae729536d611f85a0981722b9ab7f13322b516dc9988cdc15e0859f946aa0b78a35ad13a67e2de8082e6d5549
 EBUILD wireplumber-0.4.13.ebuild 4104 BLAKE2B 9a05f37909cb1f627edf59fffaf634c73f6929f54764466fd69639c2bbe3dee170041982d2fdca18d63a86454282564c1780a8356b8cc90918596ad34d1a288c SHA512 34117a9d78f2c32dc29adfc9e7bc658d1a841b73f8ff958e35f6dbeac9ccfd9a29fb1f12d26e450728780ca21155e0f9c5567177223a302acc8fc76fb45c3283
-EBUILD wireplumber-0.4.14.ebuild 4110 BLAKE2B 2e5335afe3ab6825ba497ef4ec5eb662a6853abde1dfb47734b2d3bc50a349f8c7549ebf610a69a2294d25e10190f7d5fa9a7c524723e8d73c00e8a85402bd5d SHA512 8bc1d549f955010d43c140a8e7c9103b69255ff4dfdf975cf4f16fe54b1df8a5c1ed2b5d90c9526f766769e3cb2dade0da259c71bcd8d92bef6aea9e48605cc3
+EBUILD wireplumber-0.4.14.ebuild 4107 BLAKE2B b0f32280351ae0c34cbaf56ff013c5d43a102bc788d1bdce7e5009c1ff473eb4fedcd4c90546e0dec7f7da6d41d6c493a12e7a8c81c9011e7c51f2d1a9c64513 SHA512 44708333391f8161b34ace273d311aed101b3beb836cd3fcd93acffe8cd10ad25a6d77770daf5ffc1cd5a87945018425314635bd533997853a57fa9e19b79513
 EBUILD wireplumber-9999.ebuild 3969 BLAKE2B 7cab5b6b1cc131908ba430ba331d23b20c9863f436240276e2d7505c97c2512b869219c108cec91c30bbec7896dd6dd226715bbbff510461fcf8ab1aaecdda4d SHA512 5da740d4980b7f7adfb70567660c14d57b6e37185a52d991263d5371785784973a96d7ca34ebf809572849673c1203a50a6f1b2fa59d4074153059d749fe337a
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.4.14.ebuild b/media-video/wireplumber/wireplumber-0.4.14.ebuild
index 13b84f6aefce..d47aeec349ec 100644
--- a/media-video/wireplumber/wireplumber-0.4.14.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.14.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"