--- xserver-xorg-video-fbdev-0.4.4.orig/autogen.sh +++ xserver-xorg-video-fbdev-0.4.4/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-fbdev-0.4.4.orig/debian/README.source +++ xserver-xorg-video-fbdev-0.4.4/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +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 using 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. --- xserver-xorg-video-fbdev-0.4.4.orig/debian/changelog +++ xserver-xorg-video-fbdev-0.4.4/debian/changelog @@ -0,0 +1,297 @@ +xserver-xorg-video-fbdev (1:0.4.4-1+rvt) stretch-staging; urgency=medium + + * Bump version number so it's higher than the raspberry pi foundation's + rebuild in their repository for jessie. + + -- Peter Michael Green Thu, 28 Apr 2016 20:57:20 +0000 + +xserver-xorg-video-fbdev (1:0.4.4-1) unstable; urgency=low + + * New upstream release. + + -- Julien Cristau Mon, 23 Sep 2013 20:23:23 +0200 + +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 + 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 Tue, 20 Aug 2013 15:19:49 +0200 + +xserver-xorg-video-fbdev (1:0.4.3-1) unstable; urgency=low + + [ Maarten Lankhorst ] + * 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). + + -- Julien Cristau Fri, 16 Aug 2013 11:35:04 +0200 + +xserver-xorg-video-fbdev (1:0.4.2-7) experimental; urgency=low + + * Build against Xserver 1.12 RC1. + + -- Cyril Brulebois Sun, 01 Jan 2012 06:06:00 +0100 + +xserver-xorg-video-fbdev (1:0.4.2-6) experimental; urgency=low + + * Rebuild against Xserver 1.10 rc3. + + -- Cyril Brulebois Fri, 25 Feb 2011 15:53:24 +0100 + +xserver-xorg-video-fbdev (1:0.4.2-5) experimental; urgency=low + + * Rebuild against Xserver 1.10 rc2. + + -- Cyril Brulebois Sun, 20 Feb 2011 07:40:28 +0100 + +xserver-xorg-video-fbdev (1:0.4.2-4) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + * Remove xsfbs accordingly. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:44:43 +0100 + +xserver-xorg-video-fbdev (1:0.4.2-3) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Wed, 13 Oct 2010 00:36:31 +0200 + +xserver-xorg-video-fbdev (1:0.4.2-2) unstable; urgency=low + + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + + -- Cyril Brulebois Mon, 03 May 2010 23:13:56 +0200 + +xserver-xorg-video-fbdev (1:0.4.2-1) unstable; urgency=low + + * New upstream release. + * Use xutils-dev (>= 1:7.5+1) in Build-Depends, since xorg-macros 1.4 is + needed for XORG_INSTALL. + + -- Cyril Brulebois Tue, 06 Apr 2010 14:38:31 +0200 + +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 + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * 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). + * 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. + + -- Cyril Brulebois Fri, 12 Mar 2010 01:32:16 +0100 + +xserver-xorg-video-fbdev (1:0.4.1-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 03:09:35 +0100 + +xserver-xorg-video-fbdev (1:0.4.0-4) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 10:00:03 +0100 + +xserver-xorg-video-fbdev (1:0.4.0-3) experimental; urgency=low + + * Cherry-pick from upstream git: Make ISA optional. + * Run autoreconf on build; build-depend on automake, libtool, xutils-dev. + * Handle parallel builds. + * Build against xserver 1.6 rc. + + -- Julien Cristau Mon, 02 Feb 2009 22:01:22 +0100 + +xserver-xorg-video-fbdev (1:0.4.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Thu, 04 Sep 2008 19:32:21 +0200 + +xserver-xorg-video-fbdev (1:0.4.0-1) unstable; urgency=low + + * New upstream release. + * Refresh patch 01_fbdev_man.diff. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Add myself to Uploaders. + * Bump debhelper compat level to 5. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on + dpkg-dev >= 1.14.17. + + -- Julien Cristau Thu, 05 Jun 2008 20:47:48 +0200 + +xserver-xorg-video-fbdev (1:0.3.1-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 16:30:50 -0400 + +xserver-xorg-video-fbdev (1:0.3.1-3) experimental; urgency=low + + [ Julien Cristau ] + * Add patch to fix minor warnings from man in fbdev(4). + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-fbdev. + + [ Brice Goglin ] + * Build against xserver 1.4. + * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-fbdev + module in the long description. + * Add myself to Uploaders, and remove Branden and Fabio with their + permission. + * Add upstream URL to debian/copyright. + * Bump Standards-Version to 3.7.2.2, no change needed. + * Pull upstream up to commit b17f9256d5958fdd45dd5fe0ce10663ef9634900. + + Fixes non-ascii character in the manpage, closes: #441829. + + -- Brice Goglin Wed, 12 Sep 2007 10:56:04 +0200 + +xserver-xorg-video-fbdev (1:0.3.1-2) experimental; urgency=low + + * Pull some minor fixes from upstream + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 21 Feb 2007 22:54:22 -0500 + +xserver-xorg-video-fbdev (1:0.3.1-1) unstable; urgency=medium + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ David Nusinow ] + * New upstream release + + Fixes Shadowfb and rotation. Closes: #389433 + + -- David Nusinow Fri, 29 Dec 2006 20:06:00 -0500 + +xserver-xorg-video-fbdev (1:0.3.0-3) unstable; urgency=low + + [ Steve Langasek ] + * Prepare for upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:57:34 -0400 + +xserver-xorg-video-fbdev (1:0.3.0-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:30 +0000 + +xserver-xorg-video-fbdev (1:0.3.0-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Mon, 7 Aug 2006 20:35:45 +0000 + +xserver-xorg-video-fbdev (1:0.1.0.5-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:33 -0500 + +xserver-xorg-video-fbdev (1:0.1.0.5-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:36:54 -0500 + +xserver-xorg-driver-fbdev (1:0.1.0.5-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 19:55:27 +1100 + +xserver-xorg-driver-fbdev (1:0.1.0.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:04:07 +1100 + +xserver-xorg-driver-fbdev (1:0.1.0.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:02:06 +1100 + +xserver-xorg-driver-fbdev (1:0.1.0.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:53:33 +1100 + +xserver-xorg-driver-fbdev (1:0.1.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:28:55 +1100 + +xserver-xorg-driver-fbdev (1:0.1.0.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:00:29 +1000 + +xserver-xorg-driver-fbdev (1:0.1.0-1) breezy; urgency=low + + * First xserver-xorg-driver-fbdev release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-fbdev-0.4.4.orig/debian/compat +++ xserver-xorg-video-fbdev-0.4.4/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-fbdev-0.4.4.orig/debian/control +++ xserver-xorg-video-fbdev-0.4.4/debian/control @@ -0,0 +1,46 @@ +Source: xserver-xorg-video-fbdev +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + quilt, + pkg-config, + xserver-xorg-dev (>= 2:1.11.99.901), + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-video-dev, + xutils-dev (>= 1:7.5+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 + +Package: xserver-xorg-video-fbdev +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- fbdev display driver + This package provides the driver for the Linux framebuffer device (aka + 'fbdev'). + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-fbdev driver module. + +Package: xserver-xorg-video-fbdev-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} +Provides: ${xviddriver:Provides} +Description: X.Org X server -- fbdev display driver + This is a udeb, or a microdeb, for the debian-installer. --- xserver-xorg-video-fbdev-0.4.4.orig/debian/copyright +++ xserver-xorg-video-fbdev-0.4.4/debian/copyright @@ -0,0 +1,26 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. --- xserver-xorg-video-fbdev-0.4.4.orig/debian/patches/02-support-building-without-xv.patch +++ xserver-xorg-video-fbdev-0.4.4/debian/patches/02-support-building-without-xv.patch @@ -0,0 +1,74 @@ +From 7065f8986434e3dcea7c317e263f8b36a27024aa Mon Sep 17 00:00:00 2001 +From: Cyril Brulebois +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(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -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]) ++AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv], ++ [Enable use of xv (default: enabled)]), ++ [USE_XV=$enableval], [USE_XV=yes]) ++ + + # Store the list of server defined optional extensions in REQUIRED_MODULES + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +@@ -79,6 +83,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. + + +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -456,6 +456,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag + return FALSE; + } + ++#if USE_XV + { + Gamma zeros = {0.0, 0.0, 0.0}; + +@@ -463,6 +464,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag + return FALSE; + } + } ++#endif + + 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"); + --- xserver-xorg-video-fbdev-0.4.4.orig/debian/patches/series +++ xserver-xorg-video-fbdev-0.4.4/debian/patches/series @@ -0,0 +1 @@ +02-support-building-without-xv.patch --- xserver-xorg-video-fbdev-0.4.4.orig/debian/rules +++ xserver-xorg-video-fbdev-0.4.4/debian/rules @@ -0,0 +1,38 @@ +#!/usr/bin/make -f + +PACKAGE = xserver-xorg-video-fbdev +OOT = --builddirectory=build + +# Clean: +override_dh_auto_clean: + dh_auto_clean + rm -rf build-main/ debian/tmp-main/ + rm -rf build-udeb/ debian/tmp-udeb/ + +# Configuration, with or without xv: +override_dh_auto_configure: + dh_auto_configure $(OOT)-main/ -- --enable-xv + dh_auto_configure $(OOT)-udeb/ -- --disable-xv + +# Build: +override_dh_auto_build: + $(MAKE) -C build-main/ + $(MAKE) -C build-udeb/ + +# Install: +override_dh_auto_install: + $(MAKE) -C build-main/ install DESTDIR=$(CURDIR)/debian/tmp-main + $(MAKE) -C build-udeb/ install DESTDIR=$(CURDIR)/debian/tmp-udeb + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp-* -name '*.la' -delete + dh_install -p$(PACKAGE) --sourcedir=debian/tmp-main --fail-missing + dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --fail-missing + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --- xserver-xorg-video-fbdev-0.4.4.orig/debian/watch +++ xserver-xorg-video-fbdev-0.4.4/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-fbdev +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-fbdev-(.*)\.tar\.gz --- xserver-xorg-video-fbdev-0.4.4.orig/debian/xserver-xorg-video-fbdev-udeb.install +++ xserver-xorg-video-fbdev-0.4.4/debian/xserver-xorg-video-fbdev-udeb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/*.so --- xserver-xorg-video-fbdev-0.4.4.orig/debian/xserver-xorg-video-fbdev.install +++ xserver-xorg-video-fbdev-0.4.4/debian/xserver-xorg-video-fbdev.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-fbdev-0.4.4.orig/debian/xserver-xorg-video-fbdev.links +++ xserver-xorg-video-fbdev-0.4.4/debian/xserver-xorg-video-fbdev.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-fbdev/script