debian/changelog | 15 ++++ debian/control | 13 +++- debian/patches/02-support-building-without-xv.patch | 62 ++++++++++++++++++++ debian/patches/series | 1 debian/rules | 21 ++++-- debian/xserver-xorg-video-fbdev-udeb.install | 1 src/fbdev.c | 1 7 files changed, 104 insertions(+), 10 deletions(-)
New commits: commit dc4fc787dc0e1fed1b7705759c564035a2a477e7 Author: Cyril Brulebois <k...@debian.org> Date: Fri Mar 12 01:33:02 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 4db48d2..93bca69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low +xserver-xorg-video-fbdev (1:0.4.1-2) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -15,7 +15,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). * Add myself to Uploaders. - -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 + -- Cyril Brulebois <k...@debian.org> Fri, 12 Mar 2010 01:32:16 +0100 xserver-xorg-video-fbdev (1:0.4.1-1) experimental; urgency=low commit 6ae8f98ed44a0f06a3c74c21b4ceb1cc923c0277 Author: Cyril Brulebois <k...@debian.org> Date: Fri Mar 12 01:32:11 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index d186fa4..4db48d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low built with XV disabled). * Build two flavours, one for the main package and one for the udeb. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + * Add myself to Uploaders. -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 diff --git a/debian/control b/debian/control index a169edf..b8608d6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-fbdev 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), quilt, commit 81c91ed0fa105ef4b265b8f7ac03836caaec5c1d Author: Cyril Brulebois <k...@debian.org> Date: Fri Mar 12 01:30:42 2010 +0100 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 7e5f895..d186fa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low * Add patch to support building with XV disabled (the server might be built with XV disabled). * Build two flavours, one for the main package and one for the udeb. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 diff --git a/debian/control b/debian/control index a12e4f9..a169edf 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 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 commit 6ea8b9d22d2b7a7e8fcaf4d09a7e44d285e6b0bd Author: Cyril Brulebois <k...@debian.org> Date: Sun Feb 28 00:07:28 2010 +0100 Use XC-Package-Type to save some memory. diff --git a/debian/control b/debian/control index 10b97e1..a12e4f9 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Description: X.Org X server -- fbdev display driver This package is built from the X.org xf86-video-fbdev driver module. Package: xserver-xorg-video-fbdev-udeb -Package-Type: udeb +XC-Package-Type: udeb Section: debian-installer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} commit 97f609305828a21cdaa54f66965a7b8da275fb23 Author: Cyril Brulebois <k...@debian.org> Date: Sun Feb 14 05:17:28 2010 +0000 Build an XV-free flavour for the udeb. diff --git a/debian/changelog b/debian/changelog index 8f231dc..7e5f895 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low * Backport “Fixes crash in CloseScreen().” by Julien Cristau. * Add patch to support building with XV disabled (the server might be built with XV disabled). + * Build two flavours, one for the main package and one for the udeb. -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 diff --git a/debian/rules b/debian/rules index e0809de..4d1c52e 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,11 @@ endif # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so confflags += --disable-static +common_confflags = \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + configure: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi @@ -41,11 +46,11 @@ build-stamp: configure dh_testdir test -d build || mkdir build - cd build && \ - ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(confflags) \ - CFLAGS="$(CFLAGS)" + test -d build-udeb || mkdir build-udeb + cd build && ../configure --enable-xv $(common_confflags) + cd build-udeb && ../configure --disable-xv $(common_confflags) cd build && $(MAKE) + cd build-udeb && $(MAKE) >$@ clean: xsfclean @@ -57,7 +62,8 @@ clean: xsfclean rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf build + rm -rf build build-udeb + rm -rf debian/tmp debian/tmp-udeb rm -f aclocal.m4 config.guess config.sub config.h.in configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs rm -f $$(find -name Makefile.in) @@ -68,9 +74,11 @@ install: build dh_testdir dh_testroot dh_clean -k + rm -rf debian/tmp-udeb dh_installdirs cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp-udeb install # Build architecture-dependent files here. binary-arch: build install serverabi @@ -79,7 +87,8 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog - dh_install --sourcedir=debian/tmp --list-missing + dh_install -p$(PACKAGE) --sourcedir=debian/tmp --list-missing + dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --list-missing dh_link dh_strip dh_compress commit 15896c3f60e99d807dbce43b2a2d1e988a3c1356 Author: Cyril Brulebois <k...@debian.org> Date: Mon Feb 15 00:58:25 2010 +0100 Add patch to support building with XV disabled. diff --git a/debian/changelog b/debian/changelog index 9416b8e..8f231dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low * Add udeb needed for the graphical installer: xserver-xorg-video-fbdev-udeb. * Backport “Fixes crash in CloseScreen().” by Julien Cristau. + * Add patch to support building with XV disabled (the server might be + built with XV disabled). -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 diff --git a/debian/patches/02-support-building-without-xv.patch b/debian/patches/02-support-building-without-xv.patch new file mode 100644 index 0000000..34fa88a --- /dev/null +++ b/debian/patches/02-support-building-without-xv.patch @@ -0,0 +1,62 @@ +From 7065f8986434e3dcea7c317e263f8b36a27024aa Mon Sep 17 00:00:00 2001 +From: Cyril Brulebois <k...@debian.org> +Date: Sun, 14 Feb 2010 04:46:12 +0000 +Subject: [PATCH] Support building without XV. + +--- + configure.ac | 11 +++++++++++ + 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], + [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 + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +@@ -74,6 +78,13 @@ if test "x$PCIACCESS" = xyes; then + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" + fi + ++AM_CONDITIONAL(USE_XV, [test "xUSE_XV" = xyes]) ++if test "x$USE_XV" = xyes; then ++ AC_DEFINE(USE_XV, 1, [Use XV]) ++else ++ AC_DEFINE(USE_XV, 0, [Do not use XV]) ++fi ++ + # 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; + ++#if USE_XV + { + XF86VideoAdaptorPtr *ptr; + +@@ -944,6 +945,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + xf86XVScreenInit(pScreen,ptr,n); + } + } ++#endif + + TRACE_EXIT("FBDevScreenInit"); + +-- +1.6.6.2 + diff --git a/debian/patches/series b/debian/patches/series index f6e5688..9129956 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_fbdev_man.diff +02-support-building-without-xv.patch commit f2e5fe02549798d43c6989d80dd12b36e415865d Author: Cyril Brulebois <k...@debian.org> Date: Sun Feb 7 20:41:48 2010 +0000 Fixes crash in CloseScreen(). diff --git a/debian/changelog b/debian/changelog index 884d875..9416b8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low [ Cyril Brulebois ] * Add udeb needed for the graphical installer: xserver-xorg-video-fbdev-udeb. + * Backport “Fixes crash in CloseScreen().” by Julien Cristau. -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 diff --git a/src/fbdev.c b/src/fbdev.c index 0ba0743..149bb24 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -959,6 +959,7 @@ FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen) fbdevHWRestore(pScrn); fbdevHWUnmapVidmem(pScrn); if (fPtr->shadow) { + shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); xfree(fPtr->shadow); fPtr->shadow = NULL; } commit c3d9c9c1c45814c694594a0d034e916926a38b4d Author: Cyril Brulebois <k...@debian.org> Date: Sat Feb 6 23:36:38 2010 +0000 Add udeb needed for the graphical installer: xserver-xorg-video-fbdev-udeb. diff --git a/debian/changelog b/debian/changelog index 06efbcf..884d875 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ xserver-xorg-video-fbdev (1:0.4.1-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Cyril Brulebois ] + * Add udeb needed for the graphical installer: + xserver-xorg-video-fbdev-udeb. + -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:05:49 +0100 xserver-xorg-video-fbdev (1:0.4.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 21201cf..10b97e1 100644 --- a/debian/control +++ b/debian/control @@ -37,3 +37,12 @@ Description: X.Org X server -- fbdev display driver <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-video-fbdev driver module. + +Package: xserver-xorg-video-fbdev-udeb +Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Provides: ${xviddriver:Provides} +Description: X.Org X server -- fbdev display driver + This is a udeb, or a microdeb, for the debian-installer. diff --git a/debian/xserver-xorg-video-fbdev-udeb.install b/debian/xserver-xorg-video-fbdev-udeb.install new file mode 100644 index 0000000..daf7bfe --- /dev/null +++ b/debian/xserver-xorg-video-fbdev-udeb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/*.so -- 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/e1npsy7-0004ob...@alioth.debian.org