From b67879c88b00e0544a2312175e3c8a37b7d6e768 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 15 Dec 2022 14:35:28 +0800 Subject: [PATCH] Disable int10 only under non-x86 arch --- xorg-x11-server.spec | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 65a3a66..5ba52d0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 # X.org requires lazy relocations to work. %undefine _hardened_build %undefine _strict_symbol_defs_build @@ -74,7 +74,6 @@ Patch1001: 0001-render-Fix-build-with-gcc-12.patch BuildRequires: make BuildRequires: systemtap-sdt-devel -BuildRequires: git-core BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.17 @@ -243,13 +242,7 @@ Xserver source code needed to build VNC server (Xvnc) %prep -%autosetup -N -n %{pkgname}-%{version} -rm -rf .git -cp %{SOURCE1} .gitignore -# ick -%global __scm git -%{expand:%__scm_setup_git -q} -%autopatch +%autosetup -p1 -n %{pkgname}-%{version} %if 0%{?stable_abi} # check the ABI in the source against what we expect. @@ -276,11 +269,11 @@ test `getminor extension` == %{extension_minor} %build -%if %{undefined int10_arch} +%ifnarch x86_64 %global no_int10 --disable-vbe --disable-int10-module %endif -%global kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev +%global kdrive --enable-kdrive --enable-xephyr %global xservers --enable-xvfb --enable-xnest %{kdrive} --enable-xorg %global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins" %global dri_flags --disable-dri --enable-dri2 --enable-dri3 --enable-suid-wrapper --enable-glamor @@ -295,7 +288,7 @@ autoreconf -f -v --install || exit 1 --with-default-font-path=%{default_font_path} \ --with-module-dir=%{_libdir}/xorg/modules \ --with-builderstring="Build ID: %{name} %{version}-%{release}" \ - --with-os-name="$(hostname -s) $(uname -r)" \ + --with-os-name="%{_vendor} $(uname -r)" \ --with-xkb-output=%{_localstatedir}/lib/xkb \ --without-dtrace \ --disable-linux-acpi --disable-linux-apm \ @@ -308,7 +301,7 @@ autoreconf -f -v --install || exit 1 %{dri_flags} \ ${CONFIGURE} -make V=1 %{?_smp_mflags} +%make_build %install @@ -356,17 +349,13 @@ xargs tar cf - | (cd %{inst_srcdir} && tar xf -) find %{inst_srcdir}/hw/xfree86 -name \*.c -delete # Remove unwanted files/dirs -{ - find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : -# wtf %ifnarch x86_64 - rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/lib{int10,vbe}.so +rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/lib{int10,vbe}.so %endif -} %files common -%doc COPYING +%license COPYING %{_mandir}/man1/Xserver.1* %{_libdir}/xorg/protocol.txt %dir %{_localstatedir}/lib/xkb @@ -401,7 +390,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_libdir}/xorg/modules/libshadowfb.so %{_libdir}/xorg/modules/libvgahw.so %{_libdir}/xorg/modules/libwfb.so -%if %{defined int10_arch} +%ifarch x86_64 %{_libdir}/xorg/modules/libint10.so %{_libdir}/xorg/modules/libvbe.so %endif @@ -451,7 +440,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_mandir}/man1/Xephyr.1* %files devel -%doc COPYING +%license COPYING #{_docdir}/xorg-server %{_bindir}/xserver-sdk-abi-requires %{_libdir}/pkgconfig/xorg-server.pc @@ -464,10 +453,13 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog -* Tue Oct 25 2022 Chunmei Xu - 1:1:1.20.14-3 +* Thu Dec 15 2022 Funda Wang - 1:1.20.14-4 +- Disable int10 only under non-x86 arch + +* Tue Oct 25 2022 Chunmei Xu - 1:1.20.14-3 - xf86: Accept devices with the 'simpledrm' driver -* Tue Jul 12 2022 happy_orange - 1:1:1.20.14-2 +* Tue Jul 12 2022 happy_orange - 1:1.20.14-2 - bugfix the some xorg modules loading error in iso * Fri Apr 22 2022 mgb01105731 - 1:1.20.14-1 -- Gitee