From f7c2329638a1e408ee64e5f3cbdfb26331cb41734b4f763a456c4405f7535363 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 26 Apr 2010 10:07:53 +0000
Subject: [PATCH] Accepting request 38806 from home:zawel1:branches:X11:XOrg

Copy from home:zawel1:branches:X11:XOrg/xorg-x11-server via accept of submit request 38806 revision 8.
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/38806
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=255
---
 dmx-silly.patch      | 12 ++++++++++++
 xorg-x11-server.spec | 18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 dmx-silly.patch

diff --git a/dmx-silly.patch b/dmx-silly.patch
new file mode 100644
index 0000000..ebb040b
--- /dev/null
+++ b/dmx-silly.patch
@@ -0,0 +1,12 @@
+diff -Nru xorg-server-1.8.0.orig/hw/dmx/dmxextension.c xorg-server-1.8.0/hw/dmx/dmxextension.c
+--- xorg-server-1.8.0.orig/hw/dmx/dmxextension.c	2009-11-04 17:25:50.000000000 +0100
++++ xorg-server-1.8.0/hw/dmx/dmxextension.c	2010-04-23 14:31:56.000000000 +0200
+@@ -1160,7 +1160,7 @@
+ 		     len_images);
+ 
+     /* Clean up */
+-    free(len_images);
++    free(images);
+     free(gids);
+     free(glyphs);    
+ }
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 9f02862..433aad6 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -113,6 +113,7 @@ Patch208:       xorg-evdev-conf.diff
 Patch209:       sw_cursor_on_randr.patch
 Patch210:       pio_ia64.diff
 Patch211:       0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
+Patch212:	dmx-silly.patch
 %if %moblin
 Patch300:       moblin-use_preferred_mode_for_all_outputs.diff
 %endif
@@ -236,6 +237,7 @@ popd
 %patch209 -p1
 %patch210 -p1
 %patch211 -p1
+%patch212 -p1
 %if %moblin
 %patch300 -p1
 %endif
@@ -255,7 +257,7 @@ autoreconf -fi
             --enable-xdm-auth-1 \
             --enable-dri \
             --enable-dri2 \
-            --disable-dmx \
+            --enable-dmx \
             --enable-xnest \
             --enable-kdrive \
             --enable-xephyr \
@@ -300,6 +302,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,dri
 install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
 install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/50-nvidia.conf
+gzip -c hw/dmx/Xdmx.man > $RPM_BUILD_ROOT/%{_mandir}/man1/Xdmx.1.gz
 %else
 rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
 %endif
@@ -399,6 +402,19 @@ exit 0
 /usr/bin/Xephyr
 /usr/bin/Xnest
 /usr/bin/Xvfb
+/usr/bin/Xdmx
+/usr/bin/dmxaddinput
+/usr/bin/dmxaddscreen
+/usr/bin/dmxinfo
+/usr/bin/dmxreconfig
+/usr/bin/dmxresize
+/usr/bin/dmxrminput
+/usr/bin/dmxrmscreen
+/usr/bin/dmxtodmx
+/usr/bin/dmxwininfo
+/usr/bin/vdltodmx
+/usr/bin/xdmxconfig
+%{_mandir}/man1/Xdmx.1*
 %{_mandir}/man1/Xephyr.1*
 %{_mandir}/man1/Xnest.1*
 %{_mandir}/man1/Xvfb.1*