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

p_ppc_domain_workaround.diff

@@ -1,13 +0,0 @@
---- hw/xfree86/os-support/bus/linuxPci.c.orig	2008-04-10 20:58:00.000000000 +0200
-+++ hw/xfree86/os-support/bus/linuxPci.c	2008-06-16 18:12:32.000000000 +0200
-@@ -133,6 +133,10 @@ linuxPciOpenFile(struct pci_device *dev,
-     struct stat	ignored;
-     static int is26 = -1;
- 
-+#if __PPC
-+    is26 = 0;
-+#endif
-+
-     if (dev == NULL) {
- 	return -1;
-     }

ppc.diff

@@ -1,44 +0,0 @@
---- configure.ac.orig	2008-07-11 16:55:37.000000000 +0200
-+++ configure.ac	2008-07-11 16:56:14.000000000 +0200
-@@ -1202,19 +1202,6 @@
- AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
- 
- XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
--AC_DEFINE_UNQUOTED(_X_BYTE_ORDER,[$ENDIAN],[Endian order])
--AH_VERBATIM([X_BYTE_ORDER],[
--/* Deal with multiple architecture compiles on Mac OS X */
--#ifndef __APPLE_CC__
--#define X_BYTE_ORDER _X_BYTE_ORDER
--#else
--#ifdef __BIG_ENDIAN__
--#define X_BYTE_ORDER X_BIG_ENDIAN
--#else
--#define X_BYTE_ORDER X_LITTLE_ENDIAN
--#endif
--#endif
--])
- 
- dnl ---------------------------------------------------------------------------
- dnl DDX section.
---- include/dix-config.h.in.orig	2008-07-11 16:53:45.000000000 +0200
-+++ include/dix-config.h.in	2008-07-11 16:55:04.000000000 +0200
-@@ -449,7 +449,7 @@
- #undef XVENDORNAME
- 
- /* Endian order */
--#undef _X_BYTE_ORDER
-+#define _X_BYTE_ORDER X_BIG_ENDIAN
- /* Deal with multiple architecture compiles on Mac OS X */
- #ifndef __APPLE_CC__
- #define X_BYTE_ORDER _X_BYTE_ORDER
---- include/xorg-server.h.in.orig	2008-07-14 13:33:31.611540083 +0000
-+++ include/xorg-server.h.in	2008-07-14 13:33:48.533753525 +0000
-@@ -179,7 +179,7 @@
- #undef XVENDORNAME
- 
- /* Endian order */
--#undef _X_BYTE_ORDER
-+#define _X_BYTE_ORDER X_BIG_ENDIAN
- /* Deal with multiple architecture compiles on Mac OS X */
- #ifndef __APPLE_CC__
- #define X_BYTE_ORDER _X_BYTE_ORDER

xorg-x11-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 27 18:28:43 CET 2008 - sndirsch@suse.de
+
+- build and install libxf86config + header files also on s390(x)
+  (bnc #432738)
+
+-------------------------------------------------------------------
+Mon Oct 27 17:28:36 CET 2008 - sndirsch@suse.de
+
+- removed p_ppc_domain_workaround.diff/ppc.diff to fix Xserver
+  start on ppc (bnc #437695)
+
 -------------------------------------------------------------------
 Sat Oct 25 13:46:03 CEST 2008 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -29,7 +29,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        10
+Release:        11
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -65,7 +65,6 @@ Patch22:        disable-root-xorg_conf.diff
 Patch23:        disable-fbblt-opt.diff
 Patch27:        mouse.diff
 Patch29:        xephyr.diff
-Patch30:        p_ppc_domain_workaround.diff
 Patch32:        acpi_events.diff
 Patch34:        p_pci-off-by-one.diff.ia64
 Patch36:        libdrm.diff
@@ -96,7 +95,6 @@ Patch109:       events.diff
 Patch112:       fix-dpi-values.diff
 Patch113:       no-return-in-nonvoid-function.diff
 Patch114:       64bit-portability-issue.diff
-Patch116:       ppc.diff
 Patch117:       acpi-warning.diff
 Patch118:       exa-greedy.diff
 Patch120:       dga_cleanup.diff
@@ -121,8 +119,6 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
 
 
 
-%ifnarch s390 s390x
-
 %package sdk
 License:        X11/MIT
 Summary:        X.Org Server SDK.
@@ -137,7 +133,6 @@ This package contains the X.Org Server SDK.
 
 
 
-%endif
 %if %vnc
 
 %package -n xorg-x11-Xvnc
@@ -180,7 +175,6 @@ popd
 %patch27
 %patch29
 ### Bug 197572: X.Org PCI/IA64 patches
-%patch30
 %patch32 -p1
 ### FIXME
 #%patch34 -p0
@@ -215,9 +209,6 @@ popd
 %patch112 -p0
 %patch113 -p0
 %patch114 -p0
-%ifarch ppc ppc64
-%patch116 -p0
-%endif
 %patch117
 %patch118 -p1
 %patch120 -p1
@@ -251,11 +242,7 @@ autoreconf -fi
             --libdir=%{_libdir} \
             --mandir=%{_mandir} \
             --enable-builddocs \
-%ifarch s390 s390x
-            --disable-install-libxf86config \
-%else
             --enable-install-libxf86config \
-%endif
 %ifarch %EXPERIMENTAL
             --enable-glx-tls \
             --enable-multibuffer \
@@ -345,6 +332,13 @@ EOF
 %endif
 %ifarch s390 s390x
 rm $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig/*.pc
+make -C hw/xfree86/parser
+mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \
+         $RPM_BUILD_ROOT//usr/%{_lib}
+install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
+         $RPM_BUILD_ROOT/usr/include/xorg
+install -m 644 hw/xfree86/parser/libxf86config.a \
+         $RPM_BUILD_ROOT//usr/%{_lib}
 %endif
 
 %clean
@@ -431,12 +425,10 @@ if false; then
   %{insserv_cleanup}
 fi
 exit 0
-%ifnarch s390 s390x
 
 %pre sdk
 test -L usr/include/X11 && rm usr/include/X11
 exit 0
-%endif
 
 %files
 %defattr(-,root,root)
@@ -519,12 +511,12 @@ exit 0
 %{_mandir}/man1/Xdmx.1*
 %{_mandir}/man1/Xnest.1*
 %{_mandir}/man1/Xvfb.1*
-%ifnarch s390 s390x
 
 %files sdk
 %defattr(-,root,root)
 /usr/include/xorg/
 /usr/%{_lib}/*.a
+%ifnarch s390 s390x
 /usr/%{_lib}/pkgconfig/*.pc
 /usr/share/aclocal/*.m4
 %endif
@@ -537,6 +529,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 27 2008 sndirsch@suse.de
+- build and install libxf86config + header files also on s390(x)
+  (bnc #432738)
+* Mon Oct 27 2008 sndirsch@suse.de
+- removed p_ppc_domain_workaround.diff/ppc.diff to fix Xserver
+  start on ppc (bnc #437695)
 * Sat Oct 25 2008 sndirsch@suse.de
 - xorg-server-xf4vnc-busyloop.diff
   * prevent Xvnc from busylooping when client disconnects
@@ -654,7 +652,7 @@ exit 0
   /usr/lib/dri/swrast_dri.so: undefined symbol:
   _glapi_add_dispatch". This is fixed now.
 - removed no longer appliable patch 'p_xf86Mode.diff'
-* Sat Jul 05 2008 sndirsch@suse.de
+* Fri Jul 04 2008 sndirsch@suse.de
 - xorg-server-1.4.99.905
   * obsolete patches
     - XAANoOffscreenPixmaps.diff
@@ -697,7 +695,7 @@ exit 0
   * CVE-2008-1377 - RECORD and Security extensions memory corruption
   * CVE-2008-1379 - MIT-SHM arbitrary memory read
 - obsoletes bfo-bug15222.diff
-* Wed Jun 11 2008 sndirsch@suse.de
+* Tue Jun 10 2008 sndirsch@suse.de
 - xorg-server 1.4.1
   * Contains a few security and input fixes, some memory leak
   fixes, and a few misc bits.
@@ -769,7 +767,7 @@ exit 0
 - update to Mesa bugfix release 7.0.3 (final) sources
 * Wed Apr 02 2008 sndirsch@suse.de
 - update to Mesa bugfix release 7.0.3 RC3 sources
-* Tue Apr 01 2008 sndirsch@suse.de
+* Mon Mar 31 2008 sndirsch@suse.de
 - confine_to_shape.diff
   * fixes XGrabPointer's confine_to with shaped windows (bnc #62146)
 * Thu Mar 20 2008 sndirsch@suse.de
@@ -842,7 +840,7 @@ exit 0
   * CVE-2008-0006 - PCF Font parser buffer overflow.
 * Thu Dec 13 2007 sndirsch@suse.de
 - xorg-server 1.4.0.90 (prerelease of 1.4.1)
-* Sat Dec 01 2007 sndirsch@suse.de
+* Fri Nov 30 2007 sndirsch@suse.de
 - pixman.diff
   * fixed include path for pixman.h
 * Thu Nov 29 2007 sndirsch@suse.de
@@ -863,7 +861,7 @@ exit 0
 - pixman.diff no longer required
 * Sun Nov 18 2007 sndirsch@suse.de
 - s390(x): allow mfb build without Xorg server being built
-* Fri Nov 16 2007 sndirsch@suse.de
+* Thu Nov 15 2007 sndirsch@suse.de
 - commit-29e0e18.diff
   * Make config file preferred mode override monitor preferred
   mode.
@@ -1049,10 +1047,10 @@ exit 0
 - disabled build of Xprt
 - moved Xdmx, Xephyr, Xnest and Xvfb to new subpackage
   xorg-x11-server-extra
-* Thu May 03 2007 sndirsch@suse.de
+* Wed May 02 2007 sndirsch@suse.de
 - commit-c09e68c:
   * Paper over a crash at exit during GLX teardown
-* Tue May 01 2007 sndirsch@suse.de
+* Mon Apr 30 2007 sndirsch@suse.de
 - updated to Mesa 6.5.3 sources
 - obsoletes the following patches:
   * bug-211314_mesa-destroy_buffers.diff
@@ -1144,7 +1142,7 @@ exit 0
 * Thu Apr 05 2007 sndirsch@suse.de
 - bug-243978_xcmisc.diff:
   * mem corruption in ProcXCMiscGetXIDList (CVE-2007-1003, Bug #243978)
-* Thu Apr 05 2007 sndirsch@suse.de
+* Wed Apr 04 2007 sndirsch@suse.de
 -  bug-211314_mesa-refcount-memleak-fixes.diff:
   * Fix for memleaks and refount bugs (Bug #211314)
 * Fri Mar 30 2007 sndirsch@suse.de
@@ -1185,13 +1183,13 @@ exit 0
   or DirectColor.
   * Add per-drawable Xv colour key helper function.
   * Bump video driver ABI version to 1.2.
-* Tue Mar 20 2007 sndirsch@suse.de
+* Mon Mar 19 2007 sndirsch@suse.de
 - no longer apply bug-211314_mesa-context.diff,
   bug-211314_p_drawable_privclean.diff (Bug #211314, comment #114)
 - added different Mesa patches (Bug #211314, comments #114/#115)
 * Thu Mar 15 2007 schwab@suse.de
 - Remove bug197190-ia64.diff, fix x86emu instead.
-* Thu Mar 15 2007 sndirsch@suse.de
+* 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.
@@ -1292,7 +1290,7 @@ exit 0
 * Wed Jan 17 2007 sndirsch@suse.de
 - bug-211314_mesa-context.diff:
   * fixes Xserver crash in software rendering fallback (Bug #211314)
-* Wed Jan 17 2007 sndirsch@suse.de
+* Tue Jan 16 2007 sndirsch@suse.de
 - 0018-vnc-support.txt.diff
   * fixed unresolved symbols vncRandomBytes/deskey in VNC module
   (terminated Xserver when client connected)
@@ -1328,7 +1326,7 @@ exit 0
   * hopefully fixes AIGLX issues (X.Org Bug #8991)
 * Fri Dec 08 2006 sndirsch@suse.de
 - another 64bit warning fix
-* Sun Dec 03 2006 sndirsch@suse.de
+* Sat Dec 02 2006 sndirsch@suse.de
 - X.Org 7.2RC3 release
   * Add a -showDefaultModulePath option.
   * Add a -showDefaultLibPath option.
@@ -1360,7 +1358,7 @@ exit 0
 - acpi_events.diff:
   * distinguish between general and input devices also for APM
   (Bug #197858)
-* Wed Nov 15 2006 sndirsch@suse.de
+* Tue Nov 14 2006 sndirsch@suse.de
 - removed /etc/X11/Xsession.d/92xprint-xpserverlist (Bug #220733)
 * Tue Nov 14 2006 sndirsch@suse.de
 - mouse-fix.diff:
@@ -1479,7 +1477,7 @@ exit 0
   * fixes warning for undefined behaviour
 * Tue Oct 17 2006 aj@suse.de
 - Own /etc/X11/Xsession.d directory.
-* Tue Oct 17 2006 aj@suse.de
+* Mon Oct 16 2006 aj@suse.de
 - Use /etc/X11/Xsession.d.
 * Sat Oct 14 2006 sndirsch@suse.de
 - updated to X.Org 7.2RC1
@@ -1552,7 +1550,7 @@ exit 0
    --disable-xorg
 - changed os-name to "openSUSE" instead of "Linux" before
 - fake release version for fglrx driver :-(
-* Fri Aug 18 2006 sndirsch@suse.de
+* Thu Aug 17 2006 sndirsch@suse.de
 - xinerama-sig11.diff:
   * prevents Xserver Sig11 with broken Xinerama config (Bug #135002)
 * Tue Aug 15 2006 sndirsch@suse.de
@@ -1606,7 +1604,7 @@ exit 0
   (SLED10 Blocker Bugs #180535, #170991, #158806)
 - p_ia64-console.diff:
   * fixes MCA after start of second Xserver (Bug #177011)
-* Sun Aug 06 2006 sndirsch@suse.de
+* Sat Aug 05 2006 sndirsch@suse.de
 - p_mouse_misc.diff:
   * fix X server crashes with synaptics driver (Bug #61702)
 - pu_fixes.diff
@@ -1624,7 +1622,7 @@ exit 0
 - add /var/X11R6/bin directory for now (Bug #197188)
 * Wed Aug 02 2006 sndirsch@suse.de
 - fix setup line
-* Tue Aug 01 2006 sndirsch@suse.de
+* Mon Jul 31 2006 sndirsch@suse.de
 - fixed fatal compiler warnings
 * Mon Jul 31 2006 sndirsch@suse.de
 - always (and only) patch xorg.conf if necessary