Author: otavio
Date: 2005-05-17 22:38:13 -0500 (Tue, 17 May 2005)
New Revision: 32
Added:
trunk/tests/log-chips-800x600
trunk/tests/log-radeon-derived-1024x768
Modified:
trunk/bitdepth.sh
trunk/ddcprobe/Makefile
trunk/debian/changelog.Ubuntu
trunk/lcdsize.sh
Log:
Merge changes did on 0.4.18 release.
Modified: trunk/bitdepth.sh
===================================================================
--- trunk/bitdepth.sh 2005-05-18 03:36:03 UTC (rev 31)
+++ trunk/bitdepth.sh 2005-05-18 03:38:13 UTC (rev 32)
@@ -35,7 +35,7 @@
"$LOGFILE"; then
# broken bios! word. if we don't have any 24bpp modes, just hope like
# hell that 16bpp will work; some vendors ship bioses without 24bpp modes
- # in their vesa mode table.
+ # in their vesa mode table. but sometimes this means we need to go to 32.
FORCEDEPTH=16
fi
else
Modified: trunk/ddcprobe/Makefile
===================================================================
--- trunk/ddcprobe/Makefile 2005-05-18 03:36:03 UTC (rev 31)
+++ trunk/ddcprobe/Makefile 2005-05-18 03:38:13 UTC (rev 32)
@@ -11,24 +11,14 @@
ifeq ($(findstring $(ARCH),i386), $(ARCH))
TARGETS += svgamodes modetest libvbe.a
DDC_OBJS += lrmi.o vbe.o
-endif
-
+else
ifeq ($(ARCH),ppc)
DDC_OBJS += of.o minifind.o
-endif
-
-ifeq ($(ARCH),x86_64)
+else
DDC_OBJS += stub.o
endif
-
-ifeq ($(ARCH),sparc)
-DDC_OBJS += stub.o
endif
-ifeq ($(ARCH),ia64)
-DDC_OBJS += stub.o
-endif
-
ifeq (.depend,$(wildcard .depend))
TARGET=all
else
Modified: trunk/debian/changelog.Ubuntu
===================================================================
--- trunk/debian/changelog.Ubuntu 2005-05-18 03:36:03 UTC (rev 31)
+++ trunk/debian/changelog.Ubuntu 2005-05-18 03:38:13 UTC (rev 32)
@@ -1,3 +1,19 @@
+xresprobe (0.4.18) hoary; urgency=low
+
+ * ddcprobe: include stub functions by default, instead of a static
+ architecture -> source list (thanks, LaMont Jones).
+ * Add another Radeon panel string, although if we ever fall back here, we
+ should have got the information via DDC.
+ * Add panel identifier strings for chips.
+
+ -- Daniel Stone <[EMAIL PROTECTED]> Sat, 2 Apr 2005 11:36:06 +1000
+
+xresprobe (0.4.17) hoary; urgency=low
+
+ * Loosen the Neomagic lcdsize case (closes: Ubuntu#8228).
+
+ -- Daniel Stone <[EMAIL PROTECTED]> Sun, 27 Mar 2005 13:36:13 +1000
+
xresprobe (0.4.16) hoary; urgency=low
* Merge from unreleased 0.5 branch: add support for 'rigging' xresprobe
Modified: trunk/lcdsize.sh
===================================================================
--- trunk/lcdsize.sh 2005-05-18 03:36:03 UTC (rev 31)
+++ trunk/lcdsize.sh 2005-05-18 03:38:13 UTC (rev 32)
@@ -49,6 +49,11 @@
getres
fi
if [ -z "$RES" ]; then
+ EGREPLINE="\(WW\) RADEON\(.*\): Panel size .*x.* is derived, this may not
be correct."
+ SEDLINE="s/(WW) RADEON([^)]*): Panel size \([^x]*\)x\([^ ]*\) is derived,
this may not be correct./\1x\2/;"
+ getres
+ fi
+ if [ -z "$RES" ]; then
EGREPLINE="\(II\) R128\(.*\): Panel size: .*x.*"
SEDLINE="s/(II) R128([^)]*): Panel size: \(.*\)/\1/;"
getres
@@ -63,7 +68,7 @@
getres
elif [ "$DRIVER" = "neomagic" ]; then
EGREPLINE="\(--\) NEOMAGIC\(.*\): Panel is a .*x.* .* .* display"
- SEDLINE="s/(--) NEOMAGIC(.*): Panel is a \([^x]*\)x\([^ ]*\) [^ ]* [^ ]*
display/\1x\2/;"
+ SEDLINE="s/(--) NEOMAGIC(.*): Panel is a \([^x]*\)x\([^ ]*\) [^ ]* .*
display/\1x\2/;"
getres
elif [ "$DRIVER" = "nv" ]; then
# the nv driver would ideally tell us this
@@ -98,6 +103,10 @@
SEDLINE="s/(II) VIA([^)]*): Selected Panel Size is \([^x]*\)x\([^
]*\)/\1x\2/;"
getres
fi
+elif [ "$DRIVER" = "chips" ]; then
+ EGREPLINE="\(--\) CHIPS\(.*\): Display Size: x=.*; y=.*"
+ SEDLINE="s/(--) CHIPS([^)]*): Display Size: x=\([^;]*\); y=\([^ ]*\)/\1x\2/;"
+ getres
else
exit 1
fi
Copied: trunk/tests/log-chips-800x600 (from rev 31,
tags/0.4.18/tests/log-chips-800x600)
Copied: trunk/tests/log-radeon-derived-1024x768 (from rev 31,
tags/0.4.18/tests/log-radeon-derived-1024x768)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
