From 294c16e2bfab95d70185c956691751a844894bb5 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:48:57 +0100 Subject: [PATCH] really apply previous patch [release 1.15.2-3mamba;Thu Aug 21 2014] --- xorg-server-1.15.2-Xorg_configure.patch | 4 ++-- xorg-server.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xorg-server-1.15.2-Xorg_configure.patch b/xorg-server-1.15.2-Xorg_configure.patch index fd07051..d02ceaa 100644 --- a/xorg-server-1.15.2-Xorg_configure.patch +++ b/xorg-server-1.15.2-Xorg_configure.patch @@ -1,11 +1,11 @@ diff -Nru xorg-server-1.12.1.orig/hw/xfree86/common/xf86Config.c xorg-server-1.12.1/hw/xfree86/common/xf86Config.c --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Config.c 2012-03-30 04:57:26.000000000 +0200 +++ xorg-server-1.12.1/hw/xfree86/common/xf86Config.c 2012-04-24 12:24:57.966283561 +0200 -@@ -514,7 +514,7 @@ +@@ -510,7 +510,7 @@ static void fixup_video_driver_list(char **drivers) { -- static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL }; +- static const char *fallback[4] = { "fbdev", "vesa", "wsfb", NULL }; + static const char *fallback[6] = { "fglrx", "modesetting", "fbdev", "vesa", "wsfb", NULL }; char **end, **drv; char *x; diff --git a/xorg-server.spec b/xorg-server.spec index 430f1fd..2c4780f 100644 --- a/xorg-server.spec +++ b/xorg-server.spec @@ -1,6 +1,6 @@ Name: xorg-server Version: 1.15.2 -Release: 2mamba +Release: 3mamba Summary: The core of the X.Org Foundation implementation of the X Window system Group: System/X11 Vendor: openmamba @@ -116,7 +116,7 @@ X.Org glx extension. %prep %setup -q -n %{name}-%{version} -#%patch0 -p1 +%patch0 -p1 #%patch1 -p1 #%patch2 -p1 @@ -300,6 +300,9 @@ exit 0 %{_libdir}/xorg/modules/extensions/libglx_dri_so %changelog +* Thu Aug 21 2014 Silvan Calarco 1.15.2-3mamba +- really apply previous patch + * Fri Aug 08 2014 Silvan Calarco 1.15.2-2mamba - update Xorg_configure patch to put modesetting after nouveau and before fbdev and vesa