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=56

Browse Source
This commit is contained in:
OBS User unknown 2007-11-19 09:28:13 +00:00 committed by Git OBS Bridge
parent 4521bf8ff9
commit be197b3e18
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mfb_without_xorg.diff Normal file
View File

@ -0,0 +1,11 @@
--- configure.ac.orig 2007-11-18 14:40:43.363103865 +0100
+++ configure.ac 2007-11-18 14:41:10.763089274 +0100
@@ -1659,7 +1659,7 @@
AM_CONDITIONAL(MFB, [test "x$MFB" = xyes])
AM_CONDITIONAL(CFB, [test "x$CFB" = xyes])
AM_CONDITIONAL(AFB, [test "x$AFB" = xyes])
-if test "x$MFB" = xyes -o "x$CFB" = xyes -o "x$AFB" = xyes; then
+if test "x$CFB" = xyes -o "x$AFB" = xyes; then
if test "x$XORG" != xyes; then
AC_MSG_ERROR([legacy fb support requires the Xorg server])
fi

5
xorg-x11-server.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 18 14:14:22 CET 2007 - sndirsch@suse.de
- s390(x): allow mfb build without Xorg server being built
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 15 22:00:47 CET 2007 - sndirsch@suse.de Thu Nov 15 22:00:47 CET 2007 - sndirsch@suse.de

17
xorg-x11-server.spec
View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.3 Version: 7.3
Release: 27 Release: 29
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -89,6 +89,7 @@ Patch81: xserver-1.3.0-xkb-and-loathing.patch
Patch83: ia64linuxPciInit.diff Patch83: ia64linuxPciInit.diff
Patch84: commit-feac075.diff Patch84: commit-feac075.diff
Patch85: commit-29e0e18.diff Patch85: commit-29e0e18.diff
Patch86: mfb_without_xorg.diff
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -204,6 +205,7 @@ popd
%patch83 %patch83
%patch84 -p1 %patch84 -p1
%patch85 -p1 %patch85 -p1
%patch86 -p0
%build %build
pushd xorg-docs-* pushd xorg-docs-*
@ -253,6 +255,7 @@ autoreconf -fi
%ifarch s390 s390x %ifarch s390 s390x
--disable-dri \ --disable-dri \
--disable-xorg \ --disable-xorg \
--enable-mfb \
%else %else
--enable-dri \ --enable-dri \
--enable-xorg \ --enable-xorg \
@ -317,11 +320,11 @@ rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia
%endif %endif
#%if %vnc %if %vnc
#%ifarch s390 s390x %ifarch s390 s390x
#rm $RPM_BUILD_ROOT/mfb.h rm $RPM_BUILD_ROOT/mfb.h
#%endif %endif
#%endif %endif
%clean %clean
rm -rf "$RPM_BUILD_ROOT" rm -rf "$RPM_BUILD_ROOT"
@ -532,6 +535,8 @@ exit 0
/usr/bin/Xvnc /usr/bin/Xvnc
%endif %endif
%changelog %changelog
* Sun Nov 18 2007 - sndirsch@suse.de
- s390(x): allow mfb build without Xorg server being built
* Thu Nov 15 2007 - sndirsch@suse.de * Thu Nov 15 2007 - sndirsch@suse.de
- commit-29e0e18.diff - commit-29e0e18.diff
* Make config file preferred mode override monitor preferred * Make config file preferred mode override monitor preferred