gentoo auto-resync : 20:02:2025 - 00:15:26

6 files changed, 49 insertions, 5 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 10d869318ce9..ab23571245fd 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5b061f7fc69f..9fa95d240abc 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,9 +11,9 @@ AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f9415
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.21-taglib2.tar.xz 12620 BLAKE2B e0211789acc6c0381307bd154775ab32c0c403c9e245a965774667f9a83e801436b8609574f3152cde714e416d1826eb2b197349a54dfdf8eb86fc6ee3dd6f4e SHA512 f5b6691c36993b7f8002ff5c244f8e73b8fa8aeb09ef83f38f51ff9fda67c8204551cb2d762e16364229fdca6d7284a47c4d44d0a98b1d3c7759923500d04ffa
 DIST vlc-3.0.21.tar.xz 25649288 BLAKE2B 0ad05282d624611ba8a2b6ca062c68aabeac8f37410dd427cc9b8c0d107af48ed203b73978e2fe83e8171ea6b78caa51394f3497061b561447dbb41058e1af9f SHA512 cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee
-DIST vlc-3.0.21_p20250212.tar.bz2 24648402 BLAKE2B 4b54371cf921ac6caf7a2eeea44f25ba010f5660bd7a15bc638408d0e321889987cfdfa04c5df50414b463384708cdc7a3772ca0783e357e68e3ed9220949dc3 SHA512 6072052ffc78b6d447fbd13d992af4032f5e15bb0722a615433cbdb6fe2ca8411266c552084fbf4f5dd4a6a3b3b30acd788f205d0b7e08ee987b33ba512cb8e0
+DIST vlc-3.0.21_p20250217.tar.bz2 24645521 BLAKE2B 473cc2bc5f385635ba7c36bca2ddb0ca6cb479491e7a5baa51583edce3fa1e4b0a7afd883d595332cafe8d1b22e743e0f306aebfe2c7c13d3317d0ea5502bb38 SHA512 95d23c8ecf013d072530fe7cd6e78b5efc0a7132407e8d09d02014b4a7cf9f508cea4c18c0f39edced634338fce06613a207b5f0b556344c7481a1ed5af2dc5f
 EBUILD vlc-3.0.21-r3.ebuild 13389 BLAKE2B d3835c67c3eb74b405c1f31f14ee8392c8f2fb6956c1c859896b9a166990c3422e9262557761661a6bb7237b5f3b055a7e68faddf25ae519e6e375e6c30e30a0 SHA512 55625237298dd96e2f404f8800c9c3add4ffc37509db45874e33579ff32017561458b72cf4215293b8a8b2d0bdc2a4e58e3e720779de65b060737e37a53c572e
-EBUILD vlc-3.0.21_p20250212.ebuild 13432 BLAKE2B 953a86f7aeac560bcbb73625fd33a1e1ef3e64da643f178e26b71b65b1c264c0f1d5fd4ffc477c3128c44ba04db50d676acd5271dc4d083e49cf5739127c0722 SHA512 57a4b8860ed37d1d5eb327918b7bcd8787edc7bc0412391caccc170ce1815256d1314a40ae17ab6315ac1c1a0f4d3a15c937128d8e4b29bb0c0d548b758cc694
+EBUILD vlc-3.0.21_p20250217.ebuild 13432 BLAKE2B 0bfea0164ebf80e588c3815483e399dbc65e1f5ffe22f6bc5ee0c76a829fb58be1c8ba1b67ced60ed9e8f7776bd6793cceb2655d5bc3cb6896d978ea9abfd6c5 SHA512 abb8972d9ba9143852def9d921e230a7e86bfbeef4a76c42aa5094df80fb077734e10793c102a44d2dae3ae8aed36edf8804a5747576b1da6402cf8dbfbec92e
 EBUILD vlc-3.0.9999.ebuild 13591 BLAKE2B 03d2d1a3279a8f19053433f6de4925c515e26a8c869df1ed18ce1aa51101da9389ae1a8a0dcd814abcd2166d4a776c702a678a01eca2d81807a94e751c008f8a SHA512 7add14ba556414ad33b54bde3136d28d9ed060d1aa2a5d3349c534481a163e2186e6f823167636db6d97ad50550d60abfa775e3e6d52a4f6ca9f2232476e1a6a
 EBUILD vlc-9999.ebuild 13567 BLAKE2B 3fefd741ab6376eea8fc69979880fb0fd3bda3292ca7b768b6eb5f952ec85d43bd3621ddad4ebfd55d269122018c90ddedcf2ecbdc922a5cd802b0d77b8d58d5 SHA512 671c2df63c38240b1c1edcb14c891030d6850a2b66bf16954e1f4ee82b74670c23154ef14012bd0bfb26210cbe331d4a0d589e70f7c598749f31f5cc62a225ae
 MISC metadata.xml 4733 BLAKE2B 820fb938c3ca3079c48596f131adb1298ee98c9820921780ee4acf322c4475bab7c31de16688b5668a715c496857c572778bd7b4b5d3f3dcbb61b08fd0db8574 SHA512 d74d916645ae6a3b0fb8d6c6f0a2a35e24ab9a829b790d33d9f80e2fdd3165db8ffe2747e82e698bce7b9974384704a380dd2f4f50d8647bcaa91a016d1522cd
diff --git a/media-video/vlc/vlc-3.0.21_p20250212.ebuild b/media-video/vlc/vlc-3.0.21_p20250217.ebuild
index 85aa62730eb0..9666b133af61 100644
--- a/media-video/vlc/vlc-3.0.21_p20250212.ebuild
+++ b/media-video/vlc/vlc-3.0.21_p20250217.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT=120f41a5741fc502b1a73d835093212cccbcb87d
+COMMIT=ac807d2c8574c292a34c51e000c1554f372aa618
 LUA_COMPAT=( lua5-{1..2} )
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index 7b3c32867444..dbe2a275da53 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,5 +1,6 @@
+AUX xvattr-1.3-conflicting-types.patch 1676 BLAKE2B 22f421d1d8c73249042e2ae48af44bdfe4cc1e2dddefa4484905906d2f4ca3e9e4df9c61d2b507a7b2f4dba85dc2be1caf4b31c85c56fec6603acebdb67cdca9 SHA512 dc1886a274f44a5044f7c105a6d3b8ff718687bd643e191886ce7486c1449ec676e92714a497fdd98621fea009c2d15e24ed13d6535de3165a8baa855e14d350
 AUX xvattr-1.3-gtk.patch 1255 BLAKE2B 471cfe05fbeaaa405771543d5c3b8900be848642724078a583321aa997b5e8c442894e6d2f6bf4ccb0eeed283f5f059b2be741c654c9a18f888034a105eb2eff SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138
 AUX xvattr-1.3-pod-encoding.patch 303 BLAKE2B 127fa43fe4ab6586d30d85a685d98038f226f54286147c98fc4fa738cc996c2bb802cf8fa962bb9143dfc506d64243b1d3f8af5218705b24f0f435fff85f3256 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484
 DIST xvattr-1.3.tar.gz 82263 BLAKE2B 5e12c3001640c50294693eccf4e6b04c0e034634cc25a7be9e70dcd84c6da73e87be5a092ba4e9d9e5a70469d5018ac016d9812c2099bd68d35247ac6c522730 SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0
-EBUILD xvattr-1.3-r3.ebuild 696 BLAKE2B 200a1c5318b14179733f60bb5fb2255fff69c8323482d6ab709e89c774ddb07b5b9e30952435406006b54d4b508d15819a18bd055a805b55e32e703a4ec495a1 SHA512 1b813172e152136528dadec79da8a6699517fb9bf5d369b6de3193405ecf93c478e058077159d0f07722e9ddef00d7f7e3a98e06c0d572448ac705c7a4b77209
+EBUILD xvattr-1.3-r4.ebuild 740 BLAKE2B b1a865653ccb01caea4ee5402cfefe592282b9dbb5ddebe32cc9905e14b92e558f3daf633b6e009a2b5a8e157c2ee3df8c5ec024ca493c0bff99a1173a4c3df9 SHA512 6c403dcd37d54d86270c4e34307e6ce2329a94421675678870027d6435f42ca9e671d143ff9166c90b9fc93e9f6733e337647eafec27a8d8e20f4fc07b967b6b
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-video/xvattr/files/xvattr-1.3-conflicting-types.patch b/media-video/xvattr/files/xvattr-1.3-conflicting-types.patch
new file mode 100644
index 000000000000..595c90fbd46b
--- /dev/null
+++ b/media-video/xvattr/files/xvattr-1.3-conflicting-types.patch
@@ -0,0 +1,42 @@
+Fix incompatible pointers, GTK style
+Also, remove non-POSIX getopt declaration that conflitcts
+with musl
+https://bugs.gentoo.org/919367
+https://bugs.gentoo.org/945292
+--- a/gxvattr.c
++++ b/gxvattr.c
+@@ -256,7 +256,7 @@
+         label = gtk_label_new (xvattr[k].name);
+         if (!strcmp(xvattr[k].name, "XV_COLORKEY")) {
+           manipulator = gtk_color_selection_new();
+-          set_color_widget(manipulator, cur_val);
++          set_color_widget(GTK_OBJECT(manipulator), cur_val);
+           property->controller = (GtkObject *) manipulator;
+           property->set_widget = set_color_widget;
+           if (xvattr[k].flags & XvSettable) {
+@@ -269,7 +269,7 @@
+ 	           xvattr[k].max_value == 1) {
+ 	  // boolean value, use check button
+ 	  manipulator = gtk_check_button_new();
+-	  set_bool_widget(manipulator, cur_val);
++	  set_bool_widget(GTK_OBJECT(manipulator), cur_val);
+           property->controller = (GtkObject *) manipulator;
+           property->set_widget = set_bool_widget;
+           if (xvattr[k].flags & XvSettable) {
+--- a/getopt.h
++++ b/getopt.h
+@@ -138,14 +138,7 @@
+    `getopt'.  */
+ 
+ #if (defined __STDC__ && __STDC__) || defined __cplusplus
+-# ifdef __GNU_LIBRARY__
+-/* Many other libraries have conflicting prototypes for getopt, with
+-   differences in the consts, in stdlib.h.  To avoid compilation
+-   errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+-# else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
+-# endif /* __GNU_LIBRARY__ */
+ 
+ # ifndef __need_getopt
+ extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r4.ebuild
index 7a16d54cbe19..23dc55d055f7 100644
--- a/media-video/xvattr/xvattr-1.3-r3.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${P}-gtk.patch
 	"${FILESDIR}"/${P}-pod-encoding.patch
+	"${FILESDIR}"/${P}-conflicting-types.patch
 )
 
 src_prepare() {