xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 ++
debian/patches/46_export-ramdac-symbols.diff | 78 +++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit a3838910cec0974ac49b35d62cdddd6666d0df2b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 11 01:56:59 2007 +0200
Unfuck ramdac
Add patch to make sure the ramdac symbols are available in Xorg.
diff --git a/debian/changelog b/debian/changelog
index b9dfe03..56a8656 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.3.0.0.dfsg-5) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add 24_hurd_ioperm_fix.diff to fix xf86Enable/DisableIO on Hurd with
recent GNU Mach. Thanks Samuel Thibault!
* Add 06_use_proc_instead_of_sysfs_for_pci_domains.diff since sysfs-based
@@ -13,7 +14,11 @@ xorg-server (2:1.3.0.0.dfsg-5) UNRELEASED; urgency=low
* Fix warning in /etc/init.d/xprint when /usr/lib/X11/fonts does not exist.
Closes: #422352. Thanks Cristian Ionescu-Idbohrn!
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 11 May 2007 02:37:19 +0200
+ [ Julien Cristau ]
+ * Add patch to make sure that the ramdac symbols are present in the server
+ and drivers can use them (closes: #423129).
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 11 May 2007 00:48:11 +0200
xorg-server (2:1.3.0.0.dfsg-4) unstable; urgency=low
diff --git a/debian/patches/46_export-ramdac-symbols.diff b/debian/patches/46_export-ramdac-symbols.diff
new file mode 100644
index 0000000..ad47fd1
--- /dev/null
+++ b/debian/patches/46_export-ramdac-symbols.diff
@@ -0,0 +1,78 @@
+From bccecf97f180966accbc979c28d648f7d1145b36 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 10 May 2007 17:26:49 +0200
+Subject: [PATCH] Export ramdac symbols
+
+The former ramdac module is now built into the server, so its symbols need to
+be explicitly exported to drivers (Debian #423129).
+---
+ hw/xfree86/loader/xf86sym.c | 49 +++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 49 insertions(+), 0 deletions(-)
+
+Index: xorg-server/hw/xfree86/loader/xf86sym.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/loader/xf86sym.c 2007-05-11 01:20:46.000000000 +0200
++++ xorg-server/hw/xfree86/loader/xf86sym.c 2007-05-11 01:37:11.000000000 +0200
+@@ -97,6 +97,11 @@
+ #endif
+ #include "xf86DDC.h"
+ #include "edid.h"
++#include "xf86Cursor.h"
++#include "xf86RamDac.h"
++#include "BT.h"
++#include "IBM.h"
++#include "TI.h"
+
+ #ifndef HAS_GLIBC_SIGSETJMP
+ #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
+@@ -1266,4 +1271,50 @@
+ SYMFUNC(xf86I2CWriteRead)
+ SYMFUNC(xf86I2CWriteVec)
+ SYMFUNC(xf86I2CWriteWord)
++
++ /* ramdac/xf86RamDac.c */
++ SYMFUNC(RamDacCreateInfoRec)
++ SYMFUNC(RamDacHelperCreateInfoRec)
++ SYMFUNC(RamDacDestroyInfoRec)
++ SYMFUNC(RamDacHelperDestroyInfoRec)
++ SYMFUNC(RamDacInit)
++ SYMFUNC(RamDacHandleColormaps)
++ SYMFUNC(RamDacFreeRec)
++ SYMFUNC(RamDacGetHWIndex)
++ SYMVAR(RamDacHWPrivateIndex)
++ SYMVAR(RamDacScreenPrivateIndex)
++
++ /* ramdac/xf86Cursor.c */
++ SYMFUNC(xf86InitCursor)
++ SYMFUNC(xf86CreateCursorInfoRec)
++ SYMFUNC(xf86DestroyCursorInfoRec)
++ SYMFUNC(xf86ForceHWCursor)
++
++ /* ramdac/BT.c */
++ SYMFUNC(BTramdacProbe)
++ SYMFUNC(BTramdacSave)
++ SYMFUNC(BTramdacRestore)
++ SYMFUNC(BTramdacSetBpp)
++
++ /* ramdac/IBM.c */
++ SYMFUNC(IBMramdacProbe)
++ SYMFUNC(IBMramdacSave)
++ SYMFUNC(IBMramdacRestore)
++ SYMFUNC(IBMramdac526SetBpp)
++ SYMFUNC(IBMramdac640SetBpp)
++ SYMFUNC(IBMramdac526CalculateMNPCForClock)
++ SYMFUNC(IBMramdac640CalculateMNPCForClock)
++ SYMFUNC(IBMramdac526HWCursorInit)
++ SYMFUNC(IBMramdac640HWCursorInit)
++ SYMFUNC(IBMramdac526SetBppWeak)
++
++ /* ramdac/TI.c */
++ SYMFUNC(TIramdacCalculateMNPForClock)
++ SYMFUNC(TIramdacProbe)
++ SYMFUNC(TIramdacSave)
++ SYMFUNC(TIramdacRestore)
++ SYMFUNC(TIramdac3026SetBpp)
++ SYMFUNC(TIramdac3030SetBpp)
++ SYMFUNC(TIramdacHWCursorInit)
++ SYMFUNC(TIramdacLoadPalette)
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 096a22e..7c5be43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,6 +19,7 @@
39_alpha_build_flags.patch -p0
44_fedora-xephyr-keysym-madness.diff
45_CVE-2007-2437.diff
+46_export-ramdac-symbols.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
Reply to: