This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
50b2d2ee00
commit
63d931b105
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -21,5 +21,3 @@
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
## Specific LFS patterns
|
||||
xorg.conf.man-070818.tar filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-07-20 22:27:48.000000000 +0200
|
||||
+++ ./hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-31 10:35:00.000000000 +0200
|
||||
@@ -65,7 +65,6 @@ search locations are as follows:
|
||||
.B $XORGCONFIG
|
||||
.IB /etc/X11/ $XORGCONFIG
|
||||
.IB __projectroot__/etc/X11/ $XORGCONFIG
|
||||
-.BI $HOME /__xconfigfile__
|
||||
.I /etc/X11/__xconfigfile__\-4
|
||||
.I /etc/X11/__xconfigfile__
|
||||
.I /etc/__xconfigfile__
|
||||
@@ -85,10 +84,7 @@ is the path specified with the
|
||||
command line option (which may be absolute or relative),
|
||||
.B $XORGCONFIG
|
||||
is the path specified by that
|
||||
-environment variable (absolute or relative),
|
||||
-.B $HOME
|
||||
-is the path specified by that environment variable (usually the home
|
||||
-directory), and
|
||||
+environment variable (absolute or relative), and
|
||||
.I <hostname>
|
||||
is the machine's hostname as reported by gethostname(3).
|
||||
.PP
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
|
||||
index 858b1ed..bd5d5b1 100644
|
||||
--- a/randr/rrinfo.c
|
||||
+++ b/randr/rrinfo.c
|
||||
@@ -98,6 +98,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
|
||||
if (!output)
|
||||
return;
|
||||
RROutputSetCrtcs (output, &crtc, 1);
|
||||
+ output->crtc = crtc;
|
||||
RROutputSetConnection (output, RR_Connected);
|
||||
#ifdef RENDER
|
||||
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 4 13:28:06 CET 2009 - sndirsch@suse.de
|
||||
|
||||
- removed randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff;
|
||||
probably a wrong patch since this commit has been reverted right
|
||||
after by commit b4193a2eee80895c5641e77488df0e72a73a3d99 again
|
||||
- no longer overwrite xorg.conf with an obsolete one; obsoletes
|
||||
disable-root-xorg_conf.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 3 05:06:02 CET 2009 - sndirsch@suse.de
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ BuildRequires: libjpeg-devel
|
||||
Url: http://xorg.freedesktop.org/
|
||||
%define EXPERIMENTAL 0
|
||||
Version: 7.4
|
||||
Release: 29
|
||||
Release: 30
|
||||
License: X11/MIT
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Group: System/X11/Servers/XF86_4
|
||||
@ -56,7 +56,6 @@ Source4: xorgcfg.tar.bz2
|
||||
Source5: modprobe.nvidia
|
||||
%endif
|
||||
Source7: xorg-docs-1.4.tar.bz2
|
||||
Source8: xorg.conf.man-070818.tar
|
||||
Patch1: fpic.diff
|
||||
Patch2: p_default-module-path.diff
|
||||
Patch6: pu_fixes.diff
|
||||
@ -65,7 +64,6 @@ Patch13: p_xorg_acpi.diff
|
||||
Patch14: p_xkills_wrong_client.diff
|
||||
Patch16: p_xnest-ignore-getimage-errors.diff
|
||||
Patch18: p_ia64-console.diff
|
||||
Patch22: disable-root-xorg_conf.diff
|
||||
Patch23: disable-fbblt-opt.diff
|
||||
Patch27: mouse.diff
|
||||
Patch29: xephyr.diff
|
||||
@ -87,7 +85,6 @@ Patch41: loadmod-bug197195.diff
|
||||
Patch45: bug-197858_dpms.diff
|
||||
Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch
|
||||
Patch67: xorg-docs.diff
|
||||
Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
|
||||
Patch77: fbdevhw.diff
|
||||
Patch79: edit_data_sanity_check.diff
|
||||
Patch83: ia64linuxPciInit.diff
|
||||
@ -163,7 +160,7 @@ An X Window System server for Virtual Network Computing (VNC).
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8
|
||||
%setup -q -n xorg-server-%{dirsuffix} -a4 -a7
|
||||
%patch1
|
||||
%patch2
|
||||
%patch6
|
||||
@ -174,7 +171,6 @@ An X Window System server for Virtual Network Computing (VNC).
|
||||
pushd hw/xfree86/os-support
|
||||
%patch18
|
||||
popd
|
||||
%patch22
|
||||
%patch23
|
||||
%patch27
|
||||
%patch29
|
||||
@ -200,7 +196,6 @@ chmod 755 hw/vnc/symlink-vnc.sh
|
||||
pushd xorg-docs-*
|
||||
%patch67
|
||||
popd
|
||||
%patch72 -p1
|
||||
%patch77
|
||||
%patch79 -p1
|
||||
### FIXME
|
||||
@ -545,6 +540,12 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Mar 04 2009 sndirsch@suse.de
|
||||
- removed randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff;
|
||||
probably a wrong patch since this commit has been reverted right
|
||||
after by commit b4193a2eee80895c5641e77488df0e72a73a3d99 again
|
||||
- no longer overwrite xorg.conf with an obsolete one; obsoletes
|
||||
disable-root-xorg_conf.diff
|
||||
* Tue Mar 03 2009 sndirsch@suse.de
|
||||
- regenerated xorg-server-xf4vnc.patch (still disabled)
|
||||
* Fri Feb 27 2009 sndirsch@suse.de
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:91cce526cd1e3c995594434b9cfbf271c7e739b3367153c73e7311ebb731788b
|
||||
size 71680
|
||||
Loading…
Reference in New Issue
Block a user