xserver-xorg-video-openchrome: Changes to 'upstream-unstable'
NEWS | 12 ++++++------
configure.ac | 2 +-
src/Makefile.am | 10 +++++-----
src/via_driver.c | 5 ++++-
src/via_driver.h | 2 +-
src/via_id.c | 3 ++-
6 files changed, 19 insertions(+), 15 deletions(-)
New commits:
commit 3829f5c3c4147751c2ddd622df41ebb1c2c6930d
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Apr 12 12:30:34 2008 +0000
fix chipset revision detection in libpciaccess code path
git-svn-id: http://svn.openchrome.org/svn/trunk@566 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 79b833d..639c642 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1065,7 +1065,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
#ifdef XSERVER_LIBPCIACCESS
struct pci_device *bridge = via_host_bridge();
- pci_device_cfg_read_u32(bridge, &pVia->ChipRev, 0xF6);
+ pci_device_cfg_read_u8(bridge, &pVia->ChipRev, 0xF6);
#else
pVia->ChipRev = pciReadByte(pciTag(0, 0, 0), 0xF6);
#endif
commit 00821802af1adb0430eaf8be1535ef0c7a69e76b
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Apr 9 22:44:29 2008 +0000
print driver version in the libpciaccess path
git-svn-id: http://svn.openchrome.org/svn/trunk@565 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 5bd4371..79b833d 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -600,6 +600,9 @@ via_pci_probe(DriverPtr driver, int entity_num,
"VIA Technologies does not support this driver in any way.\n");
xf86Msg(X_NOTICE,
"For support, please refer to http://www.openchrome.org/.\n";);
+#ifdef BUILDCOMMENT
+ xf86Msg(X_NOTICE, BUILDCOMMENT"\n");
+#endif
}
return scrn != NULL;
}
commit e7aca5562b2be2801701e06236fc1a74df11b0b0
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Apr 8 21:36:31 2008 +0000
hopefully fix svnversion.h once and for all...
git-svn-id: http://svn.openchrome.org/svn/trunk@563 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e5d581..73dc9ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+BUILT_SOURCES = svnversion.h
EXTRA_DIST = svnversion.h
CONFIG_CLEAN_FILES= svnversion.h
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
@@ -100,5 +101,6 @@ svnversion.h: $(openchrome_drv_la_SOURCES)
@echo "created $@"
dist-hook:
+ rm svnversion.h;
echo '#define BUILDCOMMENT "(openchrome '$(VERSION)' release)"' \
> svnversion.h
commit e06de5373d8d42dbe4d6324feb5d92ea5f0da5ff
Author: ben <ben@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Mar 30 22:34:54 2008 +0000
Overwriting svnversion.h for a release, instead of using a separate file.
git-svn-id: http://svn.openchrome.org/svn/trunk@562 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/Makefile.am b/src/Makefile.am
index 6423284..7e5d581 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,8 +24,8 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-EXTRA_DIST = svnversion.h svnrelease.h
-CONFIG_CLEAN_FILES= svnversion.h svnrelease.h
+EXTRA_DIST = svnversion.h
+CONFIG_CLEAN_FILES= svnversion.h
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
openchrome_drv_la_LDFLAGS = -module -avoid-version
@@ -87,9 +87,7 @@ endif
via_driver.lo: svnversion.h
svnversion.h: $(openchrome_drv_la_SOURCES)
- @if [ -f svnrelease.h ]; then \
- echo '#include "svnrelease.h"' > $@.tmp; \
- elif [ -d .svn ]; then \
+ @if [ -d .svn ]; then \
echo '#define BUILDCOMMENT "(development build, at svn revision '\
"`svnversion -nc .. | sed -e s/^[^:]*://`"')"' > $@.tmp; \
else \
@@ -103,4 +101,4 @@ svnversion.h: $(openchrome_drv_la_SOURCES)
dist-hook:
echo '#define BUILDCOMMENT "(openchrome '$(VERSION)' release)"' \
- > svnrelease.h
+ > svnversion.h
commit 891e12adff17006a5e5baf0d5f0f7a46bbfe7618
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Mar 29 00:09:37 2008 +0000
include svnrelease.h in tarball
git-svn-id: http://svn.openchrome.org/svn/trunk@561 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/Makefile.am b/src/Makefile.am
index b1d18f3..6423284 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-EXTRA_DIST = svnversion.h
+EXTRA_DIST = svnversion.h svnrelease.h
CONFIG_CLEAN_FILES= svnversion.h svnrelease.h
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
commit 2f50d6418b6570146da68248618f2cd6b9a8a044
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Fri Mar 28 23:59:08 2008 +0000
Bump version for release
git-svn-id: http://svn.openchrome.org/svn/trunk@560 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/NEWS b/NEWS
index b6455ac..77401ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-openchrome 0.2.902 (19/03/2008)
+openchrome 0.2.902 (29/03/2008)
-------------------------------
* Enhancements and bug fixes:
- libpciaccess support.
@@ -7,9 +7,9 @@ openchrome 0.2.902 (19/03/2008)
- Various code clean up.
* New boards:
-- ASRock P4VM900-SATA2, Asustek P5VD2-VM SE, Biostar P4M800 Pro-M7,
- Clevo M54xSR, Clevo M660SR, Medion Notebook MD96483, Mitac 8515,
- Mitac 8624, MSI Fuzzy CX700/CX700D, Packard Bell EasyNote XS
+- ASRock P4VM900-SATA2, Asustek M2V-MX SE, Asustek P5VD2-VM SE,
+ Biostar P4M800 Pro-M7, Clevo M54xSR, Clevo M660SR, Medion Notebook MD96483,
+ Mitac 8515, Mitac 8624, MSI Fuzzy CX700/CX700D, Packard Bell EasyNote XS
(aka Everex Cloudbook CE1200V), VIA Epia SN.
* Notes:
@@ -27,7 +27,7 @@ openchrome 0.2.902 (19/03/2008)
openchrome 0.2.901 (02/01/2008)
---------------------
+-------------------------------
* Enhancements :
- New pci ids : FIC CE260, Hasee F700C, MSI P4M900M / P4M900M2-F/L,
PCChips V21G, Biostar P4M900M-M7 SE.
@@ -44,5 +44,5 @@ openchrome 0.2.901 (02/01/2008)
- Various code cleanups.
openchrome 0.2.900 (20/10/2007)
---------------------
+-------------------------------
- First openchrome official release.
diff --git a/configure.ac b/configure.ac
index aece250..a44b1b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- 0.2.901,
+ 0.2.902,
[http://www.openchrome.org/trac/report/1],
xf86-video-openchrome)
diff --git a/src/via_driver.h b/src/via_driver.h
index 4761ddc..75f74df 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -102,7 +102,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#ifdef USE_NEW_XVABI
-#define PATCHLEVEL 901
+#define PATCHLEVEL 902
#else
#define PATCHLEVEL 0
#endif
commit c2979886a76e7d45ac4145db3a01739e25c8b129
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Mar 26 19:39:13 2008 +0000
Asustek M2V-MX SE
git-svn-id: http://svn.openchrome.org/svn/trunk@559 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index e267981..1bea72d 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -154,7 +154,8 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Asustek P5V800-MX", VIA_VM800, 0x3344, 0x1122, VIA_DEVICE_CRT},
/*** K8M890 ***/
- {"ASUS A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
+ {"Asustek A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
+ {"Asustek M2V-MX SE", VIA_K8M890, 0x1043, 0x8297, VIA_DEVICE_CRT},
{"Foxconn K8M890M2MA-RS2H", VIA_K8M890, 0x105B, 0x0C84, VIA_DEVICE_CRT},
{"Shuttle FX22V1", VIA_K8M890, 0x1297, 0x3080, VIA_DEVICE_CRT},
{"MSI K9VGM-V", VIA_K8M890, 0x1462, 0x7253, VIA_DEVICE_CRT},
Reply to: