rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=18

Browse Source
This commit is contained in:
OBS User unknown 2007-03-15 00:52:10 +00:00 committed by Git OBS Bridge
parent 3f6dba9d5f
commit befd6b89fd
7 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bug197190-ia64.diff Normal file
View File

@ -0,0 +1,12 @@
--- hw/xfree86/int10/Makefile.am.orig 2007-03-14 15:36:06.000000000 +0100
+++ hw/xfree86/int10/Makefile.am 2007-03-14 15:37:59.669455872 +0100
@@ -29,6 +29,9 @@
if INT10_X86EMU
AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
$(XORG_CFLAGS) $(EXTRA_CFLAGS)
+if LINUX_IA64
+AM_CFLAGS += -DNO_LONG_LONG
+endif
INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
libint10_la_SOURCES = \
$(COMMON_SOURCES) \

23
xf86crtc_allowdual.diff
View File

@ -1,23 +0,0 @@
--- xorg-server-1.2.99.901/hw/xfree86/modes/xf86Crtc.c.orig 2007-03-05 04:10:32.000000000 +0100
+++ xorg-server-1.2.99.901/hw/xfree86/modes/xf86Crtc.c 2007-03-08 17:08:56.000000000 +0100
@@ -1099,9 +1099,6 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn,
*/
output->status = (*output->funcs->detect)(output);
- if (output->status == XF86OutputStatusDisconnected)
- continue;
-
memset (&mon_rec, '\0', sizeof (mon_rec));
conf_monitor = output->conf_monitor;
@@ -1273,6 +1270,10 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn,
output->name);
}
#endif
+
+ if (output->status == XF86OutputStatusDisconnected)
+ continue;
+
for (mode = output->probed_modes; mode != NULL; mode = mode->next)
{
/* The code to choose the best mode per pipe later on will require

3
xorg-server-1.2.99.901.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f59fb358825af9f94679a64742b1bc516afa6ffff017c01a426110e82ed07ef8
size 5964551

3
xorg-server-1.2.99.902.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed4d4aaee75300037974d20f6673aad4dcf98f09f3db6526c405244a45978741
size 5963933

32
xorg-x11-server.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Wed Mar 14 22:09:12 CET 2007 - sndirsch@suse.de
- xserver 1.2.99.902 release:
* Xprint: shorten font filename to fit in tar length limit
* Move xf86SetSingleMode into X server from intel driver.
* Add xf86SetDesiredModes to apply desired modes to crtcs.
* Use EDID data to set screen physical size at server startup.
* Allow relative positions to use output names or monitor
identifiers.
* Add xf86CrtcScreenInit to share initialization across drivers.
* Add hw/xfree86/docs/README.modes, documenting new mode setting
APIs.
* Remove stale monitor data when output becomes disconnected.
* Revert "Xprint includes a filename which is too long for tar."
* Revert "Xext: Update device's lastx/lasty when sending a motion
event with XTest."
* Xext: Update device's lastx/lasty when sending a motion event
with XTest.
-------------------------------------------------------------------
Wed Mar 14 17:09:25 CET 2007 - sndirsch@suse.de
- xf86crtc_allowdual.diff no longer required; replaced by
xrandr_12_newmode.diff in xrandr (xorg-x11 package)
-------------------------------------------------------------------
Wed Mar 14 15:43:46 CET 2007 - sndirsch@suse.de
- bug197190-ia64.diff:
* missing -DNO_LONG_LONG for IA64 (Bug #197190)
-------------------------------------------------------------------
Fri Mar 9 16:10:23 CET 2007 - sndirsch@suse.de

31
xorg-x11-server.spec
View File

@ -11,7 +11,7 @@
# norootforbuild
Name: xorg-x11-server
%define dirsuffix 1.2.99.901
%define dirsuffix 1.2.99.902
%define fglrx_driver_hack 0
%define vnc 0
BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 58
Release: 60
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -82,7 +82,7 @@ Patch42: bug227111-ddc_screensize.diff
Patch43: bug-211314_mesa-context.diff
Patch44: bug-211314_p_drawable_privclean.diff
Patch45: bug-197858_dpms.diff
Patch46: xf86crtc_allowdual.diff
Patch46: bug197190-ia64.diff
Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff
@ -178,7 +178,7 @@ pushd ../Mesa
popd
%patch44 -p0
%patch45 -p0
%patch46 -p1
%patch46 -p0
%build
autoreconf -fi
@ -509,6 +509,29 @@ exit 0
%endif
%changelog
* Wed Mar 14 2007 - sndirsch@suse.de
- xserver 1.2.99.902 release:
* Xprint: shorten font filename to fit in tar length limit
* Move xf86SetSingleMode into X server from intel driver.
* Add xf86SetDesiredModes to apply desired modes to crtcs.
* Use EDID data to set screen physical size at server startup.
* Allow relative positions to use output names or monitor
identifiers.
* Add xf86CrtcScreenInit to share initialization across drivers.
* Add hw/xfree86/docs/README.modes, documenting new mode setting
APIs.
* Remove stale monitor data when output becomes disconnected.
* Revert "Xprint includes a filename which is too long for tar."
* Revert "Xext: Update device's lastx/lasty when sending a motion
event with XTest."
* Xext: Update device's lastx/lasty when sending a motion event
with XTest.
* Wed Mar 14 2007 - sndirsch@suse.de
- xf86crtc_allowdual.diff no longer required; replaced by
xrandr_12_newmode.diff in xrandr (xorg-x11 package)
* Wed Mar 14 2007 - sndirsch@suse.de
- bug197190-ia64.diff:
* missing -DNO_LONG_LONG for IA64 (Bug #197190)
* Fri Mar 09 2007 - sndirsch@suse.de
- xf86crtc_allowdual.diff:
* allows dualhead even when the second monitor is not yet

16
xprint.diff
View File

@ -4,10 +4,10 @@ diff -u -r hw/xprint/config/C/print/models.orig/CANONC3200-PS/fonts/Makefile.am
@@ -20,7 +20,6 @@
LubalinGraph-Demi.pmf \
LubalinGraph-DemiOblique.pmf \
NewCenturySchlbk-Bold.pmf \
- NewCenturySchlbk-BoldItalic.pmf \
NewCenturySchlbk-Italic.pmf \
NewCenturySchlbk-Roman.pmf \
NewCentSchlbk-Bold.pmf \
- NewCentSchlbk-BoldItal.pmf \
NewCentSchlbk-Ital.pmf \
NewCentSchlbk-Roman.pmf \
Souvenir-Demi.pmf \
diff -u -r hw/xprint/config/C/print/models.orig/HPLJ4050-PS/fonts/Makefile.am hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
--- hw/xprint/config/C/print/models.orig/HPLJ4050-PS/fonts/Makefile.am 2006-07-31 14:23:10.000000000 +0200
@ -15,8 +15,8 @@ diff -u -r hw/xprint/config/C/print/models.orig/HPLJ4050-PS/fonts/Makefile.am hw
@@ -20,7 +20,6 @@
LubalinGraph-Demi.pmf \
LubalinGraph-DemiOblique.pmf \
NewCenturySchlbk-Bold.pmf \
- NewCenturySchlbk-BoldItalic.pmf \
NewCenturySchlbk-Italic.pmf \
NewCenturySchlbk-Roman.pmf \
NewCentSchlbk-Bold.pmf \
- NewCentSchlbk-BoldItal.pmf \
NewCentSchlbk-Ital.pmf \
NewCentSchlbk-Roman.pmf \
Souvenir-Demi.pmf \