Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/xine-ui/, media-video/xine-ui/files/
Date: Fri, 30 Sep 2022 02:14:41
Message-Id: 1664504066.7a0da2bafd776dfc30935a497316ec668a10aa24.sam@gentoo
1 commit: 7a0da2bafd776dfc30935a497316ec668a10aa24
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 02:14:17 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 02:14:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0da2ba
7
8 media-video/xine-ui: backport build fix patch
9
10 Closes: https://bugs.gentoo.org/871951
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../xine-ui/files/xine-ui-0.99.13-build.patch | 43 ++++++++++++++++++++++
14 media-video/xine-ui/xine-ui-0.99.13.ebuild | 1 +
15 2 files changed, 44 insertions(+)
16
17 diff --git a/media-video/xine-ui/files/xine-ui-0.99.13-build.patch b/media-video/xine-ui/files/xine-ui-0.99.13-build.patch
18 new file mode 100644
19 index 000000000000..dc24720d97da
20 --- /dev/null
21 +++ b/media-video/xine-ui/files/xine-ui-0.99.13-build.patch
22 @@ -0,0 +1,43 @@
23 +hg diff -r e352b6eef94b6441f4afc86f96abe247acc2a60b -r f9a98e02460348ca23ca2f5c2b39e62c8758b22d
24 +https://sourceforge.net/p/xine/xine-ui/ci/e352b6eef94b6441f4afc86f96abe247acc2a60b/
25 +https://sourceforge.net/p/xine/tickets/10/
26 +https://bugs.gentoo.org/871951
27 +
28 +--- a/configure.ac
29 ++++ b/configure.ac
30 +@@ -600,8 +600,10 @@ int n = my_strlen ("what");
31 + ])], [have_attr_iaso=yes], [have_attr_iaso=no])
32 + AC_MSG_RESULT([$have_attr_iaso])
33 + if test x"$have_attr_iaso" = x"yes" ; then
34 +- AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS],
35 +- [__attribute__ ((__target__ ("inline-all-stringops")))],
36 ++ AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [__attribute__ ((__target__ ("inline-all-stringops")))],
37 ++ [Define this to a function attribute that inlines string handling code])
38 ++else
39 ++ AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [],
40 + [Define this to a function attribute that inlines string handling code])
41 + fi
42 +
43 +--- a/src/common/utils.h
44 ++++ b/src/common/utils.h
45 +@@ -21,7 +21,7 @@
46 + #ifndef _COMMON_UTILS_H
47 + #define _COMMON_UTILS_H
48 +
49 +-#ifndef HAVE_CONFIG_H
50 ++#ifndef PACKAGE_NAME
51 + #error config.h not included
52 + #endif
53 +
54 +--- a/src/xitk/network.c
55 ++++ b/src/xitk/network.c
56 +@@ -34,7 +34,9 @@
57 +
58 + //#warning IMPLEMENT POST SUPPORT
59 +
60 ++#ifdef HAVE_CONFIG_H
61 + #include "config.h"
62 ++#endif
63 +
64 + #ifdef HAVE_READLINE
65 +
66
67 diff --git a/media-video/xine-ui/xine-ui-0.99.13.ebuild b/media-video/xine-ui/xine-ui-0.99.13.ebuild
68 index 799cc50106f2..cba68d230908 100644
69 --- a/media-video/xine-ui/xine-ui-0.99.13.ebuild
70 +++ b/media-video/xine-ui/xine-ui-0.99.13.ebuild
71 @@ -50,6 +50,7 @@ DEPEND="${RDEPEND}
72
73 PATCHES=(
74 "${FILESDIR}"/${PN}-0.99.10-desktop.patch
75 + "${FILESDIR}"/${P}-build.patch
76 )
77
78 src_prepare() {