diff --git a/commit-a18551c.diff b/commit-a18551c.diff deleted file mode 100644 index 405fe94..0000000 --- a/commit-a18551c.diff +++ /dev/null @@ -1,81 +0,0 @@ -commit a18551cad1bf88b30d8466859509fb1fcfd1f2d6 -Author: Adam Jackson -Date: Wed Jul 2 11:25:50 2008 -0400 - - Fix GLX in Xvfb and kdrive. - (cherry picked from commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9) - -diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am -index 81d3d69..7a56d34 100644 ---- a/hw/kdrive/ephyr/Makefile.am -+++ b/hw/kdrive/ephyr/Makefile.am -@@ -85,5 +85,7 @@ Xephyr_DEPENDENCIES = \ - $(LIBXEPHYR_HOSTDRI) \ - @KDRIVE_LOCAL_LIBS@ - -+Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+ - relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) -diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am -index 09d179e..76ed9fc 100644 ---- a/hw/kdrive/fake/Makefile.am -+++ b/hw/kdrive/fake/Makefile.am -@@ -21,6 +21,8 @@ Xfake_LDADD = \ - @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ - -+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+ - Xfake_DEPENDENCIES = \ - libfake.a \ - @KDRIVE_LOCAL_LIBS@ -diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am -index 420855b..cb12928 100644 ---- a/hw/kdrive/fbdev/Makefile.am -+++ b/hw/kdrive/fbdev/Makefile.am -@@ -22,6 +22,8 @@ Xfbdev_DEPENDENCIES = \ - libfbdev.a \ - $(KDRIVE_PURE_LIBS) - -+Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+ - relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) - endif -diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am -index fe9309e..0973cb4 100644 ---- a/hw/kdrive/sdl/Makefile.am -+++ b/hw/kdrive/sdl/Makefile.am -@@ -13,5 +13,7 @@ Xsdl_LDADD = \ - - Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ - -+Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+ - relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) -diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am -index ac50d2b..4225dcf 100644 ---- a/hw/kdrive/vesa/Makefile.am -+++ b/hw/kdrive/vesa/Makefile.am -@@ -27,5 +27,7 @@ Xvesa_DEPENDENCIES = \ - libvesa.a \ - @KDRIVE_LOCAL_LIBS@ - -+Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+ - relink: - rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) -diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am -index 9ceeccc..a4a120a 100644 ---- a/hw/vfb/Makefile.am -+++ b/hw/vfb/Makefile.am -@@ -26,6 +26,7 @@ XVFB_LIBS = \ - - Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) - Xvfb_DEPENDENCIES = $(XVFB_LIBS) -+Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - - # Man page - include $(top_srcdir)/cpprules.in diff --git a/exa-greedy.diff b/exa-greedy.diff new file mode 100644 index 0000000..14991ac --- /dev/null +++ b/exa-greedy.diff @@ -0,0 +1,30 @@ +diff --git a/exa/exa_migration.c b/exa/exa_migration.c +index 3c79f68..1332f42 100644 +--- a/exa/exa_migration.c ++++ b/exa/exa_migration.c +@@ -468,7 +503,11 @@ exaMigrateTowardFb (ExaMigrationPtr migrate) + exaDoMoveInPixmap(migrate); + } + +- ExaOffscreenMarkUsed (pPixmap); ++ if (exaPixmapIsOffscreen(pPixmap)) { ++ exaCopyDirtyToFb (migrate); ++ ExaOffscreenMarkUsed (pPixmap); ++ } else ++ exaCopyDirtyToSys (migrate); + } + + /** +@@ -501,6 +540,12 @@ exaMigrateTowardSys (ExaMigrationPtr migrate) + + if (pExaPixmap->score <= EXA_PIXMAP_SCORE_MOVE_OUT && pExaPixmap->area) + exaDoMoveOutPixmap(migrate); ++ ++ if (exaPixmapIsOffscreen(pPixmap)) { ++ exaCopyDirtyToFb (migrate); ++ ExaOffscreenMarkUsed (pPixmap); ++ } else ++ exaCopyDirtyToSys (migrate); + } + + /** diff --git a/xorg-server-1.4.99.905.tar.bz2 b/xorg-server-1.4.99.905.tar.bz2 deleted file mode 100644 index cceb74c..0000000 --- a/xorg-server-1.4.99.905.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b2e2fdaf83f803157a54e2314a8ae1e8ef5dc3db00e5b6b19f0cfe5da2f2d53 -size 5631334 diff --git a/xorg-server-1.4.99.906.tar.bz2 b/xorg-server-1.4.99.906.tar.bz2 new file mode 100644 index 0000000..65eed19 --- /dev/null +++ b/xorg-server-1.4.99.906.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88d937407f1fa88e959fe787475cdae15941f6c7402102eb08e1a208fba220cd +size 5628932 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 91a134a..d4f6f0b 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jul 24 12:45:16 CEST 2008 - sndirsch@suse.de + +- xorg-server 1.4.99.906 +- obsoletes commit-a18551c.diff + +------------------------------------------------------------------- +Tue Jul 22 11:17:44 CEST 2008 - sndirsch@suse.de + +- exa-greedy.diff + * Make sure exaMigrateTowardFb/Sys end up calling exaCopyDirty + (bfo #16773) + ------------------------------------------------------------------- Fri Jul 18 17:19:08 CEST 2008 - schwab@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index fe302ca..3a4d5a2 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -12,7 +12,7 @@ Name: xorg-x11-server -%define dirsuffix 1.4.99.905 +%define dirsuffix 1.4.99.906 %define fglrx_driver_hack 0 %define vnc 1 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-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 @@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 123 +Release: 127 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -88,9 +88,9 @@ Patch109: events.diff Patch112: fix-dpi-values.diff Patch113: no-return-in-nonvoid-function.diff Patch114: 64bit-portability-issue.diff -Patch115: commit-a18551c.diff Patch116: ppc.diff Patch117: acpi-warning.diff +Patch118: exa-greedy.diff %description This package contains the X.Org Server. @@ -204,11 +204,11 @@ popd %patch112 -p0 %patch113 -p0 %patch114 -p0 -%patch115 -p1 %ifarch ppc ppc64 %patch116 -p0 %endif %patch117 +%patch118 -p1 %build pushd xorg-docs-* @@ -257,12 +257,11 @@ autoreconf -fi --enable-lbx \ --enable-xdmcp \ --enable-xdm-auth-1 \ -%ifarch s390 s390x - --disable-dri \ - --disable-xorg \ -%else --enable-dri \ --disable-dri2 \ +%ifarch s390 s390x + --disable-xorg \ +%else --enable-xorg \ %endif --enable-dmx \ @@ -523,6 +522,13 @@ exit 0 %endif %changelog +* Thu Jul 24 2008 sndirsch@suse.de +- xorg-server 1.4.99.906 +- obsoletes commit-a18551c.diff +* Tue Jul 22 2008 sndirsch@suse.de +- exa-greedy.diff + * Make sure exaMigrateTowardFb/Sys end up calling exaCopyDirty + (bfo #16773) * Fri Jul 18 2008 schwab@suse.de - Kill useless warning. * Mon Jul 14 2008 sndirsch@suse.de