really apply previous patch [release 1.15.2-3mamba;Thu Aug 21 2014]

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

View File

@ -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 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.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 +++ 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 static void
fixup_video_driver_list(char **drivers) 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 }; + static const char *fallback[6] = { "fglrx", "modesetting", "fbdev", "vesa", "wsfb", NULL };
char **end, **drv; char **end, **drv;
char *x; char *x;

View File

@ -1,6 +1,6 @@
Name: xorg-server Name: xorg-server
Version: 1.15.2 Version: 1.15.2
Release: 2mamba Release: 3mamba
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
@ -116,7 +116,7 @@ X.Org glx extension.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
#%patch0 -p1 %patch0 -p1
#%patch1 -p1 #%patch1 -p1
#%patch2 -p1 #%patch2 -p1
@ -300,6 +300,9 @@ exit 0
%{_libdir}/xorg/modules/extensions/libglx_dri_so %{_libdir}/xorg/modules/extensions/libglx_dri_so
%changelog %changelog
* Thu Aug 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-3mamba
- really apply previous patch
* Fri Aug 08 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-2mamba * Fri Aug 08 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-2mamba
- update Xorg_configure patch to put modesetting after nouveau and before fbdev and vesa - update Xorg_configure patch to put modesetting after nouveau and before fbdev and vesa