X Strike Force SVN commit: rev 621 - in people/daniel: . sdk sdk/debian sdk/debian/patches
Author: daniel
Date: 2003-10-03 01:23:51 -0500 (Fri, 03 Oct 2003)
New Revision: 621
Added:
people/daniel/sdk/
people/daniel/sdk/debian/
people/daniel/sdk/debian/TODO
people/daniel/sdk/debian/patches/000_stolen_from_HEAD_sdk.diff
Removed:
people/daniel/sdk/debian/TODO
Log:
Added p/d/sdk/debian, pulled from branches/4.3.0/sid/debian. I wonder if this
commit will even work.
The SDK patch is old, I know; it's taken from <20030524223633.GA32067@iliana>
(private mail), Sun, 25 May 2003 00:36:33 +0200. Sven is working on a new
patch this weekend.
Copied: people/daniel/sdk/debian (from rev 617, branches/4.3.0/sid/debian)
Deleted: people/daniel/sdk/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2003-10-02 06:49:34 UTC (rev 617)
+++ people/daniel/sdk/debian/TODO 2003-10-03 06:23:51 UTC (rev 621)
@@ -1,201 +0,0 @@
-To-Do List for XFree86 4.3.0 Release to Debian Unstable
--------------------------------------------------------
-
-0pre1v4
--------
-* Update xlibs.shlibs to prepare for package split.
-
--1
---
-
-* Fix this:
-
-# dpkg -i xlibmesa-gl_4.3.0-0pre1v1_powerpc.deb xlibmesa-glu_4.3.0-0pre1v1_powerpc.deb
-dpkg: considering removing xlibmesa3-gl in favour of xlibmesa-gl ...
-dpkg: no, cannot remove xlibmesa3-gl (--auto-deconfigure will help):
- xlibmesa3-glu-dbg depends on xlibmesa3-gl (= 4.2.1-9)
- xlibmesa3-gl is to be removed.
-dpkg: regarding xlibmesa-gl_4.3.0-0pre1v1_powerpc.deb containing xlibmesa-gl:
- xlibmesa-gl conflicts with libgl1
- xlibmesa3-gl provides libgl1 and is installed.
-dpkg: error processing xlibmesa-gl_4.3.0-0pre1v1_powerpc.deb (--install):
- conflicting packages - not installing xlibmesa-gl
-dpkg: regarding xlibmesa-glu_4.3.0-0pre1v1_powerpc.deb containing xlibmesa-glu:
- xlibmesa-glu conflicts with libglu1
- xlibmesa3-glu provides libglu1 and is installed.
-dpkg: error processing xlibmesa-glu_4.3.0-0pre1v1_powerpc.deb (--install):
- conflicting packages - not installing xlibmesa-glu
-
- There are other upgrade problems affecting the xlibmesa* transition.
- Fix them. Test upgrade scenarios from woody (4.1.0-16), 4.2.1-9 and
- 4.2.1-10. The unfortunate -dbg package screwage in -9 makes things
- more complicated.
-
- [The above item may already be fixed.]
-
-* split xlibs* and xbase-clients (one package per shared library;
- xbase-clients should be broken into functional groups probably mostly
- determined by library dependencies; xauth, the Athena clients, and
- libGL-linked clients are all good candidates for splitting)
-* find a way to stop the dpkg conffile prompting madness when moving
- conffiles from xlibs to xlibs-data!
-* Package the driver SDK.
-* ensure packages are at least as functional on the architectures in
- unstable as the 4.2.1 packages are (so that no arch sees a horrendous
- regression);
- + Fix groff bug to get it building on m68k.
- NOTE: This may be machine-specific horkage on one box. If it turns out
- that's the case, let bug #197076 know.
-* Clean up the debian/patches disaster:
-
-Patch forward-port status chart:
-
-Key:
- unchanged: patch applies cleanly without changes
- upstream: patch now exists in upstream archive
- irrelevant: patch rendered irrelevant by upstream archive or other patch
- merged: patch forward-ported (with upstream or irrelevant parts dropped)
-
-trunk/debian/patches file status notes
-000_post421-2003.02.18.diff irrelevant
-000_stolen_from_HEAD.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_ati_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_cyrix_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_neomagic_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_newport_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_nv_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_savage_driver.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_xaw.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_xdm.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_xlib.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_xman.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-000_stolen_from_HEAD_xtt.diff check for stuff stolen from HEAD after xf-4_3_0 was tagged
-001_linux_cf.diff
-001a_damn_cpp_3.3_to_hell.diff
-001b_m68k_haslinuxinput_too.diff
-002_xdm_fixes.diff merged
-003_xfs-fixes.diff
-004_xfree86_cf.diff
-005_rgb.txt_in_etc_X11.diff unchanged
-006_XftConfig_in_correct_place.diff
-007_SECURITY_makedepend_safer.diff
-008_doc_extensions_fix.diff
-009_s3_trio64v2_dx_and_gx_support.diff
-010_linux_apm_vetoed_suspend_fix.diff
-011_chinese_locale_fixups.diff
-012_fix_cyrillic_font_aliases.diff
-013_wacom_wait_longer_for_input.diff
-014_document_grab_key_sequences.diff
-015_lbxproxy_segfault_fix.diff
-016_mga_manpage_updates.diff
-017_xrandr_manpage_fixups.diff merged 041_fix_Xlib_depend_target.diff
-018_r128_dri_lines_points_fix.diff
-019_r128_xv_byteswap_yuy2_uyvy_fix.diff
-020_xkb_symbols_euro_support.diff
-021_startx_hostname_fix.diff
-022_Xaw_StripChart_fix.diff
-023_mga_use_hal_modeinit_workarounds_for_g550.diff
-024_ati_busmaster_vt_switch_hang_fix.diff
-026_tdfx_double_buffering_for_xvideo.diff
-027_abnt2_keycode_fix.diff
-028_buffalo_proctology.diff
-029_xdmcp_Wrap.h_fixes.diff
-030_ship_more_extension_headers.diff
-031_xmessage.diff
-032_ComplexCplusplusProgramTargetNoMan.diff
-033_ICE_subprotocol_reply_fix.diff
-034_neomagic_manpage.diff
-035_fontenc_null_ptr_deref_fix.diff
-036_imake_linux_libc_detection_fix.diff
-037_fix_r128_unresolved_symbols.diff
-039_apploaddir_manpage_fixes.diff
-040_xmodmap_manpage_improvement.diff
-041_fix_Xlib_depend_target.diff
-042_XtSetKeyboardFocus_manpage_fix.diff
-043_XF86VidMode_manpage_fix.diff
-044_XtFindFile_manpage_fix.diff
-045_xconsole_saveLines.diff
-046_piclib_support.diff
-047_fix_xfree86_man_version_string.diff
-048_get_rid_of_xroot_in_manpages.diff
-049_remove_duplicate_XShm_prototype.diff
-050_XF86Config_manpage_fixes.diff
-051_symbols_macintosh_us.diff
-052_Xinerama_headers_include_Xlib_headers.diff
-053_Xlib_fix_lcPrTxt_memory_leak.diff
-054_Cards_fifo_aggressive_fix.diff
-055_de_nodeadkeys_xkb_fix.diff
-056_XftConfig_fixup.diff
-057_iso8859-15_Compose_fix.diff
-058_config_util_manpages.diff
-059_bdftruncate_ucs2any_fixups.diff
-060_install_nonexec_modules.diff
-061_Xserver_manpage_fixes.diff
-062_proxymngr_manpage_fixes.diff
-063_mga_texmode_restore_fix.diff
-065_sis_drm_ioctl_kludge.diff
-066_more_sis_drm_ioctl_kludge.diff
-067_nonexecutable_malloced_mem.diff
-068_riscpc_ioport_fix.diff
-069_r128_driver_pitch_tweak.diff
-070_fbdevhw_device_node_warnings.diff
-072_r128_dma_for_xv_option.diff
-075_conditionalize_xie_headers.diff
-076_xterm_workaround_getpt_lie.diff
-077_man_dir_and_suffix_cleanup.diff
-078_xterm_fix_resize_race.diff
-080_specs_doc_fixes.diff
-081_radeon_mobility_FireGL_7800.diff
-082_r128_and_radeon_vgahw_independence.diff
-083_i810_do_not_reference_undefined_functions.diff
-084_dontvtswitch_option.diff
-085_bigass_imake_manpage_handling_overhaul.diff
-086_xc_programs_manpage_overhaul.diff
-087_ati_driver_message_cleanups.diff
-088_radeon_dpms_fix.diff
-089_fbdev_depth24_support.diff
-090_ati_radeon_9000_support.diff
-091_xdm_do_not_read_from_dev_mem.diff merged 066_xdm_do_not_read_from_dev_mem.diff
-092_ati_radeon_9100.support.diff
-093_SECURITY_xterm_window_title_reporting_fix.diff
-094_SECURITY_xterm_DEC_UDK_sequence_DoS_fix.diff
-096_Xlib_l10n_pt_BR.UTF-8.diff merged
-097_mouse_zaxis_mapping_pushes_up_buttons.diff
-100_sparc_pci_domains.diff
-101_sparc_4m_hw_mult_fix.diff
-103_type6_xkb_support.diff
-150_powerpc_build_nv_driver.diff
-200_alpha_GLX_align_fix.diff
-201_alpha_truetype_gcc_bugfix.diff
-202_saverproto_datatypes.diff
-203_Xpm_wordsize.diff
-311_arm_compiler_h.diff
-312_riscpc_xkb_keycodes.diff
-314_not_all_arm_boxes_run_netbsd.diff
-351_newport_range.diff
-450_ia64_ati_avoid_cpio.diff
-451_ia64_radeon_pagesize.diff
-452_ia64_smart_pci_rom_probe.diff
-453_ia64_static_inline_not_extern_inline.diff
-500_s390_support.diff
-551_sh_staticserver_build_fix.diff
-800_gnu_config.diff
-801_gnu_os-support_Imake.diff
-840_netbsd_bsdLib.rules_fix.diff
-841_netbsd_imake.c_fixes.diff
-842_netbsd_NetBSD.cf_fixes.diff
-843_netbsd_no_shared_OldX_lib.diff unchanged
-844_netbsd_no_kbd_mode_command.diff
-900_debian_config.diff
-901_Wraphelp.c.diff
-902_debian_startx_manpage.diff
-903_debian_system.twmrc.diff
-904_debian_xinitrc.diff
-905_debian_xdm.diff unchanged
-906_debian_xfs.diff
-907_debian_xterm.diff
-908_debian_no_non-free_stuff.diff
-909_debian_XF86Config_to_XF86Config-4.diff
-910_Xserver_RTFF.diff
-
-$Id$
Copied: people/daniel/sdk/debian/TODO (from rev 618, branches/4.3.0/sid/debian/TODO)
Added: people/daniel/sdk/debian/patches/000_stolen_from_HEAD_sdk.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_sdk.diff 2003-10-02 06:49:34 UTC (rev 617)
+++ people/daniel/sdk/debian/patches/000_stolen_from_HEAD_sdk.diff 2003-10-03 06:23:51 UTC (rev 621)
@@ -0,0 +1,418 @@
+Preliminary SDK work by Sven Luther. There has been more work since this; I'm
+just working on an updated patch.
+
+Index: include/extensions/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/include/extensions/Imakefile,v
+retrieving revision 3.54
+diff -u -u -r3.54 Imakefile
+--- xc/include/extensions/Imakefile 2003/04/14 20:37:07 3.54
++++ xc/include/extensions/Imakefile 2003/04/21 12:22:11
+@@ -100,6 +100,8 @@
+ InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+ InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+ InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+ InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
+Index: programs/Xserver/hw/xfree86/common/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/common/Imakefile,v
+retrieving revision 3.148
+diff -u -u -r3.148 Imakefile
+--- xc/programs/Xserver/hw/xfree86/common/Imakefile 2003/02/17 17:06:41 3.148
++++ xc/programs/Xserver/hw/xfree86/common/Imakefile 2003/04/21 12:22:24
+@@ -288,3 +288,5 @@
+ InstallDriverSDKNonExecFile(xf86str.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xf86xv.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xf86xvmc.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(xf86Bus.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(xf86pciBus.h,$(DRIVERSDKINCLUDEDIR))
+Index: programs/Xserver/hw/xfree86/drivers/ati/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v
+retrieving revision 1.45
+diff -u -u -r1.45 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 2003/02/17 17:06:41 1.45
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 2003/04/21 12:22:26
+@@ -207,6 +207,7 @@
+ InstallObjectModule(r128,$(MODULEDIR),drivers)
+ InstallObjectModule(radeon,$(MODULEDIR),drivers)
+
++#if !defined(XF86DriverSDK)
+ #if 0
+ InstallModuleManPage(ati)
+ #endif
+@@ -214,6 +215,7 @@
+ InstallModuleManPage(r128)
+
+ InstallModuleManPage(radeon)
++#endif
+
+ DependTarget()
+
+@@ -332,6 +334,7 @@
+ InstallDriverSDKNonExecFile(radeon_version.h,$(DRIVERSDKDIR)/drivers/ati)
+ InstallDriverSDKNonExecFile(radeon_video.c,$(DRIVERSDKDIR)/drivers/ati)
+ InstallDriverSDKNonExecFile(radeon_common.h,$(DRIVERSDKDIR)/drivers/ati)
++InstallDriverSDKNonExecFile(radeon_accelfuncs.c,$(DRIVERSDKDIR)/drivers/ati)
+
+ InstallDriverSDKObjectModule(ati,$(DRIVERSDKMODULEDIR),drivers)
+ InstallDriverSDKObjectModule(atimisc,$(DRIVERSDKMODULEDIR),drivers)
+Index: programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v
+retrieving revision 1.8
+diff -u -u -r1.8 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile 2003/02/17 17:06:42 1.8
++++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile 2003/04/21 12:22:26
+@@ -43,6 +43,7 @@
+ InstallDriverSDKNonExecFile(cyrix_bank.c,$(DRIVERSDKDIR)/drivers/cyrix)
+ InstallDriverSDKNonExecFile(cyrix_driver.c,$(DRIVERSDKDIR)/drivers/cyrix)
+ InstallDriverSDKNonExecFile(cyrix_helper.c,$(DRIVERSDKDIR)/drivers/cyrix)
++InstallDriverSDKNonExecFile(cyrix_shadow.c,$(DRIVERSDKDIR)/drivers/cyrix)
+
+ InstallDriverSDKObjectModule(cyrix,$(DRIVERSDKMODULEDIR),drivers)
+
+Index: programs/Xserver/hw/xfree86/drivers/i740/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile,v
+retrieving revision 1.10
+diff -u -u -r1.10 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile 2003/02/17 17:06:42 1.10
++++ xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile 2003/04/21 12:22:27
+@@ -47,6 +47,10 @@
+ InstallDriverSDKNonExecFile(i740_io.c,$(DRIVERSDKDIR)/drivers/i740)
+ InstallDriverSDKNonExecFile(i740_macros.h,$(DRIVERSDKDIR)/drivers/i740)
+ InstallDriverSDKNonExecFile(i740_reg.h,$(DRIVERSDKDIR)/drivers/i740)
++InstallDriverSDKNonExecFile(i740_dga.h,$(DRIVERSDKDIR)/drivers/i740)
++InstallDriverSDKNonExecFile(i740_dga.c,$(DRIVERSDKDIR)/drivers/i740)
++InstallDriverSDKNonExecFile(i740_i2c.c,$(DRIVERSDKDIR)/drivers/i740)
++InstallDriverSDKNonExecFile(i740_video.c,$(DRIVERSDKDIR)/drivers/i740)
+
+ InstallDriverSDKObjectModule(i740,$(DRIVERSDKMODULEDIR),drivers)
+
+Index: programs/Xserver/hw/xfree86/drivers/mga/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v
+retrieving revision 1.46
+diff -u -u -r1.46 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 2003/02/17 17:06:42 1.46
++++ xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 2003/04/21 12:22:27
+@@ -68,7 +68,7 @@
+ OBJS = $(MGAOBJS) $(MGAHALOBJS)
+
+ #if defined(XF86DriverSDK)
+-INCLUDES = -I. -I../../include
++INCLUDES = -I. -I../../include $(MGAHALINCLUDES)
+ #else
+ INCLUDES = -I. $(MGAHALINCLUDES) -I$(XF86COMSRC) -I$(XF86OSSRC) \
+ -I$(SERVERSRC)/fb \
+@@ -133,6 +133,20 @@
+ InstallDriverSDKNonExecFile(mga_video.c,$(DRIVERSDKDIR)/drivers/mga)
+ InstallDriverSDKNonExecFile(mga_halmod.c,$(DRIVERSDKDIR)/drivers/mga)
+ InstallDriverSDKNonExecFile(mga_common.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_dripriv.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_dri.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_merge.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_merge.c,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_g450pll.c,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_dh.c,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_esc.c,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_dri.c,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mgareg_flags.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_sarea.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(mga_ucode.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(client.h,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(clientlx.c,$(DRIVERSDKDIR)/drivers/mga)
++InstallDriverSDKNonExecFile(HALlib/binding.h,$(DRIVERSDKDIR)/drivers/mga/HALlib)
+
+ InstallDriverSDKObjectModule(mga,$(DRIVERSDKMODULEDIR),drivers)
+ #if BuildMatroxHal
+Index: programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile,v
+retrieving revision 1.13
+diff -u -u -r1.13 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile 2003/02/17 17:06:43 1.13
++++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile 2003/04/21 12:22:28
+@@ -56,5 +56,7 @@
+ InstallDriverSDKNonExecFile(neo_shadow.c,$(DRIVERSDKDIR)/drivers/neomagic)
+ InstallDriverSDKNonExecFile(neo_macros.h,$(DRIVERSDKDIR)/drivers/neomagic)
+ InstallDriverSDKNonExecFile(neo_reg.h,$(DRIVERSDKDIR)/drivers/neomagic)
++InstallDriverSDKNonExecFile(neo_video.c,$(DRIVERSDKDIR)/drivers/neomagic)
++InstallDriverSDKNonExecFile(neo_video.h,$(DRIVERSDKDIR)/drivers/neomagic)
+
+ InstallDriverSDKObjectModule(neomagic,$(DRIVERSDKMODULEDIR),drivers)
+Index: programs/Xserver/hw/xfree86/drivers/newport/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile,v
+retrieving revision 1.5
+diff -u -u -r1.5 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile 2002/12/10 04:03:00 1.5
++++ xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile 2003/04/21 12:22:28
+@@ -30,9 +30,9 @@
+ ObjectModuleTarget(newport,$(OBJS))
+
+ InstallObjectModule(newport,$(MODULEDIR),drivers)
+-InstallNamedNonExec($(XF86CONFIG),$(XF86CONFIG),$(LIBDIR))
+
+ #if !defined(XF86DriverSDK)
++InstallNamedNonExec($(XF86CONFIG),$(XF86CONFIG),$(LIBDIR))
+ InstallModuleManPage(newport)
+ #endif
+
+@@ -43,6 +43,7 @@
+ InstallDriverSDKNonExecFile(newport_regs.c,$(DRIVERSDKDIR)/drivers/newport)
+ InstallDriverSDKNonExecFile(newport_cmap.c,$(DRIVERSDKDIR)/drivers/newport)
+ InstallDriverSDKNonExecFile(newport_shadow.c,$(DRIVERSDKDIR)/drivers/newport)
++InstallDriverSDKNonExecFile(newport_cursor.c,$(DRIVERSDKDIR)/drivers/newport)
+ InstallDriverSDKNonExecFile(newport_regs.h,$(DRIVERSDKDIR)/drivers/newport)
+ InstallDriverSDKNonExecFile(newport.h,$(DRIVERSDKDIR)/drivers/newport)
+
+Index: programs/Xserver/hw/xfree86/drivers/nsc/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile,v
+retrieving revision 1.6
+diff -u -u -r1.6 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile 2003/02/19 10:10:49 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile 2003/04/21 12:22:28
+@@ -61,7 +61,7 @@
+ nsc_gx2_shadow.o $(I86OBJ) $(STBOBJS) $(DURANGOOBJS)
+
+ #if defined(XF86DriverSDK)
+-INCLUDES = -I. -I../../include
++INCLUDES = -I. -I../../include $(EXTINCLUDES)
+ #else
+ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \
+ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+@@ -138,6 +138,7 @@
+ InstallDriverSDKNonExecFile(gfx/gfx_rndr.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/gfx_rtns.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/gfx_tv.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
++InstallDriverSDKNonExecFile(gfx/gfx_tv.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/gfx_type.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/gfx_vga.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/gfx_vid.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+@@ -155,11 +156,15 @@
+ InstallDriverSDKNonExecFile(gfx/tv_1200.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/tv_fs450.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/tv_fs450.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
++InstallDriverSDKNonExecFile(gfx/tv_fs451.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
++InstallDriverSDKNonExecFile(gfx/tv_geode.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/vga_gu1.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/vid_1200.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
++InstallDriverSDKNonExecFile(gfx/vid_1400.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/vid_5530.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/vid_rdcl.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(gfx/vip_1200.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
++InstallDriverSDKNonExecFile(gfx/vip_1400.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+ InstallDriverSDKNonExecFile(panel/92xx.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/cen9211.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/cen9211.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
+@@ -167,6 +172,8 @@
+ InstallDriverSDKNonExecFile(panel/dora9211.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/drac9210.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/drac9210.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
++InstallDriverSDKNonExecFile(panel/gx2_9211.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
++InstallDriverSDKNonExecFile(panel/gx2_9211.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/panel.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/panel.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
+ InstallDriverSDKNonExecFile(panel/platform.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
+Index: programs/Xserver/hw/xfree86/drivers/s3/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile,v
+retrieving revision 1.10
+diff -u -u -r1.10 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile 2003/02/17 17:06:43 1.10
++++ xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile 2003/04/21 12:22:29
+@@ -46,6 +46,7 @@
+ SpecialCObjectRule(s3_video,$(_NOOP_), -DS3_NEWMMIO)
+
+ InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/s3)
++InstallDriverSDKNonExecFile(newmmio.h,$(DRIVERSDKDIR)/drivers/s3)
+ InstallDriverSDKNonExecFile(s3.h,$(DRIVERSDKDIR)/drivers/s3)
+ InstallDriverSDKNonExecFile(s3_reg.h,$(DRIVERSDKDIR)/drivers/s3)
+ InstallDriverSDKNonExecFile(s3_driver.c,$(DRIVERSDKDIR)/drivers/s3)
+@@ -57,4 +58,3 @@
+ InstallDriverSDKNonExecFile(s3_Trio64DAC.c,$(DRIVERSDKDIR)/drivers/s3)
+ InstallDriverSDKNonExecFile(s3_IBMRGB.c,$(DRIVERSDKDIR)/drivers/s3)
+ InstallDriverSDKNonExecFile(s3_Ti.c,$(DRIVERSDKDIR)/drivers/s3)
+-
+Index: programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile,v
+retrieving revision 1.21
+diff -u -u -r1.21 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile 2003/02/17 17:06:43 1.21
++++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile 2003/04/21 12:22:29
+@@ -63,5 +63,6 @@
+ InstallDriverSDKNonExecFile(s3v_macros.h,$(DRIVERSDKDIR)/drivers/s3virge)
+ InstallDriverSDKNonExecFile(s3v_rop.h,$(DRIVERSDKDIR)/drivers/s3virge)
+ InstallDriverSDKNonExecFile(s3v_shadow.c,$(DRIVERSDKDIR)/drivers/s3virge)
++InstallDriverSDKNonExecFile(s3v_xv.c,$(DRIVERSDKDIR)/drivers/s3virge)
+
+ InstallDriverSDKObjectModule(s3virge,$(DRIVERSDKMODULEDIR),drivers)
+Index: programs/Xserver/hw/xfree86/drivers/sis/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v
+retrieving revision 1.31
+diff -u -u -r1.31 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile 2003/02/17 17:06:44 1.31
++++ xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile 2003/04/21 12:22:30
+@@ -73,6 +73,7 @@
+ InstallDriverSDKNonExecFile(sis300_accel.h,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(sis310_accel.c,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(sis310_accel.h,$(DRIVERSDKDIR)/drivers/sis)
++InstallDriverSDKNonExecFile(sis_accel.h,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(init.c,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(init.h,$(DRIVERSDKDIR)/drivers/sis)
+@@ -103,5 +104,8 @@
+ InstallDriverSDKNonExecFile(sis_vga.c,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(sis_video.c,$(DRIVERSDKDIR)/drivers/sis)
+ InstallDriverSDKNonExecFile(sis6326_video.c,$(DRIVERSDKDIR)/drivers/sis)
++InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis)
++InstallDriverSDKNonExecFile(vgatypes.h,$(DRIVERSDKDIR)/drivers/sis)
++InstallDriverSDKNonExecFile(vstruct.h,$(DRIVERSDKDIR)/drivers/sis)
+
+ InstallDriverSDKObjectModule(sis,$(DRIVERSDKMODULEDIR),drivers)
+Index: programs/Xserver/hw/xfree86/drivers/trident/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile,v
+retrieving revision 1.32
+diff -u -u -r1.32 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile 2003/04/15 22:13:43 1.32
++++ xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile 2003/04/21 12:22:30
+@@ -62,5 +62,6 @@
+ InstallDriverSDKNonExecFile(tridentramdac.c,$(DRIVERSDKDIR)/drivers/trident)
+ InstallDriverSDKNonExecFile(trident_video.c,$(DRIVERSDKDIR)/drivers/trident)
+ InstallDriverSDKNonExecFile(tvga_dac.c,$(DRIVERSDKDIR)/drivers/trident)
++InstallDriverSDKNonExecFile(xp_accel.c,$(DRIVERSDKDIR)/drivers/trident)
+
+ InstallDriverSDKObjectModule(trident,$(DRIVERSDKMODULEDIR),drivers)
+Index: programs/Xserver/hw/xfree86/drivers/vesa/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile,v
+retrieving revision 1.6
+diff -u -u -r1.6 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile 2003/02/17 17:06:44 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile 2003/04/21 12:22:31
+@@ -40,6 +40,7 @@
+
+ InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vesa)
+ InstallDriverSDKNonExecFile(vesa.c,$(DRIVERSDKDIR)/drivers/vesa)
++InstallDriverSDKNonExecFile(vesa.h,$(DRIVERSDKDIR)/drivers/vesa)
+
+ InstallDriverSDKObjectModule(vesa,$(DRIVERSDKMODULEDIR),drivers)
+
+Index: programs/Xserver/hw/xfree86/drivers/vmware/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile,v
+retrieving revision 1.6
+diff -u -u -r1.6 Imakefile
+--- xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile 2003/02/17 17:06:45 1.6
++++ xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile 2003/04/21 12:22:31
+@@ -43,5 +43,20 @@
+ DependTarget()
+
+ InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(vmware.c,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(vmwarecurs.c,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(vmwarexaa.c,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(guest_os.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(includeCheck.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(svga_limits.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(svga_reg.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(svga_struct.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(vm_basic_types.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(vm_device_version.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(vmware.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(bits2pixels.c,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(bits2pixels.h,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(offscreen_manager.c,$(DRIVERSDKDIR)/drivers/vmware)
++InstallDriverSDKNonExecFile(offscreen_manager.h,$(DRIVERSDKDIR)/drivers/vmware)
+
+ InstallDriverSDKObjectModule(vmware,$(DRIVERSDKMODULEDIR),drivers)
+Index: programs/Xserver/hw/xfree86/os-support/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v
+retrieving revision 3.56
+diff -u -u -r3.56 Imakefile
+--- xc/programs/Xserver/hw/xfree86/os-support/Imakefile 2003/02/17 17:06:45 3.56
++++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile 2003/04/21 12:22:33
+@@ -119,3 +119,5 @@
+ InstallDriverSDKNonExecFile(xf86_ansic.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xf86_libc.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xf86drm.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(xf86drmCompat.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(assyntax.h,$(DRIVERSDKINCLUDEDIR))
+Index: programs/Xserver/hw/xfree86/vbe/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/vbe/Imakefile,v
+retrieving revision 1.1
+diff -u -u -r1.1 Imakefile
+--- xc/programs/Xserver/hw/xfree86/vbe/Imakefile 2003/02/17 17:06:45 1.1
++++ xc/programs/Xserver/hw/xfree86/vbe/Imakefile 2003/04/21 12:22:35
+@@ -33,4 +33,5 @@
+ InstallDriverSDKLibraryModule(vbe,$(DRIVERSDKMODULEDIR),.)
+
+ InstallDriverSDKNonExecFile(vbe.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(vbeModes.h,$(DRIVERSDKINCLUDEDIR))
+
+Index: programs/Xserver/mi/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/mi/Imakefile,v
+retrieving revision 3.34
+diff -u -u -r3.34 Imakefile
+--- xc/programs/Xserver/mi/Imakefile 2002/05/22 21:38:31 3.34
++++ xc/programs/Xserver/mi/Imakefile 2003/04/21 12:22:38
+@@ -85,3 +85,4 @@
+ InstallDriverSDKNonExecFile(mipointer.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(mipointrst.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(mizerarc.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(micoord.h,$(DRIVERSDKINCLUDEDIR))
+Index: programs/Xserver/render/Imakefile
+===================================================================
+RCS file: /home/x-cvs/xc/programs/Xserver/render/Imakefile,v
+retrieving revision 1.10
+diff -u -u -r1.10 Imakefile
+--- xc/programs/Xserver/render/Imakefile 2002/11/23 02:38:15 1.10
++++ xc/programs/Xserver/render/Imakefile 2003/04/21 12:22:39
+@@ -36,3 +36,9 @@
+ NormalLintTarget($(SRCS))
+
+ DependTarget()
++
++InstallDriverSDKNonExecFile(glyphstr.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(mipict.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(picture.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(picturestr.h,$(DRIVERSDKINCLUDEDIR))
++
+--- xc/lib/GL/mesa/src/drv/i830/Imakefile.orig 2003-05-23 17:50:02.000000000 +0200
++++ xc/lib/GL/mesa/src/drv/i830/Imakefile 2003-05-23 17:51:57.000000000 +0200
+@@ -75,3 +75,15 @@
+
+ DependTarget()
+
++InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_3d_reg.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_context.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_debug.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_ioctl.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_screen.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_span.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_state.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_tex.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_tris.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++InstallDriverSDKNonExecFile(i830_vb.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
++
+--- xc/programs/Xserver/Xext/Imakefile.orig 2003-05-23 23:38:15.000000000 +0200
++++ xc/programs/Xserver/Xext/Imakefile 2003-05-23 23:38:42.000000000 +0200
+@@ -170,3 +170,4 @@
+
+ InstallDriverSDKNonExecFile(dgaproc.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR))
++InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR))
Reply to: