xserver-xorg-video-openchrome: Changes to 'debian-unstable'
NEWS | 12 +++++------
configure.ac | 2 -
debian/changelog | 6 ++---
debian/control | 2 -
debian/copyright | 4 ++-
debian/patches/noconfigure_at_autogen.diff | 10 +++++++++
debian/patches/series | 1
debian/rules | 31 ++++++++++++++++++-----------
src/Makefile.am | 10 ++++-----
src/via_driver.c | 5 +++-
src/via_driver.h | 2 -
src/via_id.c | 3 +-
12 files changed, 57 insertions(+), 31 deletions(-)
New commits:
commit 8281bd85c866316ca3b6562f451a5c6d8cd178c7
Author: Raphael Geissert <atomo64@gmail.com>
Date: Fri Apr 18 20:57:35 2008 -0500
Build the driver under an obj- directory
diff --git a/debian/control b/debian/control
index 1de5283..4e1b266 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Raphael Geissert <atomo64@gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 1:1.1.1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev
+Build-Depends: debhelper (>= 6), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 1:1.1.1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt (>= 0.40)
Standards-Version: 3.7.3
Homepage: http://www.openchrome.org
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
diff --git a/debian/patches/noconfigure_at_autogen.diff b/debian/patches/noconfigure_at_autogen.diff
new file mode 100644
index 0000000..b110953
--- /dev/null
+++ b/debian/patches/noconfigure_at_autogen.diff
@@ -0,0 +1,10 @@
+diff --git a/autogen.sh b/autogen.sh
+index 904cd67..218197d 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -9,4 +9,4 @@ cd $srcdir
+ autoreconf -v --install || exit 1
+ cd $ORIGDIR || exit $?
+
+-$srcdir/configure --enable-maintainer-mode "$@"
++#$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cffef8b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+noconfigure_at_autogen.diff
diff --git a/debian/rules b/debian/rules
index 5639d5f..06355cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-PACKAGE=xserver-xorg-video-openchrome
+PACKAGE = xserver-xorg-video-openchrome
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
# taken from xserver-xorg-video-via-0.2.2's debian/xsfbs/xsfbs.mk
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
@@ -9,7 +10,9 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
DEB_CONFIGURE_EXTRA_FLAGS := \
- --prefix=/usr
+ --prefix=/usr \
+ --disable-maintainer-mode \
+ --disable-dependency-tracking
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_EXTRA_FLAGS += \
@@ -17,39 +20,45 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-xv-debug=yes
endif
+include /usr/share/quilt/quilt.make
+
.PHONY: build
build: debian/build-stamp
-debian/build-stamp: debian/configured-stamp
+debian/build-stamp: $(DEB_BUILDDIR)/config.status
dh_testdir
- $(MAKE)
+ $(MAKE) -C $(DEB_BUILDDIR)
touch $@
.PHONY: install
install: build
dh_testdir
dh_testroot
- $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)/
+ $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)/
.PHONY: serverabi
serverabi:
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
-debian/configured-stamp:
- ./autogen.sh $(DEB_CONFIGURE_EXTRA_FLAGS)
- touch $@
+$(DEB_BUILDDIR)/config.status: configure
+ mkdir $(DEB_BUILDDIR)
+ cd $(DEB_BUILDDIR) && ../configure $(DEB_CONFIGURE_EXTRA_FLAGS)
+
+configure: patch
+ ./autogen.sh
.PHONY: clean
-clean:
+clean: unpatch
dh_testdir
dh_testroot
dh_clean
- [ ! -f Makefile ] || $(MAKE) distclean
+ [ ! -f $(DEB_BUILDDIR)/Makefile ] || $(MAKE) -C $(DEB_BUILDDIR) distclean
# remove stuff generated by autogen.sh
$(RM) aclocal.m4 compile config.guess config.h.in config.sub \
configure depcomp install-sh libxvmc/Makefile.in ltmain.sh \
Makefile.in man/Makefile.in man/openchrome.man missing src/Makefile.in
- $(RM) debian/configured-stamp debian/build-stamp
+ $(RM) -r $(DEB_BUILDDIR)
+ $(RM) debian/autotools-files-stamp debian/build-stamp
.PHONY: binary-indep
binary-indep:
commit ce1d0b0b18420804ecb9ce53b75bf1c6f1fe0f94
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Apr 12 19:58:14 2008 -0500
Update to reflect last upstream changes
diff --git a/debian/changelog b/debian/changelog
index 70e7a12..5739679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-xserver-xorg-video-openchrome (1:0.2.901+svn558-1) unstable; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn566-1) unstable; urgency=low
* First upload to Debian (Closes: #464848)
- * New upstream snapshot
+ * New upstream release + snapshot
* Updated copyright information
* Conflicts: libchromexvmc1, libchromexvmcpro1 so Replaces takes
effect
- -- Raphael Geissert <atomo64@gmail.com> Wed, 19 Mar 2008 18:35:16 -0600
+ -- Raphael Geissert <atomo64@gmail.com> Sat, 12 Apr 2008 19:56:53 -0500
xserver-xorg-video-openchrome (1:0.2.901+svn502-1) experimental; urgency=low
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 6292cd63d7d82648c875586283fa7cf4f7c551b0
Author: Raphael Geissert <atomo64@gmail.com>
Date: Thu Mar 27 11:21:48 2008 -0600
Add some missing copyright information
diff --git a/debian/copyright b/debian/copyright
index c1974f7..4aa7129 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,8 @@ Tue, 27 July 2007 16:41:23 -0500
This original source for this package was obtained via the upstream
svn branch at http://svn.openchrome.org/svn/trunk
+Copyright (c) 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright (c) 2000 VA Linux Systems, Inc.
Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
Copyright (c) 2000 Intel Corporation. All rights reserved.
Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -17,7 +19,7 @@ Copyright (c) 2004-2006 Terry Barnaby. All Rights Reserved.
Copyright (c) 2004-2006 Thomas Hellstrom. All Rights Reserved.
Copyright (c) 2005-2008 The Openchrome Project [openchrome.org]
-Application License:
+Library License:
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
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: