Hello community, here is the log from the commit of package xorg-x11-server checked in at Mon Nov 19 10:28:12 CET 2007. -------- --- xorg-x11-server/xorg-x11-server.changes 2007-11-15 22:06:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-11-18 14:38:39.476290000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 18 14:14:22 CET 2007 - sndirsch@suse.de + +- s390(x): allow mfb build without Xorg server being built + +------------------------------------------------------------------- New: ---- mfb_without_xorg.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.W22399/_old 2007-11-19 10:28:02.000000000 +0100 +++ /var/tmp/diff_new_pack.W22399/_new 2007-11-19 10:28:02.000000000 +0100 @@ -21,7 +21,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 27 +Release: 29 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -89,6 +89,7 @@ Patch83: ia64linuxPciInit.diff Patch84: commit-feac075.diff Patch85: commit-29e0e18.diff +Patch86: mfb_without_xorg.diff %description This package contains the X.Org Server. @@ -204,6 +205,7 @@ %patch83 %patch84 -p1 %patch85 -p1 +%patch86 -p0 %build pushd xorg-docs-* @@ -253,6 +255,7 @@ %ifarch s390 s390x --disable-dri \ --disable-xorg \ + --enable-mfb \ %else --enable-dri \ --enable-xorg \ @@ -317,11 +320,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia %endif -#%if %vnc -#%ifarch s390 s390x -#rm $RPM_BUILD_ROOT/mfb.h -#%endif -#%endif +%if %vnc +%ifarch s390 s390x +rm $RPM_BUILD_ROOT/mfb.h +%endif +%endif %clean rm -rf "$RPM_BUILD_ROOT" @@ -532,6 +535,8 @@ /usr/bin/Xvnc %endif %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 - commit-29e0e18.diff * Make config file preferred mode override monitor preferred ++++++ mfb_without_xorg.diff ++++++ --- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org