X Strike Force xresprobe SVN commit: r27 - in trunk/debian: . patches
Author: otavio
Date: 2005-03-23 20:46:52 -0500 (Wed, 23 Mar 2005)
New Revision: 27
Removed:
trunk/debian/patches/10_gcc_2.95_fixes.diff
Modified:
trunk/debian/changelog
Log:
Drop gcc fixes since it was merged on last release.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-03-24 01:30:47 UTC (rev 26)
+++ trunk/debian/changelog 2005-03-24 01:46:52 UTC (rev 27)
@@ -5,8 +5,11 @@
* Use simple-patch support of CDBS build system to apply patches in
build time to fix issues while these patches weren't include by
upstream.
- * debian/patches/10_gcc_2.95_fixes.diff: Added to fix some compilation
- issues Petter Reinholdtsen <pere@hungry.com> for the patch.
-
+ * debian/patches/10_gcc_2.95_fixes.diff: Added, while we were working on
+ 0.4.14, to fix some compilation issues Petter Reinholdtsen
+ <pere@hungry.com> for the patch.
+ * debian/patches/10_gcc_2.95_fixes.diff: Droped since was merged on
+ 0.4.16 upstream release.
+
-- Otavio Salvador <otavio@debian.org> Wed, 23 Mar 2005 22:30:24 -0300
Deleted: trunk/debian/patches/10_gcc_2.95_fixes.diff
===================================================================
--- trunk/debian/patches/10_gcc_2.95_fixes.diff 2005-03-24 01:30:47 UTC (rev 26)
+++ trunk/debian/patches/10_gcc_2.95_fixes.diff 2005-03-24 01:46:52 UTC (rev 27)
@@ -1,191 +0,0 @@
-From: Petter Reinholdtsen <pere@hungry.com>
-Subject: Some xresprobe patches for gcc 2.95
-To: Otavio Salvador <otavio@debian.org>
-Date: Mon, 14 Mar 2005 00:40:02 +0100
-Message-Id: <E1DAcgk-0007NV-6h@saruman.uio.no>
-
-Hi
-
-I gave up on packaging xresprobe for woody, but decided to try to
-compile it. I discovered a few issues, and fixed them using this
-patch:
-
- - Add -W to the compile, to detect more problems with the source
- - Add missing initializers to array init code
- - Make variable unsigned to avoid problem when comparing it with
- sizeof().
- - Make code C89 compatible by not declearing variables after the
- first statement in a block.
-
-It would be nice if you could include these patches into a future
-version of xresprobe.
-
-Index: ddcprobe/Makefile
-===================================================================
---- ddcprobe/Makefile (revision 11)
-+++ ddcprobe/Makefile (working copy)
-@@ -3,7 +3,7 @@
- ARCH := $(patsubst ppc%,ppc,$(ARCH))
-
- CC = gcc
--CFLAGS = -Wall -O2 -g# -DDEBUG
-+CFLAGS = -W -Wall -O2 -g# -DDEBUG
- TARGETS = ddcprobe ddcxinfo
- DDC_OBJS = vesamode.o common.o
- DDC_LIBS =
-Index: ddcprobe/vesamode.c
-===================================================================
---- ddcprobe/vesamode.c (revision 11)
-+++ ddcprobe/vesamode.c (working copy)
-@@ -4,40 +4,40 @@
- /* Known standard VESA modes. */
- struct vesa_mode_t known_vesa_modes[] = {
- /* VESA 1.0/1.1 ? */
-- {0x100, 640, 400, 256, "640x400x256"},
-- {0x101, 640, 480, 256, "640x480x256"},
-- {0x102, 800, 600, 16, "800x600x16"},
-- {0x103, 800, 600, 256, "800x600x256"},
-- {0x104, 1024, 768, 16, "1024x768x16"},
-- {0x105, 1024, 768, 256, "1024x768x256"},
-- {0x106, 1280, 1024, 16, "1280x1024x16"},
-- {0x107, 1280, 1024, 256,"1280x1024x256"},
-- {0x108, 80, 60, 16, "80x60 (text)"},
-- {0x109, 132, 25, 16, "132x25 (text)"},
-- {0x10a, 132, 43, 16, "132x43 (text)"},
-- {0x10b, 132, 50, 16, "132x50 (text)"},
-- {0x10c, 132, 60, 16, "132x60 (text)"},
-+ {0x100, 640, 400, 256, "640x400x256", 0},
-+ {0x101, 640, 480, 256, "640x480x256", 0},
-+ {0x102, 800, 600, 16, "800x600x16", 0},
-+ {0x103, 800, 600, 256, "800x600x256", 0},
-+ {0x104, 1024, 768, 16, "1024x768x16", 0},
-+ {0x105, 1024, 768, 256, "1024x768x256", 0},
-+ {0x106, 1280, 1024, 16, "1280x1024x16", 0},
-+ {0x107, 1280, 1024, 256,"1280x1024x256", 0},
-+ {0x108, 80, 60, 16, "80x60 (text)", 0},
-+ {0x109, 132, 25, 16, "132x25 (text)", 0},
-+ {0x10a, 132, 43, 16, "132x43 (text)", 0},
-+ {0x10b, 132, 50, 16, "132x50 (text)", 0},
-+ {0x10c, 132, 60, 16, "132x60 (text)", 0},
- /* VESA 1.2+ */
-- {0x10d, 320, 200, 32768, "320x200x32k"},
-- {0x10e, 320, 200, 65536, "320x200x64k"},
-- {0x10f, 320, 200, 16777216, "320x200x16m"},
-- {0x110, 640, 480, 32768, "640x480x32k"},
-- {0x111, 640, 480, 65536, "640x480x64k"},
-- {0x112, 640, 480, 16777216, "640x480x16m"},
-- {0x113, 800, 600, 32768, "800x600x32k"},
-- {0x114, 800, 600, 65536, "800x600x64k"},
-- {0x115, 800, 600, 16777216, "800x600x16m"},
-- {0x116, 1024, 768, 32768, "1024x768x32k"},
-- {0x117, 1024, 768, 65536, "1024x768x64k"},
-- {0x118, 1024, 768, 16777216, "1024x768x16m"},
-- {0x119, 1280, 1024, 32768, "1280x1024x32k"},
-- {0x11a, 1280, 1024, 65536, "1280x1024x64k"},
-- {0x11b, 1280, 1024, 16777216, "1280x1024x16m"},
-+ {0x10d, 320, 200, 32768, "320x200x32k", 0},
-+ {0x10e, 320, 200, 65536, "320x200x64k", 0},
-+ {0x10f, 320, 200, 16777216, "320x200x16m", 0},
-+ {0x110, 640, 480, 32768, "640x480x32k", 0},
-+ {0x111, 640, 480, 65536, "640x480x64k", 0},
-+ {0x112, 640, 480, 16777216, "640x480x16m", 0},
-+ {0x113, 800, 600, 32768, "800x600x32k", 0},
-+ {0x114, 800, 600, 65536, "800x600x64k", 0},
-+ {0x115, 800, 600, 16777216, "800x600x16m", 0},
-+ {0x116, 1024, 768, 32768, "1024x768x32k", 0},
-+ {0x117, 1024, 768, 65536, "1024x768x64k", 0},
-+ {0x118, 1024, 768, 16777216, "1024x768x16m", 0},
-+ {0x119, 1280, 1024, 32768, "1280x1024x32k", 0},
-+ {0x11a, 1280, 1024, 65536, "1280x1024x64k", 0},
-+ {0x11b, 1280, 1024, 16777216, "1280x1024x16m", 0},
- /* VESA 2.0+ */
-- {0x120, 1600, 1200, 256, "1600x1200x256"},
-- {0x121, 1600, 1200, 32768, "1600x1200x32k"},
-- {0x122, 1600, 1200, 65536, "1600x1200x64k"},
-- { 0, 0, 0, 0, ""},
-+ {0x120, 1600, 1200, 256, "1600x1200x256", 0},
-+ {0x121, 1600, 1200, 32768, "1600x1200x32k", 0},
-+ {0x122, 1600, 1200, 65536, "1600x1200x64k", 0},
-+ { 0, 0, 0, 0, "", 0},
- };
-
- struct vesa_timing_t known_vesa_timings[] = {
-Index: ddcprobe/lrmi.c
-===================================================================
---- ddcprobe/lrmi.c (revision 11)
-+++ ddcprobe/lrmi.c (working copy)
-@@ -47,7 +47,7 @@
- int ready;
- int count;
- struct mem_block blocks[REAL_MEM_BLOCKS];
-- } mem_info = { 0 };
-+ } mem_info;
-
- static int
- real_mem_init(void)
-@@ -185,7 +185,7 @@
- unsigned short ret_seg, ret_off;
- unsigned short stack_seg, stack_off;
- struct vm86_struct vm;
-- } context = { 0 };
-+ } context;
-
-
- static inline void
-Index: ddcprobe/common.c
-===================================================================
---- ddcprobe/common.c (revision 11)
-+++ ddcprobe/common.c (working copy)
-@@ -49,7 +49,8 @@
- struct edid1_info *edid;
- struct modeline *ret;
- char buf[LINE_MAX];
-- int modeline_count = 0, i, j;
-+ int modeline_count = 0, j;
-+ unsigned int i;
-
- if((edid = get_edid_info()) == NULL) {
- return NULL;
-Index: ddcprobe/ddcprobe.c
-===================================================================
---- ddcprobe/ddcprobe.c (revision 11)
-+++ ddcprobe/ddcprobe.c (working copy)
-@@ -45,6 +45,13 @@
- struct edid1_info *edid_info = NULL;
- char manufacturer[4];
- int i;
-+ struct vbe_info *vbe_info = NULL;
-+#if defined (__i386__)
-+ u_int16_t *mode_list = NULL;
-+#endif /* __i386__ */
-+ unsigned char *timings;
-+ struct edid_monitor_descriptor *monitor;
-+ unsigned char *timing;
-
- #if defined (__i386__) || defined (__powerpc__)
- assert(sizeof(struct edid1_info) == 256);
-@@ -52,12 +59,7 @@
- assert(sizeof(struct edid_monitor_descriptor) == 18);
- assert(sizeof(struct vbe_info) == 512);
- #endif
-- struct vbe_info *vbe_info = NULL;
-
--#if defined (__i386__)
-- u_int16_t *mode_list = NULL;
--#endif /* __i386__ */
--
- vbe_info = vbe_get_vbe_info();
- if(vbe_info == NULL) {
- fprintf(stderr, "VESA BIOS Extensions not detected.\n");
-@@ -237,9 +239,8 @@
- * removed it and replaced it with my own dtiming code, which is derived
- * from the VESA spec and parse-edid.c. How well it works on monitors
- * with multiple dtimings is unknown, since I don't have one. -daniels */
-- unsigned char *timings = (unsigned char *)&edid_info->monitor_details.detailed_timing;
-- struct edid_monitor_descriptor *monitor = NULL;
-- unsigned char *timing;
-+ timings = (unsigned char *)&edid_info->monitor_details.detailed_timing;
-+ monitor = NULL;
- for(i = 0; i < 4; i++) {
- timing = &(timings[i*18]);
- if (timing[0] == 0 && timing[1] == 0) {
Reply to: