.gitignore | 70 ++++++- ChangeLog | 177 +++++++++++++++++++ Makefile.am | 11 + configure.ac | 16 - debian/README.source | 2 debian/changelog | 42 ++++ debian/control | 15 - debian/patches/001_ubuntu_bail_when_kms_active.patch | 122 +++++++++++++ debian/patches/series | 1 debian/rules | 18 - debian/xsfbs/xsfbs.mk | 35 ++- man/.gitignore | 2 src/.gitignore | 6 src/vesa.c | 136 +++++--------- src/vesa.h | 6 15 files changed, 513 insertions(+), 146 deletions(-)
New commits: commit 04a8159a51c97eaa6757f07430943d5afb700ad9 Author: Cyril Brulebois <k...@debian.org> Date: Wed Oct 13 00:54:41 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 33ae641..d8186c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-vesa (1:2.3.0-4) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.0-4) experimental; urgency=low * Build against Xserver 1.9.1 rc1. - -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 00:53:52 +0200 + -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 00:54:34 +0200 xserver-xorg-video-vesa (1:2.3.0-3) unstable; urgency=low commit bc7e375b2443eb928b4e092a1392ca35ae8deb73 Author: Cyril Brulebois <k...@debian.org> Date: Wed Oct 13 00:54:30 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index 17f4bf3..33ae641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-vesa (1:2.3.0-4) UNRELEASED; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 00:53:52 +0200 + xserver-xorg-video-vesa (1:2.3.0-3) unstable; urgency=low * Add patch by Christopher James Halse Rogers from Ubuntu to bail in Probe diff --git a/debian/control b/debian/control index d69bdbc..7c872a5 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org Build-Depends: debhelper (>= 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, commit 7ad4b758d218f9d69780c5e4724f8e7df6d05adf Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 13:14:41 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 743235c..17f4bf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-vesa (1:2.3.0-3) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.0-3) unstable; urgency=low * Add patch by Christopher James Halse Rogers from Ubuntu to bail in Probe if kernel mode setting is enabled. - -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 12:55:19 +0200 + -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 13:14:24 +0200 xserver-xorg-video-vesa (1:2.3.0-2) unstable; urgency=low commit 8c3fb055a63c2eca23b3ba6b585484f010e2ee06 Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 13:12:59 2010 +0200 Modify kms patch to link with libdrm to get a correct dependency diff --git a/debian/patches/001_ubuntu_bail_when_kms_active.patch b/debian/patches/001_ubuntu_bail_when_kms_active.patch index 4d2880f..ae69f9d 100644 --- a/debian/patches/001_ubuntu_bail_when_kms_active.patch +++ b/debian/patches/001_ubuntu_bail_when_kms_active.patch @@ -15,8 +15,8 @@ Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/xserver-xorg-video-ve Index: xserver-xorg-video-vesa/configure.ac =================================================================== ---- xserver-xorg-video-vesa.orig/configure.ac 2010-03-24 19:33:01.000000000 +1100 -+++ xserver-xorg-video-vesa/configure.ac 2010-03-24 20:05:36.435067870 +1100 +--- xserver-xorg-video-vesa.orig/configure.ac ++++ xserver-xorg-video-vesa/configure.ac @@ -93,7 +93,14 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) @@ -43,8 +43,8 @@ Index: xserver-xorg-video-vesa/configure.ac Index: xserver-xorg-video-vesa/src/vesa.c =================================================================== ---- xserver-xorg-video-vesa.orig/src/vesa.c 2010-03-24 19:33:01.000000000 +1100 -+++ xserver-xorg-video-vesa/src/vesa.c 2010-03-24 20:04:53.113781642 +1100 +--- xserver-xorg-video-vesa.orig/src/vesa.c ++++ xserver-xorg-video-vesa/src/vesa.c @@ -65,6 +65,10 @@ #include <X11/extensions/dpms.h> #endif @@ -108,3 +108,15 @@ Index: xserver-xorg-video-vesa/src/vesa.c pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL, NULL, NULL, NULL, NULL); if (pScrn != NULL) { +Index: xserver-xorg-video-vesa/src/Makefile.am +=================================================================== +--- xserver-xorg-video-vesa.orig/src/Makefile.am ++++ xserver-xorg-video-vesa/src/Makefile.am +@@ -27,6 +27,7 @@ + vesa_drv_la_LTLIBRARIES = vesa_drv.la + vesa_drv_la_LDFLAGS = -module -avoid-version + vesa_drv_ladir = @moduledir@/drivers ++vesa_drv_la_LIBADD = @LIBDRM_LIBS@ + + vesa_drv_la_SOURCES = \ + vesa.c \ commit 7758d58d81653acb2510568f27dc0de63e6b6f88 Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 13:06:37 2010 +0200 Version libdrm build-dep for drmCheckModesettingSupported diff --git a/debian/control b/debian/control index 976e734..d69bdbc 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: libtool, xutils-dev (>= 1:7.5), quilt, - libdrm-dev, - x11proto-xf86dri-dev + libdrm-dev (>= 2.4.3) [!hurd-i386], + x11proto-xf86dri-dev, Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git commit 9ead6d98f679d62d22d387a1d613be30bb79e02f Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 12:58:55 2010 +0200 Fix use of patch target diff --git a/debian/rules b/debian/rules index 0841d21..fd3faa3 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ endif # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so confflags += --disable-static -configure: patch +configure: $(STAMP_DIR)/patch autoreconf -vfi build/config.status: configure commit f370146774ec24a183affa8f2aeceb7909cffa7c Author: Julien Cristau <jcris...@debian.org> Date: Sat May 15 12:58:16 2010 +0200 Add changelog entry diff --git a/debian/changelog b/debian/changelog index a8d1a11..743235c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-vesa (1:2.3.0-3) UNRELEASED; urgency=low + + * Add patch by Christopher James Halse Rogers from Ubuntu to bail in Probe + if kernel mode setting is enabled. + + -- Julien Cristau <jcris...@debian.org> Sat, 15 May 2010 12:55:19 +0200 + xserver-xorg-video-vesa (1:2.3.0-2) unstable; urgency=low [ Julien Cristau ] commit f990175956482ee41bcb77fe227caaf7ae6295bc Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Thu Mar 25 09:43:29 2010 +1100 Add build-depends for the KMS detection support, so the patch actually has an effect! diff --git a/debian/control b/debian/control index 1149680..976e734 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,9 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5), - quilt + quilt, + libdrm-dev, + x11proto-xf86dri-dev Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git commit 5eefbf2dfb3815ed3e3de1e34400eb617f971daf Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Wed Mar 24 21:18:13 2010 +1100 Add patch to keep VESA from loading when kernel modesetting is active diff --git a/debian/control b/debian/control index caeac34..1149680 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5), + quilt Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git diff --git a/debian/patches/001_ubuntu_bail_when_kms_active.patch b/debian/patches/001_ubuntu_bail_when_kms_active.patch new file mode 100644 index 0000000..4d2880f --- /dev/null +++ b/debian/patches/001_ubuntu_bail_when_kms_active.patch @@ -0,0 +1,110 @@ +From c0416148852843e0dfa14c9219541543cbd6a41d Mon Sep 17 00:00:00 2001 +From: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> +Date: Wed, 24 Mar 2010 19:11:29 +1100 +Subject: [PATCH] Refuse to bind to a device which has kernel modesetting active. + . + Trying to program a VESA mode while kernel modesetting is active can + result in an improperly driven screen. +Bug: http://bugs.freedesktop.org/show_bug.cgi?id=26878 +Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/xserver-xorg-video-vesa/+bug/531736 +--- + configure.ac | 7 +++++++ + src/Makefile.am | 2 +- + src/vesa.c | 35 +++++++++++++++++++++++++++++++++++ + 3 files changed, 43 insertions(+), 1 deletions(-) + +Index: xserver-xorg-video-vesa/configure.ac +=================================================================== +--- xserver-xorg-video-vesa.orig/configure.ac 2010-03-24 19:33:01.000000000 +1100 ++++ xserver-xorg-video-vesa/configure.ac 2010-03-24 20:05:36.435067870 +1100 +@@ -93,7 +93,14 @@ + fi + AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' ++if test "x$XSERVER_LIBPCIACCESS" = xyes; then ++ PKG_CHECK_MODULES(LIBDRM, [libdrm > 2.4.3 xf86driproto], HAVE_KMS="yes", HAVE_KMS="no") ++ if test "x$HAVE_KMS" = xyes; then ++ AC_DEFINE(HAVE_KMS, 1, [Have kernel modesetting]) ++ fi ++fi ++ ++CFLAGS="$CFLAGS $XORG_CFLAGS $LIBDRM_CFLAGS "' -I$(top_srcdir)/src' + INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' + AC_SUBST([CFLAGS]) + AC_SUBST([INCLUDES]) +@@ -103,6 +110,7 @@ + # Checks for header files. + AC_HEADER_STDC + ++ + DRIVER_NAME=vesa + AC_SUBST([DRIVER_NAME]) + +Index: xserver-xorg-video-vesa/src/vesa.c +=================================================================== +--- xserver-xorg-video-vesa.orig/src/vesa.c 2010-03-24 19:33:01.000000000 +1100 ++++ xserver-xorg-video-vesa/src/vesa.c 2010-03-24 20:04:53.113781642 +1100 +@@ -65,6 +65,10 @@ + #include <X11/extensions/dpms.h> + #endif + ++#ifdef HAVE_KMS ++#include <xf86drmMode.h> ++#include <dri.h> ++#endif + + /* Mandatory functions */ + static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid); +@@ -106,6 +110,9 @@ + static void RestoreFonts(ScrnInfoPtr pScrn); + static Bool + VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function); ++#ifdef HAVE_KMS ++static Bool VESAKernelModesettingEnabled (struct pci_device *device); ++#endif + + static void * + VESAWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, +@@ -317,6 +324,24 @@ + (double)(ddcmode->HTotal * ddcmode->VTotal)); + } + ++#ifdef HAVE_KMS ++static Bool VESAKernelModesettingEnabled (struct pci_device *device) ++{ ++ char *busIdString; ++ int ret; ++ ++ if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) ++ return FALSE; ++ ++ busIdString = DRICreatePCIBusID(device); ++ ++ ret = drmCheckModesettingSupported(busIdString); ++ xfree(busIdString); ++ ++ return (ret == 0); ++} ++#endif //HAVE_KMS ++ + static ModeStatus + VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) + { +@@ -428,6 +453,16 @@ + { + ScrnInfoPtr pScrn; + ++#ifdef HAVE_KMS ++ /* Trying to bring up a VESA mode while kernel modesetting is enabled ++ results in badness */ ++ if (VESAKernelModesettingEnabled (dev)) { ++ xf86Msg (X_ERROR, ++ "VESA: Kernel modesetting driver in use, refusing to load\n"); ++ return FALSE; ++ } ++#endif ++ + pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, + NULL, NULL, NULL, NULL, NULL); + if (pScrn != NULL) { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..915ea3f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +001_ubuntu_bail_when_kms_active.patch diff --git a/debian/rules b/debian/rules index 9c78993..0841d21 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ endif # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so confflags += --disable-static -configure: +configure: patch autoreconf -vfi build/config.status: configure @@ -48,7 +48,7 @@ build-stamp: build/config.status cd build && $(MAKE) >$@ -clean: +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp commit d6ed9e5dcd23acb1f99de40968971d32fee308d1 Author: Mikhail Gusarov <dotted...@debian.org> Date: Fri May 7 18:58:59 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 3643b98..caeac34 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,5 @@ Description: X.Org X server -- VESA display driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-video-vesa driver module. commit 6001bb1026d5d691522a6a9a3599421b14641dd6 Author: Cyril Brulebois <k...@debian.org> Date: Mon May 3 22:05:09 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 7107b20..a8d1a11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-vesa (1:2.3.0-2) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.0-2) unstable; urgency=low [ Julien Cristau ] * Remove myself from Uploaders @@ -10,7 +10,7 @@ xserver-xorg-video-vesa (1:2.3.0-2) UNRELEASED; urgency=low * Add myself to Uploaders. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). - -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 01:42:55 +0100 + -- Cyril Brulebois <k...@debian.org> Mon, 03 May 2010 22:05:06 +0200 xserver-xorg-video-vesa (1:2.3.0-1) unstable; urgency=low commit f1ef3dd63dee8dfb5dbc6fb0f8ca1b39e56340da Author: Cyril Brulebois <k...@debian.org> Date: Mon May 3 22:05:03 2010 +0200 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 25781aa..7107b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xserver-xorg-video-vesa (1:2.3.0-2) UNRELEASED; urgency=low ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 01:42:55 +0100 diff --git a/debian/control b/debian/control index a7b4156..3643b98 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5), -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git commit 4a287d50e234e4ba8c2f13bc9a301abb994b25cc Author: Cyril Brulebois <k...@debian.org> Date: Mon May 3 21:57:16 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 1fcfcad..25781aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-video-vesa (1:2.3.0-2) UNRELEASED; urgency=low * Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. + * Add myself to Uploaders. -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 01:42:55 +0100 diff --git a/debian/control b/debian/control index a31019b..a7b4156 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-vesa Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 47a050294cbf7d5b4189467be3e58331e9755f88 Author: Cyril Brulebois <k...@debian.org> Date: Sun May 2 02:35:38 2010 +0200 Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. diff --git a/debian/changelog b/debian/changelog index 7e50713..1fcfcad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ xserver-xorg-video-vesa (1:2.3.0-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Remove myself from Uploaders + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 01:42:55 +0100 xserver-xorg-video-vesa (1:2.3.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index fadc1f9..a31019b 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org Build-Depends: debhelper (>= 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, @@ -22,7 +22,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.gi Package: xserver-xorg-video-vesa Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Provides: ${xviddriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-vesa Conflicts: xserver-xorg-driver-vesa commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <k...@debian.org> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <jcris...@debian.org> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <k...@debian.org> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit 67f6b04f96ea69d757de1479a0649bdc2cdecee2 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 23 01:46:33 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index d5a8628..7e50713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-vesa (1:2.3.0-2) UNRELEASED; urgency=low + + * Remove myself from Uploaders + + -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 01:42:55 +0100 + xserver-xorg-video-vesa (1:2.3.0-1) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index 358b6e5..fadc1f9 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-vesa Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau <jcris...@debian.org>, Brice Goglin <bgog...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit d4fe424b6d8cf0d0f82de5f83693874c839d6642 Author: Brice Goglin <bgog...@debian.org> Date: Wed Jan 20 23:36:11 2010 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index e73b2fb..d5a8628 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-vesa (1:2.3.0-1) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.0-1) unstable; urgency=low [ Timo Aaltonen ] * New upstream release. @@ -9,7 +9,7 @@ xserver-xorg-video-vesa (1:2.3.0-1) UNRELEASED; urgency=low good reason. Thanks, Colin Watson! * Bump build-dep on xutils-dev for new util-macros. - -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 06 Jan 2010 14:27:00 +0200 + -- Brice Goglin <bgog...@debian.org> Wed, 20 Jan 2010 23:35:50 +0100 xserver-xorg-video-vesa (1:2.2.1-2) unstable; urgency=low commit af4cb28e64983459a1caa832e39581111be2073a Author: Julien Cristau <jcris...@debian.org> Date: Mon Jan 18 16:49:40 2010 +0000 Bump build-dep on xutils-dev for new util-macros. diff --git a/debian/changelog b/debian/changelog index 448aea1..e73b2fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-video-vesa (1:2.3.0-1) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Bump build-dep on xutils-dev for new util-macros. -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 06 Jan 2010 14:27:00 +0200 diff --git a/debian/control b/debian/control index f494ef5..358b6e5 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: dpkg-dev (>= 1.14.17), automake, libtool, - xutils-dev + xutils-dev (>= 1:7.5), Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git commit 89c22da275a8949f58b4c8ed5ffa61878dcba173 Author: Julien Cristau <jcris...@debian.org> Date: Mon Jan 18 16:46:15 2010 +0000 Add bug closer diff --git a/debian/changelog b/debian/changelog index 590e2f3..448aea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-vesa (1:2.3.0-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release. + + Add missing shadowRemove() in VESACloseScreen() (closes: #565401) [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no commit 8415578087d588de503add32a586fee9c3aadf2c Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 16 16:48:46 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index 41a3d11..590e2f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ xserver-xorg-video-vesa (1:2.3.0-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 06 Jan 2010 14:27:00 +0200 xserver-xorg-video-vesa (1:2.2.1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index c8bfaa8..9c78993 100755 --- a/debian/rules +++ b/debian/rules @@ -35,17 +35,17 @@ confflags += --disable-static configure: autoreconf -vfi -obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ +build/config.status: configure + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" build: build-stamp -build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status +build-stamp: build/config.status dh_testdir - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: @@ -57,7 +57,7 @@ clean: rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f $$(find -name Makefile.in) rm -f aclocal.m4 config.guess config.h.in config.sub configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs @@ -70,7 +70,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi commit b63d6ee460de3fd74d1c0b6b6715f7f411919ae5 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Wed Jan 6 14:27:36 2010 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..b602817 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,789 @@ +commit ba6527d2695574f6f7808ada39f6caed7a688f39 +Author: Adam Jackson <a...@redhat.com> +Date: Mon Jan 4 14:19:13 2010 -0500 + + vesa 2.3.0 + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 1d0e73302d4c4eda56f32e129920ccd263f524ce +Author: Adam Jackson <a...@redhat.com> +Date: Mon Jan 4 14:16:42 2010 -0500 + + Make the VBESetVBEMode fallback message slightly clearer + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 4b625d15b2bb3dc337924f0703db7ddd47c08434 +Author: Adam Jackson <a...@redhat.com> +Date: Wed Dec 30 11:48:27 2009 -0500 + + Remove support for non-shadowfb banked framebuffer + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 1a31829b966ceed444a3b3f7e91c5ae04d82c3ba +Author: Adam Jackson <a...@redhat.com> +Date: Wed Dec 30 11:27:53 2009 -0500 + + Use own thunk function instead of shadowUpdatePackedWeak + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit ad1e7b4a4cacc1a157eb533e2a55a54b386949da +Author: Adam Jackson <a...@redhat.com> +Date: Wed Dec 30 11:24:37 2009 -0500 + + Warning fix when !HAVE_ISA + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 3c73bfc96817348449e5ab6a7f7b03ac6c85bd47 +Author: Adam Jackson <a...@redhat.com> +Date: Wed Dec 30 11:23:16 2009 -0500 + + Code motion + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 2c8da9b4e703678b0f0f16edb1c48a523c8442fd +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Dec 15 21:00:15 2009 -0500 + + configure.ac: sdkdir usage duplicates the sdk include dir + + The sdkdir variable provides a duplicate copy of the include/xorg + directory. The statement is removed as this was it's only used. + In the Makefile, there is now only one instance of the -I sdkdir + The sdkdir is provided in XORG_CFLAGS. + + Acked-by: Dan Nicholson <dbn.li...@gmail.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 5833d01faac576016ac90a06ccb4af2fac23b718 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Dec 8 17:51:00 2009 -0500 + + configure.ac: remove -I$(prefix)/include from INCLUDES #24676 + + Using $prefix for any purpose will yield incorrect results + as not all modules uses the same prefix and that modules can use + different directory which is configurable. + + The main include dir comes from XORG_CFLAGS + + Reported-By: Michael Olbrich <m.olbr...@pengutronix.de> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 4509305138d04d1e2e670b6d21b54b28b69405ba +Author: Adam Jackson <a...@redhat.com> +Date: Tue Dec 1 15:25:52 2009 -0500 + + Don't artificially limit the screen size to 2k + + VBE lets you specify sizes in uint16_t. X won't work above 32k though, + so clamp to that instead of the arbitrary 2k. + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit 2fbedf7be67e98170a17118c958568439d1613cc +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Nov 23 09:25:06 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 168971773075042625b6d233192fcc0ed85183d5 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit a90aed950a5b23a6533162315e3b111b69079b3d +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1p5nmg-0005ds...@alioth.debian.org