commit 32641c51ba59cb5751010a9c2f245f6ad3aedd45 Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Fri Dec 17 19:44:27 2021 +0100 Fix build on armv7hl, ppc64le and aarch64 xine-ui-0.9.13-Fix_build.patch | 49 ++++++++++++++++++++++++++++++++++++++++++ xine-ui.spec | 10 ++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) --- diff --git a/xine-ui-0.9.13-Fix_build.patch b/xine-ui-0.9.13-Fix_build.patch new file mode 100644 index 0000000..1003f23 --- /dev/null +++ b/xine-ui-0.9.13-Fix_build.patch @@ -0,0 +1,49 @@ +# HG changeset patch +# User Torsten Jager <t.jager(a)gmx.de&gt; +# Date 1639694590 -3600 +# Thu Dec 16 23:43:10 2021 +0100 +# Node ID f9a98e02460348ca23ca2f5c2b39e62c8758b22d +# Parent e352b6eef94b6441f4afc86f96abe247acc2a60b +Fix build. + +diff -r e352b6eef94b -r f9a98e024603 configure.ac +--- a/configure.ac Sat Dec 11 19:53:57 2021 +0200 ++++ b/configure.ac Thu Dec 16 23:43:10 2021 +0100 +@@ -600,8 +600,10 @@ + ])], [have_attr_iaso=yes], [have_attr_iaso=no]) + AC_MSG_RESULT([$have_attr_iaso]) + if test x"$have_attr_iaso" = x"yes" ; then +- AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], +- [__attribute__ ((__target__ ("inline-all-stringops")))], ++ AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [__attribute__ ((__target__ ("inline-all-stringops")))], ++ [Define this to a function attribute that inlines string handling code]) ++else ++ AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [], + [Define this to a function attribute that inlines string handling code]) + fi + +diff -r e352b6eef94b -r f9a98e024603 src/common/utils.h +--- a/src/common/utils.h Sat Dec 11 19:53:57 2021 +0200 ++++ b/src/common/utils.h Thu Dec 16 23:43:10 2021 +0100 +@@ -21,7 +21,7 @@ + #ifndef _COMMON_UTILS_H + #define _COMMON_UTILS_H + +-#ifndef HAVE_CONFIG_H ++#ifndef PACKAGE_NAME + #error config.h not included + #endif + +diff -r e352b6eef94b -r f9a98e024603 src/xitk/network.c +--- a/src/xitk/network.c Sat Dec 11 19:53:57 2021 +0200 ++++ b/src/xitk/network.c Thu Dec 16 23:43:10 2021 +0100 +@@ -34,7 +34,9 @@ + + //#warning IMPLEMENT POST SUPPORT + ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #ifdef HAVE_READLINE + diff --git a/xine-ui.spec b/xine-ui.spec index 08dd29a..f68d909 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -10,7 +10,7 @@ Name: xine-ui Version: 0.99.13 -Release: 1%{?snapshot:.%{date}hg%{commit}}%{?dist} +Release: 2%{?snapshot:.%{date}hg%{commit}}%{?dist} Summary: A skinned xlib-based gui for xine-lib License: GPLv2+ URL: http://www.xine-project.org/ @@ -59,6 +59,10 @@ Source100: make_xineui_snapshot.sh # Patch to use UTF-8 documentation, BZ #512598 Patch1: xine-ui-0.99.13-utf8doc.patch +# Fix build on armv7hl, ppc64le and aarch64 +# https://sourceforge.net/p/xine/xine-ui/ci/f9a98e02460348ca23ca2f5c2b39e62... +Patch100: xine-ui-0.9.13-Fix_build.patch + BuildRequires: aalib-devel >= 1.2.0 BuildRequires: autoconf BuildRequires: automake @@ -127,6 +131,7 @@ It also contains the color ascii art and framebuffer versions. %setup -T -D -n %{name}-%{version}%{?snapshot:hg} %patch1 -p1 +%patch100 -p1 # By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora # it's provided by libX11-devel => version the dlopen() @@ -258,6 +263,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Dec 17 2021 Xavier Bachelot <xavier(a)bachelot.org&gt; - 0.99.13-2 +- Fix build on armv7hl, ppc64le and aarch64 + * Mon Dec 13 2021 Xavier Bachelot <xavier(a)bachelot.org&gt; - 0.99.13-1 - Update to 0.99.13