gentoo auto-resync : 25:11:2024 - 03:02:44

3 files changed, 85 insertions, 5 deletions

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 01aa55fd9875..04798d92dc2d 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,7 +1,9 @@
 AUX xine-ui-0.99.10-desktop.patch 852 BLAKE2B 6341545955de64e3fc30a89c30b102b2bad33915f03a435786c18addc6d329ed65988b5ac6394039550136e3705c6cf03d9b34145d248671d3a98fe0d6f08bd8 SHA512 f901219cfe75fc4b4e9e25074a12e14366dae4c412866ff75c95f28ddb972a1237d8d33cd622deb812ec240bcd9d05bf6ec0c2cdec7d18de7ad88f2f93b77bc0
 AUX xine-ui-0.99.13-build.patch 1293 BLAKE2B 1bc2176ea28ce2b52efbd57b3e796470c489df1b6ec29fc76eaa1eae0b12032be3b12147b5de58858f6478c6546ecfad745317646ad0611363adce72585fad1d SHA512 e4d9d16b888021c5ceb754990c944efa8346ea648d1c3d1b1adf302963825dd84dd3f62d19c7f72fecd7d4e14823fe6fb0d28439bb7c2a27ead94b47852bc2d4
 AUX xine-ui-0.99.13-configure-c99.patch 2398 BLAKE2B fb9e0f1da968d13350d500be504e7fb0f831f6c274f70daf760de9db8fd564cf0a3e342768161f01cc8207fea151e955bdee5067ab426fe83cd00bebc8a435d3 SHA512 82b09398bf764e29253ca06ef76287d0d81f291e4d6c72c06ef0d87f45f3f3f8674b77e78a3f1382b3fa220de2ab245059377f51883052ecd24bea13affc1c53
+AUX xine-ui-0.99.14-configure-c99.patch 2516 BLAKE2B 6bb0897817fe4cc9cd41499881c21a4a9c0bc2d47345858a44d6e20588edd10b788dcadc9fb10f9ff00d08ffa42c0eedbfbf7138bc5c2ef6955a4fd32034ee43 SHA512 0b2245411526f04bd0a55841eb2bf3dc8b2dd599d974957506a7d75791cbf0c084417c56d38bfd09d42d3a549b655593b73c50c876384928b790b89a5ccf01e1
 DIST xine-ui-0.99.13.tar.xz 2156892 BLAKE2B edb4cb082faeba5f9f64ea06f6561d471fddfc7672dd92ec1a0a99b5c8eb10f46c15df2044fa2a4eaafdeab1fa56d990afa443f912602fdc676d1e34e3cf6c84 SHA512 a0802d767a805c462f7ae05fa5c4860af5c281ffa74c70a6c2c8a3ecbf8060e6f3f40fed215e27a823985c7d5c3484715cbbe5e4bf43655353f59fa2230b41e7
+DIST xine-ui-0.99.14.tar.xz 2214740 BLAKE2B 8785215bd3569dd2f056cb87c16233103bf89d50a188f4e47d2bac07366b58e5c73016097a6d87e8e097d56e1216b639704a0c5a55877c9304151f9caabf3d15 SHA512 e925e2f1d02c4eac4615f59c99dd95f1627617f2abb644c521cf015f795c66bf56386e7d414b528c1cf91bbdab53f46999104e992aecebbdcb62c230e6d989e7
 EBUILD xine-ui-0.99.13-r1.ebuild 1896 BLAKE2B be289ed33ddcc2490a12e1078032f22c103ceaaaab76b428f676c7843f46cff433cd4b2fe9b68322d8e28cf85a3252164e439131ea184dd0b1bb9a6faab5fccb SHA512 76a81eb0e9c4f62efd29e7d5f39c026d8b6ebe27c3e9ac8ecd954187a8164a60fd66a49df21a38c8d60b8eaa4f49c6e270ec246f2ddb3ddf3c83a28d54ac86dc
-EBUILD xine-ui-0.99.13.ebuild 1835 BLAKE2B dbc189ac4b3c4487674f566a67b332181477b05033c2998777670c2aef9ebc0725d1624a0be4aa7d0db68c3d270b6be537082aa989b8b8b5f067798137c2a93f SHA512 a1eee61549b30b5160f1e5f3ba2b91d4a45f224aa070651c839411460048218b912d473fd1a2325c8847e2b3fcb5f8e3956aee44e46ed9c361f3d8e821d39845
+EBUILD xine-ui-0.99.14.ebuild 1923 BLAKE2B a3865a31cfb5996ef122d3af346b08e4f1b25d20631092af28c0def7dbe9773f4ea64662d23a7961317faac0a4dbc17f5fecee068fb6547c59b1a1ba2072d354 SHA512 be6ea6c023c568f41fe6b12cd1438c1129adb1765d04f0d2a61d3cbdafa0822b66c434518766c42fcd5623943ddff64ff1a026d559e6b57f32672099bbe4a527
 MISC metadata.xml 387 BLAKE2B c8fa662bcdb54c05bd2360ee28622b8f41636ee93ac77d9db6f5a0a6fc68e0b0aa46b1bd8953243242fcd414088351a71331eaaf8838055d3c87c4120a45827e SHA512 de41930ed1d1133841980eec98872a74b05ad97196f01aa1c121806c2d726567327de3baaf5726b32e427efda38744ecbd16b5ab3568575844fe7e07f70a6621
diff --git a/media-video/xine-ui/files/xine-ui-0.99.14-configure-c99.patch b/media-video/xine-ui/files/xine-ui-0.99.14-configure-c99.patch
new file mode 100644
index 000000000000..79ee61544047
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.14-configure-c99.patch
@@ -0,0 +1,75 @@
+https://sourceforge.net/p/xine/tickets/22/
+https://bugs.gentoo.org/899872
+
+Fix C compatibility issues in the configure script
+
+This is necessary to avoid incorrectly failing probes due to expected
+compiler errors.
+
+Include <stdlib.h> for the exit function, and <string.h> for the
+strdup function.
+
+Use fake prototypes to avoid implicit function declarations in the
+xine_* function probes.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -198,6 +198,7 @@
+   if test "$ac_cv_header_sys_shm_h" = "yes"; then
+     AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
+     AC_TRY_RUN([
++	  #include <stdlib.h>
+           #include <sys/types.h>
+           #include <sys/ipc.h>
+           #include <sys/shm.h>
+--- a/m4/aa.m4
++++ b/m4/aa.m4
+@@ -52,6 +52,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <aalib.h>
++#include <string.h>
+ 
+ int main () {
+   int major, minor;
+--- a/m4/_xine.m4
++++ b/m4/_xine.m4
+@@ -218,7 +218,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([],[xine_open_cloexec();])],
++         [AC_LANG_PROGRAM([char xine_open_cloexec(void);],[xine_open_cloexec();])],
+          [AC_DEFINE([HAVE_XINE_OPEN_CLOEXEC], [1], [Define if xine-lib supports xine_open_cloexec])
+           AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no])])
+@@ -234,7 +234,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([],[xine_socket_cloexec();])],
++         [AC_LANG_PROGRAM([char xine_socket_cloexec(void);],[xine_socket_cloexec();])],
+          [AC_DEFINE([HAVE_XINE_SOCKET_CLOEXEC], [1], [Define if xine-lib supports xine_socket_cloexec])
+           AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no])])
+@@ -250,7 +250,7 @@
+      CFLAGS="$CFLAGS $XINE_CFLAGS"
+      LIBS="$LIBS $XINE_LIBS"
+      AC_LINK_IFELSE(
+-         [AC_LANG_PROGRAM([
++         [AC_LANG_PROGRAM([char xine_list_next_value(void);
+          ],[
+ xine_list_next_value ();
+          ])],
+--- a/configure.ac
++++ b/configure.ac
+@@ -641,7 +641,8 @@ dnl
+ dnl Check for clock_gettime() in librt
+ dnl
+ AC_MSG_CHECKING(whether librt is needed)
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
++                                     #include <unistd.h>
+                                      #include <sys/time.h>]],
+                                    [[#if _POSIX_TIMERS > 0
+                                      struct timespec ts;
diff --git a/media-video/xine-ui/xine-ui-0.99.13.ebuild b/media-video/xine-ui/xine-ui-0.99.14.ebuild
index b72e8c700ecb..c7dccde4efc3 100644
--- a/media-video/xine-ui/xine-ui-0.99.13.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools xdg
+inherit autotools flag-o-matic xdg
 
 DESCRIPTION="Xine movie player"
 HOMEPAGE="https://xine-project.org/home"
@@ -11,14 +11,14 @@ SRC_URI="https://downloads.sourceforge.net/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="
 	|| ( app-arch/tar app-arch/libarchive )
 	media-libs/libpng:0=
 	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	aalib? ( media-libs/aalib:= )
 	curl? ( >=net-misc/curl-7.10.2:= )
 	libcaca? ( media-libs/libcaca:= )
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.99.10-desktop.patch
-	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${PN}-0.99.14-configure-c99.patch
 )
 
 src_prepare() {
@@ -60,6 +60,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #944213
+	append-cflags -std=gnu17
+
 	econf \
 		$(use_enable nls) \
 		$(use_enable xinerama) \