X Strike Force XFree86 SVN commit: r1308 - in trunk/debian: . patches
Author: fabbione
Date: 2004-04-23 08:02:56 -0500 (Fri, 23 Apr 2004)
New Revision: 1308
Added:
trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff
Modified:
trunk/debian/changelog
Log:
Add patch #913 to remove references to object code files inside the source
tree and be able to build again. Patch is debian specific (as per
debian/README)
Problem discovered building from source on i386.
Fix to the FTBFS tested building from source on i386.
Unable to test the fix on affect hardware (fabbione doesn't have these cards).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-23 11:27:55 UTC (rev 1307)
+++ trunk/debian/changelog 2004-04-23 13:02:56 UTC (rev 1308)
@@ -4,13 +4,12 @@
* Re-generate .orig tar archive to eliminate files containing object code
with no corresponding source (none of which are actually needed or used by
- XFree86 at build or run time). Add these files to the prune-non-free
- script. Document these DFSG violations in copyright file. Update patch
- #025 to stop patching one of the affected files (part of the kernel DRM
- sources, so again, it's not used by XFree86 as built by Debian). Update
- MANIFEST and xserver-xfree86.install files for alpha, hurd-i386, i386,
- ia64 and sparc accordingly. Thanks to Nathanael Nerode for his assistance
- with this issue. (Closes: #242865)
+ XFree86 at run time). Add these files to the prune-non-free script.
+ Update patch #025 to stop patching one of the affected files and add patch
+ #913 to remove all references to the affected files inside the code
+ required to build. Update MANIFEST and xserver-xfree86.install files for
+ alpha, hurd-i386, i386, ia64 and sparc accordingly. Thanks to Nathanael
+ Nerode for his assistance with this issue. (Closes: #242865)
* The tar achive within the .orig tar archive (stored this way due to the
requirements of dbs) has been re-packed using gzip instead of bzip2. This
Added: trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff
===================================================================
--- trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff 2004-04-23 11:27:55 UTC (rev 1307)
+++ trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff 2004-04-23 13:02:56 UTC (rev 1308)
@@ -0,0 +1,157 @@
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/drivers/mga/Imakefile xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 2004-04-23 09:24:58.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 2004-04-23 09:31:29.000000000 +0200
+@@ -143,7 +143,6 @@
+ 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)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile 2003-02-17 18:06:43.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile 2004-04-23 09:51:54.000000000 +0200
+@@ -44,8 +44,6 @@
+ ObjectFromSpecialSource(accel, accelX, -DPSZ=16)
+
+ InstallObjectModule(rendition,$(MODULEDIR),drivers)
+-InstallNonExecFile(v10002d.uc,$(MODULEDIR))
+-InstallNonExecFile(v20002d.uc,$(MODULEDIR))
+
+ #if !defined(XF86DriverSDK)
+ InstallModuleManPage(rendition)
+@@ -85,9 +83,6 @@
+ InstallDriverSDKNonExecFile(accelX.c,$(DRIVERSDKDIR)/drivers/rendition)
+ InstallDriverSDKNonExecFile(cmd2d.h,$(DRIVERSDKDIR)/drivers/rendition)
+
+-InstallDriverSDKNonExecFile(v10002d.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-InstallDriverSDKNonExecFile(v20002d.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-
+ InstallDriverSDKNonExecFile(README.uc,$(DRIVERSDKDIR)/drivers/rendition)
+
+ InstallDriverSDKObjectModule(rendition,$(DRIVERSDKMODULEDIR),drivers)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 2002-12-11 18:23:33.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 2004-04-23 09:50:23.000000000 +0200
+@@ -88,14 +88,6 @@
+ /* reset memory endian */
+ verite_out8(iob+MEMENDIAN, memendian);
+
+- if (V1000_DEVICE == pRendition->board.chip){
+- c=verite_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v10002d.uc"));
+- }
+- else {
+- /* V2x00 chip */
+- c=verite_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v20002d.uc"));
+- }
+-
+ if (c == -1) {
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+ ("Microcode loading failed !!!\n"));
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile 2002-12-16 17:19:20.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile 2004-04-23 09:46:45.000000000 +0200
+@@ -26,16 +26,13 @@
+ LinkSourceFile(mga_drv.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(mga_irq.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(mga_state.c,$(XF86OSSRC)/shared/drm/kernel)
+-LinkSourceFile(mga_ucode.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(mga_warp.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128.h,$(XF86OSSRC)/shared/drm/kernel)
+-LinkSourceFile(r128_cce.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_drm.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_drv.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_irq.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_state.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon.h,$(XF86OSSRC)/shared/drm/kernel)
+-LinkSourceFile(radeon_cp.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon_drm.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon_drv.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon_irq.c,$(XF86OSSRC)/shared/drm/kernel)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile 2002-12-16 17:19:24.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile 2004-04-23 09:31:55.000000000 +0200
+@@ -3,7 +3,7 @@
+ .PATH: ${.CURDIR}/..
+ KMOD = r128
+ NOMAN= YES
+-SRCS = r128_cce.c r128_drv.c r128_state.c r128_irq.c
++SRCS = r128_drv.c r128_state.c r128_irq.c
+ SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
+ CFLAGS += ${DEBUG_FLAGS} -I. -I..
+
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile 2002-10-30 13:52:31.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile 2004-04-23 09:46:55.000000000 +0200
+@@ -3,7 +3,7 @@
+ .PATH: ${.CURDIR}/..
+ KMOD = radeon
+ NOMAN= YES
+-SRCS = radeon_cp.c radeon_drv.c radeon_state.c radeon_irq.c radeon_mem.c
++SRCS = radeon_drv.c radeon_state.c radeon_irq.c radeon_mem.c
+ SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
+ CFLAGS += ${DEBUG_FLAGS} -I. -I..
+
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile 2002-12-16 17:19:27.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile 2004-04-23 09:47:00.000000000 +0200
+@@ -25,16 +25,13 @@
+ LinkSourceFile(mga_drv.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(mga_irq.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(mga_state.c,$(XF86OSSRC)/shared/drm/kernel)
+-LinkSourceFile(mga_ucode.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(mga_warp.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128.h,$(XF86OSSRC)/shared/drm/kernel)
+-LinkSourceFile(r128_cce.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_drm.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_drv.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_irq.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(r128_state.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon.h,$(XF86OSSRC)/shared/drm/kernel)
+-LinkSourceFile(radeon_cp.c,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon_drm.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon_drv.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(radeon_state.c,$(XF86OSSRC)/shared/drm/kernel)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux 2003-02-05 01:23:13.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux 2004-04-23 09:47:07.000000000 +0200
+@@ -55,15 +55,15 @@
+ TDFXOBJS = tdfx_drv.o
+ TDFXHEADERS = tdfx.h $(DRMHEADERS) $(DRMTEMPLATES)
+
+-R128OBJS = r128_drv.o r128_cce.o r128_state.o r128_irq.o
++R128OBJS = r128_drv.o r128_state.o r128_irq.o
+ R128HEADERS = r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+-R128SHARED = r128.h r128_drv.h r128_drm.h r128_cce.c r128_state.c r128_irq.c
++R128SHARED = r128.h r128_drv.h r128_drm.h r128_state.c r128_irq.c
+
+ RADEONOBJS = radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \
+ radeon_irq.o
+ RADEONHEADERS = radeon.h radeon_drv.h radeon_drm.h $(DRMHEADERS) \
+ $(DRMTEMPLATES)
+-RADEONSHARED = radeon.h radeon_drv.h radeon_drm.h radeon_cp.c radeon_irq.c \
++RADEONSHARED = radeon.h radeon_drv.h radeon_drm.h radeon_irq.c \
+ radeon_mem.c radeon_state.c
+
+ INC = /usr/include
+@@ -168,7 +168,7 @@
+ MGAOBJS = mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
+ MGAHEADERS = mga.h mga_drv.h mga_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+ MGASHARED = mga.h mga_dma.c mga_drm.h mga_drv.h mga_state.c \
+- mga_ucode.h mga_warp.c
++ mga_warp.c
+
+ I810OBJS = i810_drv.o i810_dma.o
+ I810HEADERS = i810.h i810_drv.h i810_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_warp.c xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_warp.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_warp.c 2002-10-30 13:52:41.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_warp.c 2004-04-23 09:31:29.000000000 +0200
+@@ -33,7 +33,6 @@
+ #include "drm.h"
+ #include "mga_drm.h"
+ #include "mga_drv.h"
+-#include "mga_ucode.h"
+
+
+ #define MGA_WARP_CODE_ALIGN 256 /* in bytes */
Reply to: