arm: patch to fi libunwind build and hopefully crash at X startup [release 1.15.2-4mamba;Wed Sep 10 2014]

This commit is contained in:
Silvan Calarco 2024-01-05 19:48:57 +01:00
parent 294c16e2bf
commit b3e297af5b
2 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -Nru xorg-server-1.15.2.orig/configure.ac xorg-server-1.15.2/configure.ac
--- xorg-server-1.15.2.orig/configure.ac 2014-06-27 02:57:42.000000000 +0200
+++ xorg-server-1.15.2/configure.ac 2014-09-10 02:08:41.158460451 +0200
@@ -1653,7 +1653,7 @@
PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
-PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
+PKG_CHECK_MODULES(LIBUNWIND, libunwind-generic, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
if test "x$LIBUNWIND" = "xauto"; then
LIBUNWIND="$HAVE_LIBUNWIND"
fi

View File

@ -1,6 +1,6 @@
Name: xorg-server Name: xorg-server
Version: 1.15.2 Version: 1.15.2
Release: 3mamba Release: 4mamba
Summary: The core of the X.Org Foundation implementation of the X Window system Summary: The core of the X.Org Foundation implementation of the X Window system
Group: System/X11 Group: System/X11
Vendor: openmamba Vendor: openmamba
@ -13,6 +13,7 @@ Source11: xorg-server-xprofile
Patch0: xorg-server-1.15.2-Xorg_configure.patch Patch0: xorg-server-1.15.2-Xorg_configure.patch
Patch1: xorg-server-1.3.0.0-hsync_higher_default.patch Patch1: xorg-server-1.3.0.0-hsync_higher_default.patch
Patch2: %{name}-1.6.4-fix_DGA_removal.patch Patch2: %{name}-1.6.4-fix_DGA_removal.patch
Patch3: xorg-server-1.15.2-libunwind-arm.patch
License: MIT License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
@ -119,8 +120,14 @@ X.Org glx extension.
%patch0 -p1 %patch0 -p1
#%patch1 -p1 #%patch1 -p1
#%patch2 -p1 #%patch2 -p1
%ifarch arm
%patch3 -p1
%endif
%build %build
%ifarch arm
autoreconf -i || true
%endif
%configure \ %configure \
--enable-glx \ --enable-glx \
--enable-dri \ --enable-dri \
@ -300,6 +307,9 @@ exit 0
%{_libdir}/xorg/modules/extensions/libglx_dri_so %{_libdir}/xorg/modules/extensions/libglx_dri_so
%changelog %changelog
* Wed Sep 10 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-4mamba
- arm: patch to fi libunwind build and hopefully crash at X startup
* Thu Aug 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-3mamba * Thu Aug 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-3mamba
- really apply previous patch - really apply previous patch