debian/changelog | 10 +++++++ debian/patches/02-support-building-without-xv.patch | 27 +++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-)
New commits: commit 6734a2f8a6c0ef09dcb5685d2abc22b48417b107 Author: Cyril Brulebois <k...@debian.org> Date: Tue Aug 20 15:20:20 2013 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 357139b..e94d699 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-fbdev (1:0.4.3-2) UNRELEASED; urgency=low +xserver-xorg-video-fbdev (1:0.4.3-2) unstable; urgency=low * Make sure not to enable XV support in the udeb: XV comes from xorg-server.h and tells us whether the regular server was built with @@ -6,7 +6,7 @@ xserver-xorg-video-fbdev (1:0.4.3-2) UNRELEASED; urgency=low the driver should be built with XV support (Closes: #720313). Thanks, Steven Chamberlain! - -- Cyril Brulebois <k...@debian.org> Tue, 20 Aug 2013 14:46:26 +0200 + -- Cyril Brulebois <k...@debian.org> Tue, 20 Aug 2013 15:19:49 +0200 xserver-xorg-video-fbdev (1:0.4.3-1) unstable; urgency=low commit 9ab5f84a1413ae275c66b264b07230359b64bffb Author: Cyril Brulebois <k...@debian.org> Date: Tue Aug 20 15:19:03 2013 +0200 Make sure not to enable XV support in the udeb (Closes: #720313). XV comes from xorg-server.h and tells us whether the regular server was built with XV support. USE_XV is used to determine whether a given flavour of the driver should be built with XV support. Thanks, Steven Chamberlain! diff --git a/debian/changelog b/debian/changelog index 7f24458..357139b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xserver-xorg-video-fbdev (1:0.4.3-2) UNRELEASED; urgency=low + + * Make sure not to enable XV support in the udeb: XV comes from + xorg-server.h and tells us whether the regular server was built with + XV support. USE_XV is used to determine whether a given flavour of + the driver should be built with XV support (Closes: #720313). Thanks, + Steven Chamberlain! + + -- Cyril Brulebois <k...@debian.org> Tue, 20 Aug 2013 14:46:26 +0200 + xserver-xorg-video-fbdev (1:0.4.3-1) unstable; urgency=low [ Maarten Lankhorst ] diff --git a/debian/patches/02-support-building-without-xv.patch b/debian/patches/02-support-building-without-xv.patch index 35414f0..ce12cb6 100644 --- a/debian/patches/02-support-building-without-xv.patch +++ b/debian/patches/02-support-building-without-xv.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Support building without XV. --- a/configure.ac +++ b/configure.ac -@@ -55,6 +55,10 @@ +@@ -55,6 +55,10 @@ AC_ARG_WITH(xorg-module-dir, AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Enable use of libpciaccess (default: disabled)]), [PCIACCESS=$enableval], [PCIACCESS=no]) @@ -21,7 +21,7 @@ Subject: [PATCH] Support building without XV. # Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -@@ -79,6 +83,13 @@ +@@ -79,6 +83,13 @@ if test "x$PCIACCESS" = xyes; then XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" fi @@ -37,7 +37,7 @@ Subject: [PATCH] Support building without XV. --- a/src/fbdev.c +++ b/src/fbdev.c -@@ -456,6 +456,7 @@ +@@ -456,6 +456,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag return FALSE; } @@ -45,7 +45,7 @@ Subject: [PATCH] Support building without XV. { Gamma zeros = {0.0, 0.0, 0.0}; -@@ -463,6 +464,7 @@ +@@ -463,6 +464,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag return FALSE; } } @@ -53,3 +53,22 @@ Subject: [PATCH] Support building without XV. pScrn->progClock = TRUE; pScrn->rgbBits = 8; +@@ -897,7 +899,10 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) + fPtr->CloseScreen = pScreen->CloseScreen; + pScreen->CloseScreen = FBDevCloseScreen; + ++/* Whether the server was built with XV support */ + #if XV ++/* Whether the driver should be built with XV support */ ++#if USE_XV + { + XF86VideoAdaptorPtr *ptr; + +@@ -907,6 +912,7 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + #endif ++#endif + + TRACE_EXIT("FBDevScreenInit"); + -- 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/e1vbm3z-0007tn...@vasks.debian.org