xserver-xorg-video-fbdev: Changes to 'debian-experimental'
debian/changelog | 4 ++
debian/control | 2 -
debian/patches/01_fbdev_man.diff | 13 -------
debian/patches/02-support-building-without-xv.patch | 37 ++++++++------------
debian/patches/series | 1
5 files changed, 20 insertions(+), 37 deletions(-)
New commits:
commit 0352d8734e2966fbd0b22ccd195833e70a0da498
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 14:28:34 2012 +0200
Refresh
* Remove 01_fbdev_man.diff
- No longer applies/valid
* Refresh 02-support-building-without-xv.patch
* Bump Standards-Version to 3.9.3 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 4d0935c..4b29403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
xserver-xorg-video-fbdev (1:0.4.3-1) UNRELEASED; urgency=low
* New upstream release 0.4.3
+ * Remove 01_fbdev_man.diff
+ - No longer applies/valid
+ * Refresh 02-support-building-without-xv.patch
+ * Bump Standards-Version to 3.9.3 (no changes needed).
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 14:22:37 +0200
diff --git a/debian/control b/debian/control
index 514bb6f..9fba913 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
x11proto-render-dev,
x11proto-video-dev,
xutils-dev (>= 1:7.5+1),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
diff --git a/debian/patches/01_fbdev_man.diff b/debian/patches/01_fbdev_man.diff
deleted file mode 100644
index 10413c3..0000000
--- a/debian/patches/01_fbdev_man.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- xserver-xorg-video-fbdev.orig/man/fbdev.man
-+++ xserver-xorg-video-fbdev/man/fbdev.man
-@@ -38,8 +38,8 @@
- driver and will use it if there are no video modes configured.
- .PP
- For PCI boards you might have to add a BusID line to the Device
--section. See above for a sample line. You can use \*q\__xservername__
---scanpci\*q
-+section. See above for a sample line. You can use \*q__xservername__
-+\-scanpci\*q
- to figure out the correct values.
- .PP
- The following driver
diff --git a/debian/patches/02-support-building-without-xv.patch b/debian/patches/02-support-building-without-xv.patch
index 34fa88a..35414f0 100644
--- a/debian/patches/02-support-building-without-xv.patch
+++ b/debian/patches/02-support-building-without-xv.patch
@@ -8,22 +8,20 @@ Subject: [PATCH] Support building without XV.
src/fbdev.c | 2 ++
2 files changed, 13 insertions(+), 0 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index f76cca0..8fa2204 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -50,6 +50,10 @@ AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
+@@ -55,6 +55,10 @@
+ AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
[Enable use of libpciaccess (default: disabled)]),
[PCIACCESS=$enableval], [PCIACCESS=no])
-
+AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv],
+ [Enable use of xv (default: enabled)]),
+ [USE_XV=$enableval], [USE_XV=yes])
+
- # Checks for extensions
+
+ # Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-@@ -74,6 +78,13 @@ if test "x$PCIACCESS" = xyes; then
+@@ -79,6 +83,13 @@
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
fi
@@ -36,27 +34,22 @@ index f76cca0..8fa2204 100644
+
# Checks for libraries.
- # Checks for header files.
-diff --git a/src/fbdev.c b/src/fbdev.c
-index 149bb24..a42f282 100644
+
--- a/src/fbdev.c
+++ b/src/fbdev.c
-@@ -936,6 +936,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- fPtr->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = FBDevCloseScreen;
+@@ -456,6 +456,7 @@
+ return FALSE;
+ }
+#if USE_XV
{
- XF86VideoAdaptorPtr *ptr;
+ Gamma zeros = {0.0, 0.0, 0.0};
-@@ -944,6 +945,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- xf86XVScreenInit(pScreen,ptr,n);
- }
+@@ -463,6 +464,7 @@
+ return FALSE;
+ }
}
+#endif
- TRACE_EXIT("FBDevScreenInit");
-
---
-1.6.6.2
-
+ pScrn->progClock = TRUE;
+ pScrn->rgbBits = 8;
diff --git a/debian/patches/series b/debian/patches/series
index 9129956..c1cac1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_fbdev_man.diff
02-support-building-without-xv.patch
Reply to: