xserver-xorg-video-vesa: Changes to 'debian-unstable'
ChangeLog | 35 +++++++++++++++++++++++
configure.ac | 14 ++++++++-
debian/README.source | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 8 +++++
debian/control | 4 +-
debian/xsfbs/xsfbs.sh | 12 --------
src/vesa.c | 12 ++++++++
src/vesa.h | 7 +++-
8 files changed, 148 insertions(+), 17 deletions(-)
New commits:
commit c23dc8edb331bb2bca96e18a78b166f26b43466f
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 09:53:26 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index f197cf5..add5e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-vesa (1:2.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.2.1-1) unstable; urgency=low
* New upstream release.
* Add README.source, bump Standards-Version to 3.8.2.
+ * Add myself to Uploaders.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 09:56:12 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 09:56:47 +0200
xserver-xorg-video-vesa (1:2.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ec94b85..a1f018a 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 <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 5587bebd6f3509ca09d3214c67fa43dc81a5910b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 09:52:35 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index f314f01..e22594d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit fdf653a99f53306efcd48658caf657af48ea916d
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:30 2009 +1000
+
+ vesa: bump for release 2.2.1
+
+commit 869a9c8058c16734af5c8771a0c32df0be7bba36
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:42 2009 +1000
+
+ vesa: change to using ABI version check
+
+commit aad538f06852e5bf011597a574785d525ed1b0c4
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:40 2009 +1000
+
+ vesa: update for resources/RAC API removal
+
+commit 49f6a2f902473692f6541ee32e018b64d74e7ece
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:58:39 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 69b3eb4f8a9b93f1b2a73e395d4d7c29c6c18b41
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Feb 26 14:33:52 2009 -0500
+
+ Attempt VBE PanelID if DDC fails
+
commit 68ca3d10ab33ee2347928b0340198aff4f620144
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 17 18:04:29 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index 60cfd67..f197cf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-vesa (1:2.2.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-vesa (1:2.2.1-1) UNRELEASED; urgency=low
+ * New upstream release.
* Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 09:51:46 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 09:56:12 +0200
xserver-xorg-video-vesa (1:2.2.0-1) unstable; urgency=low
commit a4ace26112f032f2e5ae408f11a901b2c5caddf7
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 09:52:12 2009 +0200
Bump Standards-Version to 3.8.2 now that we have README.source
diff --git a/debian/changelog b/debian/changelog
index 60ad184..60cfd67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vesa (1:2.2.0-2) UNRELEASED; urgency=low
+
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 09:51:46 +0200
+
xserver-xorg-video-vesa (1:2.2.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index eb26b86..ec94b85 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
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 fdf653a99f53306efcd48658caf657af48ea916d
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:30 2009 +1000
vesa: bump for release 2.2.1
diff --git a/configure.ac b/configure.ac
index d63939a..1444d07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vesa],
- 2.2.0,
+ 2.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vesa)
commit 869a9c8058c16734af5c8771a0c32df0be7bba36
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:42 2009 +1000
vesa: change to using ABI version check
diff --git a/src/vesa.h b/src/vesa.h
index 11933f4..d5c69a9 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -36,7 +36,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit aad538f06852e5bf011597a574785d525ed1b0c4
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:40 2009 +1000
vesa: update for resources/RAC API removal
diff --git a/src/vesa.h b/src/vesa.h
index 1b8f4e5..11933f4 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -35,7 +35,11 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
+
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
/* All drivers need this */
@@ -66,8 +70,7 @@
/* Dga definitions */
#include "dgaproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
+
#include "fb.h"
commit 49f6a2f902473692f6541ee32e018b64d74e7ece
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:58:39 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 674e985..d63939a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
save_CFLAGS="$CFLAGS"
diff --git a/src/vesa.c b/src/vesa.c
index 377736b..ff0601c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -59,8 +59,13 @@
#include "xf86Modes.h"
/* DPMS */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/* Mandatory functions */
static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid);
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+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
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit 69b3eb4f8a9b93f1b2a73e395d4d7c29c6c18b41
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 26 14:33:52 2009 -0500
Attempt VBE PanelID if DDC fails
diff --git a/configure.ac b/configure.ac
index 090be35..674e985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,14 @@ CFLAGS="$save_CFLAGS"
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(VBEReadPanelID,
+ [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])],
+ [],
+ [#include "vbe.h"])
+CFLAGS="$save_CFLAGS"
+
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
[#include "xorg-server.h"])
diff --git a/src/vesa.c b/src/vesa.c
index aee5018..377736b 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -671,6 +671,13 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
if ((pScrn->monitor->DDC = pVesa->monitor) != NULL)
xf86SetDDCproperties(pScrn, pVesa->monitor);
+#ifdef HAVE_PANELID
+ else {
+ void *panelid = VBEReadPanelID(pVesa->pVbe);
+ VBEInterpretPanelID(pScrn->scrnIndex, panelid);
+ xfree(panelid);
+ }
+#endif
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
"Searching for matching VESA mode(s):\n");
Reply to: