xserver-xorg-video-sunffb: Changes to 'debian-unstable'
.cvsignore | 19 -
.gitignore | 20 +
ChangeLog | 69 ++++++
configure.ac | 2
debian/changelog | 8
debian/control | 19 +
debian/rules | 14 -
debian/xsfbs/repack.sh | 32 +++
debian/xsfbs/xsfbs.mk | 29 +-
debian/xsfbs/xsfbs.sh | 66 ------
man/Makefile.am | 1
src/Makefile.am | 6
src/ffb.h | 52 ----
src/ffb_accel.c | 24 --
src/ffb_attr.c | 177 ----------------
src/ffb_dri.c | 521 -------------------------------------------------
src/ffb_drishare.h | 48 ----
src/ffb_driver.c | 63 -----
src/ffb_rcache.h | 52 ----
src/ffb_wid.c | 17 -
20 files changed, 176 insertions(+), 1063 deletions(-)
New commits:
commit 3c519b2f22f8c2fd46f22fc59c3bd99ec427838f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 18:02:49 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index a75b49b..1df61b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-sunffb (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-sunffb (1:1.2.0-1) unstable; urgency=low
* New upstream release.
* Run autoreconf on build.
* Allow builds with parallel=% in DEB_BUILD_OPTIONS.
- -- Julien Cristau <jcristau@debian.org> Mon, 04 May 2009 17:59:02 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 May 2009 18:02:46 +0200
xserver-xorg-video-sunffb (1:1.1.0-4) unstable; urgency=low
commit d1fb28387787c824e7aebb42881ecd9e625d4d06
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 18:02:10 2009 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 6912f4d..bf7aa27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+commit 18c56ae8c3f5bbb133db426e9c253d47bb72a0d4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Sep 3 15:35:42 2008 -0400
+
+ sunffb 1.2.0
+
+commit a58df3038b1913b54ca2e8ebb19ff23a7c7d1e6a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Sep 3 15:35:22 2008 -0400
+
+ Fix distcheck.
+
+commit 54c2addfceb3d8336268fa4ffcd65c418da72b0d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Aug 19 10:25:43 2008 -0400
+
+ Uninclude xf86Version.h
+
+commit 3ac0f6635abba7550e84c2becab544bf321fb285
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Mar 8 23:57:47 2008 +0100
+
+ Makefile.am: nuke RCS Id
+
+commit bd8ef525a9421d21468fb006fe98173bbac7e274
+Author: Benjamin Close <Benjamin.Close@clearchain.com>
+Date: Thu Jan 10 10:22:09 2008 +1030
+
+ Fix compilation after dri removal in the last commit
+
+ Found by: Tinderbox
+
+commit 843d93e775cd46a0e24e1a725594fa2d942f14ba
+Author: David S. Miller <davem@davemloft.net>
+Date: Fri Dec 28 23:55:06 2007 +0200
+
+ Remove DRI support to fix build after devPrivates rework
+
+ This driver uses devprivates of all kinds, but this is
+ only done in deprecated and unused code so we can simply
+ remove it all.
+
+ DRM/DRI support has been commented out for years, and was
+ done during the conversion over to XAA acceleration. This
+ code would need to be essentially rewritten to work again,
+ so we can just remove this stuff for now.
+
+ The rest were either:
+
+ 1) DRI/DRM related uses
+ 2) the private allocation code
+ 3) cases that could index to the pScrn to get the FFB private
+
+ And that's all fixed up here.
+
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 5c1e059cfed608b1f051cc8825c1243db76e8995
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 13:53:20 2007 +0200
+
+ Define FFB_*_VERSION using PACKAGE_VERSION*
+
+commit 697a0195476c9a65b5ee17ccca3eab60439ffdad
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 11:04:01 2007 -0800
+
+ renamed: .cvsignore -> .gitignore
+
commit b86a3f4662d384e3a3540340bfd5171ab2523c34
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 11:03:41 2007 -0800
diff --git a/debian/changelog b/debian/changelog
index 90f5175..a75b49b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-sunffb (1:1.1.0-5) UNRELEASED; urgency=low
+xserver-xorg-video-sunffb (1:1.2.0-1) UNRELEASED; urgency=low
+ * New upstream release.
* Run autoreconf on build.
* Allow builds with parallel=% in DEB_BUILD_OPTIONS.
commit 356b0663c1d778ebd4f19eb6322731731c7d6ac6
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 17:59:41 2009 +0200
debian/rules updates
* Run autoreconf on build.
* Allow builds with parallel=% in DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index dcf6127..90f5175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-sunffb (1:1.1.0-5) UNRELEASED; urgency=low
+
+ * Run autoreconf on build.
+ * Allow builds with parallel=% in DEB_BUILD_OPTIONS.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 May 2009 17:59:02 +0200
+
xserver-xorg-video-sunffb (1:1.1.0-4) unstable; urgency=low
* Add patch from Bernhard R. Link to fix segfault on server regen
diff --git a/debian/control b/debian/control
index 20ddcf6..5ed220d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,9 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Jurij Smakov <jurij@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends:
debhelper (>= 5),
+ automake,
+ libtool,
+ xutils-dev
pkg-config,
xserver-xorg-dev (>= 2:1.2.99.902),
x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index 7ec59b9..c86995d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -34,8 +35,8 @@ confflags += --disable-static
build: build-stamp
build-stamp: $(STAMP_DIR)/patch
dh_testdir
-
- mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ autoreconf -vfi
+ mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
@@ -54,6 +55,9 @@ clean: xsfclean
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
+ rm -f aclocal.m4 config.guess config.sub config.h.in configure
+ rm -f depcomp install-sh ltmain.sh missing
+ rm -f $$(find -name Makefile.am)
dh_clean
commit c9d67752ec02ad5198cf6569be6f86e037a74c9d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 17:58:34 2009 +0200
debian/control: wrap build deps
diff --git a/debian/control b/debian/control
index 40c6727..20ddcf6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,21 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Jurij Smakov <jurij@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-fonts-dev, x11proto-xf86dri-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libgl1-mesa-dev | libgl1-dev, quilt, dpkg-dev (>= 1.14.17)
+Build-Depends:
+ debhelper (>= 5),
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.2.99.902),
+ x11proto-core-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ x11proto-xext-dev,
+ x11proto-fonts-dev,
+ x11proto-xf86dri-dev,
+ x11proto-gl-dev,
+ libdrm-dev (>> 2.0),
+ libgl1-mesa-dev | libgl1-dev,
+ quilt,
+ dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunffb
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunffb.git
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit 18c56ae8c3f5bbb133db426e9c253d47bb72a0d4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 3 15:35:42 2008 -0400
sunffb 1.2.0
diff --git a/configure.ac b/configure.ac
index 06bfe6e..5a10b35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sunffb],
- 1.1.0,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunffb)
commit a58df3038b1913b54ca2e8ebb19ff23a7c7d1e6a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 3 15:35:22 2008 -0400
Fix distcheck.
diff --git a/src/Makefile.am b/src/Makefile.am
index 44b256e..3e10f3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,8 +48,3 @@ sunffb_drv_la_SOURCES = \
ffb_regs.h \
ffb_wid.c \
$(SPARC_ASM_SRC)
-
-if DRI
-sunffb_drv_la_SOURCES += \
- ffb_drishare.h
-endif
commit 54c2addfceb3d8336268fa4ffcd65c418da72b0d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:25:43 2008 -0400
Uninclude xf86Version.h
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index 5e329e8..4e37c6c 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -20,7 +20,6 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c,v 1.11 2002/12/06 02:44:04 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -30,7 +29,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
#include "micmap.h"
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
commit 3ac0f6635abba7550e84c2becab544bf321fb285
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 8 23:57:47 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit bd8ef525a9421d21468fb006fe98173bbac7e274
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Thu Jan 10 10:22:09 2008 +1030
Fix compilation after dri removal in the last commit
Found by: Tinderbox
diff --git a/src/Makefile.am b/src/Makefile.am
index f1832bc..44b256e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,5 @@ sunffb_drv_la_SOURCES = \
if DRI
sunffb_drv_la_SOURCES += \
- ffb_dri.c \
ffb_drishare.h
endif
commit 843d93e775cd46a0e24e1a725594fa2d942f14ba
Author: David S. Miller <davem@davemloft.net>
Date: Fri Dec 28 23:55:06 2007 +0200
Remove DRI support to fix build after devPrivates rework
This driver uses devprivates of all kinds, but this is
only done in deprecated and unused code so we can simply
remove it all.
DRM/DRI support has been commented out for years, and was
done during the conversion over to XAA acceleration. This
code would need to be essentially rewritten to work again,
so we can just remove this stuff for now.
The rest were either:
1) DRI/DRM related uses
2) the private allocation code
3) cases that could index to the pScrn to get the FFB private
And that's all fixed up here.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/src/ffb.h b/src/ffb.h
index cb21251..ea1b7fc 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -39,10 +39,6 @@
#include "ffb_regs.h"
#include "xf86sbusBus.h"
#include "ffb_dac.h"
-#ifdef XF86DRI
-#include "xf86drm.h"
-#include "ffb_drishare.h"
-#endif
#ifndef DPMS_SERVER
#define DPMS_SERVER
#endif /* DPMS_SERVER */
@@ -97,14 +93,6 @@ typedef struct {
unsigned int bits[32]; /* The stipple bits themselves */
} CreatorStippleRec, *CreatorStipplePtr;
-typedef struct {
- int type;
- unsigned int linepat;
- CreatorStipplePtr stipple;
- void (*PolySegment)(DrawablePtr, GCPtr, int, xSegment *);
- void (*Polylines)(DrawablePtr, GCPtr, int, int, DDXPointPtr);
-} CreatorPrivGCRec, *CreatorPrivGCPtr;
-
/* WID and framebuffer controls are a property of the
* window.
*/
@@ -135,12 +123,6 @@ enum ffb_chip_type {
afb_m6 /* FCS Elite3D, 6 float chips */
};
-#ifdef XF86DRI
-typedef struct {
- int index;
-} FFBConfigPrivRec, *FFBConfigPrivPtr;
-#endif
-
typedef struct {
unsigned short fifo_cache;
unsigned short rp_active;
@@ -221,16 +203,6 @@ typedef struct {
void *I2C;
struct ffb_dac_info dac_info;
-#ifdef XF86DRI
- void *pDRIInfo;
- int numVisualConfigs;
- void *pVisualConfigs;
- FFBConfigPrivPtr pVisualConfigsPriv;
- int drmSubFD;
- Bool dri_enabled;
- ffb_dri_state_t *pFfbSarea;
-#endif
-
OptionInfoPtr Options;
} FFBRec, *FFBPtr;
@@ -261,18 +233,10 @@ extern void FFBWidFree(FFBPtr, unsigned int);
extern unsigned int FFBWidUnshare(FFBPtr, unsigned int);
extern unsigned int FFBWidReshare(FFBPtr, unsigned int);
extern void FFBWidChangeBuffer(FFBPtr, unsigned int, int);
-extern Bool FFBWidIsShared(FFBPtr pFfb, unsigned int wid);
/* Accelerated double-buffering. */
extern Bool FFBDbePreInit(ScreenPtr);
-#ifdef XF86DRI
-/* DRI support */
-extern Bool FFBDRIScreenInit(ScreenPtr);
-extern Bool FFBDRIFinishScreenInit(ScreenPtr);
-extern void FFBDRICloseScreen(ScreenPtr);
-#endif
-
/* The fastfill and pagefill buffer sizes change based upon
* the resolution.
*/
@@ -290,24 +254,8 @@ extern struct fastfill_parms ffb_fastfill_parms[];
#define FFB_FFPARMS(__fpriv) (ffb_fastfill_parms[(__fpriv)->ffb_res])
-extern int CreatorScreenPrivateIndex;
-extern int CreatorGCPrivateIndex;
-extern int CreatorWindowPrivateIndex;
-
#define GET_FFB_FROM_SCRN(p) ((FFBPtr)((p)->driverPrivate))
-#define GET_FFB_FROM_SCREEN(s) \
-((FFBPtr)(s)->devPrivates[CreatorScreenPrivateIndex].ptr)
-
-#define CreatorGetGCPrivate(g) \
-((CreatorPrivGCPtr) (g)->devPrivates [CreatorGCPrivateIndex].ptr)
-
-#define CreatorGetWindowPrivate(w) \
-((CreatorPrivWinPtr) (w)->devPrivates[CreatorWindowPrivateIndex].ptr)
-
-#define CreatorSetWindowPrivate(w,p) \
-((w)->devPrivates[CreatorWindowPrivateIndex].ptr = (pointer) p)
-
#undef DEBUG_FFB
#ifdef DEBUG_FFB
diff --git a/src/ffb_accel.c b/src/ffb_accel.c
index b9cb053..b8ad1d0 100644
--- a/src/ffb_accel.c
+++ b/src/ffb_accel.c
@@ -44,11 +44,6 @@
#include "ffb_loops.h"
#include "ffb_regs.h"
-int CreatorScreenPrivateIndex;
-int CreatorGCPrivateIndex;
-int CreatorWindowPrivateIndex;
-int CreatorGeneration;
-
/* Indexed by ffb resolution enum. */
struct fastfill_parms ffb_fastfill_parms[] = {
/* fsmall, psmall, ffh, ffw, pfh, pfw */
@@ -61,7 +56,8 @@ struct fastfill_parms ffb_fastfill_parms[] = {
void
CreatorVtChange (ScreenPtr pScreen, int enter)
{
- FFBPtr pFfb = GET_FFB_FROM_SCREEN (pScreen);
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ FFBPtr pFfb = GET_FFB_FROM_SCRN (pScrn);
ffb_fbcPtr ffb = pFfb->regs;
pFfb->rp_active = 1;
@@ -847,22 +843,6 @@ Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb)
XAAInfoRecPtr infoRec;
ffb_fbcPtr ffb = pFfb->regs;
- if (serverGeneration != CreatorGeneration) {
- CreatorScreenPrivateIndex = AllocateScreenPrivateIndex ();
- if (CreatorScreenPrivateIndex == -1)
- return FALSE;
- CreatorGCPrivateIndex = AllocateGCPrivateIndex ();
- CreatorWindowPrivateIndex = AllocateWindowPrivateIndex ();
- CreatorGeneration = serverGeneration;
- }
-
- if (!AllocateGCPrivate(pScreen, CreatorGCPrivateIndex, sizeof(CreatorPrivGCRec)))
- return FALSE;
- if (!AllocateWindowPrivate(pScreen, CreatorWindowPrivateIndex, 0))
- return FALSE;
-
- pScreen->devPrivates[CreatorScreenPrivateIndex].ptr = pFfb;
-
pFfb->xaa_fbc = (FFB_FBC_WB_A | FFB_FBC_WM_COMBINED | FFB_FBC_RB_A |
FFB_FBC_WE_FORCEON |
FFB_FBC_SB_BOTH |
diff --git a/src/ffb_attr.c b/src/ffb_attr.c
index 7b0d375..e1a3771 100644
--- a/src/ffb_attr.c
+++ b/src/ffb_attr.c
@@ -81,180 +81,3 @@ void __FFB_Attr_SFB_VAR(FFBPtr pFfb, unsigned int ppc, unsigned int ppc_mask, un
ffb->rop = rop;
ffb->pmask = pmask;
}
-
-#define NEED_PPC 0x00000001
-#define NEED_PMASK 0x00000002
-#define NEED_ROP 0x00000004
-#define NEED_DRAWOP 0x00000008
-#define NEED_FG 0x00000010
-#define NEED_BG 0x00000020
-#define NEED_FBC 0x00000040
-#define NEED_WID 0x00000080
-
-void __FFB_Attr_GC(FFBPtr pFfb, GCPtr pGC, WindowPtr pWin, unsigned int ppc, int drawop)
-{
- ffb_fbcPtr ffb = pFfb->regs;
- unsigned int rop, need_mask, need_count;
-
- need_mask = need_count = 0;
- if ((pFfb->ppc_cache & FFB_PPC_GCMASK) != ppc) {
- unsigned int newppc = pFfb->ppc_cache & ~FFB_PPC_GCMASK;
-
- newppc |= (ppc & FFB_PPC_GCMASK);
- pFfb->ppc_cache = newppc;
- need_mask |= NEED_PPC;
- need_count++;
- }
-
- if (pFfb->pmask_cache != pGC->planemask) {
- pFfb->pmask_cache = pGC->planemask;
- need_mask |= NEED_PMASK;
- need_count++;
- }
-
- rop = (pGC->alu | FFB_ROP_EDIT_BIT)|(FFB_ROP_NEW<<8);
- if (pFfb->rop_cache != rop) {
- pFfb->rop_cache = rop;
- need_mask |= NEED_ROP;
- need_count++;
- }
-
- if (pFfb->drawop_cache != drawop) {
- pFfb->drawop_cache = drawop;
- need_mask |= NEED_DRAWOP;
- need_count++;
- }
-
- if (pFfb->fg_cache != pGC->fgPixel) {
- pFfb->fg_cache = pGC->fgPixel;
- need_mask |= NEED_FG;
- need_count++;
- }
-
- {
- CreatorPrivWinPtr WinPriv = CreatorGetWindowPrivate(pWin);
- unsigned int fbc = WinPriv->fbc_base;
-
- fbc &= ~FFB_FBC_XE_MASK;
- fbc |= FFB_FBC_XE_OFF;
-
- if (pFfb->fbc_cache != fbc) {
- pFfb->fbc_cache = fbc;
- need_mask |= NEED_FBC;
- need_count++;
- }
-
- }
- pFfb->rp_active = 1;
-
- FFBLOG(("WRATTRS_GC: PPC[%08x:%08x] PMSK[%08x] ROP[%08x] "
- "DOP[%08x] FG[%08x] FBC[%08x]\n",
- pFfb->ppc_cache & FFB_PPC_GCMASK, FFB_PPC_GCMASK,
- pFfb->pmask_cache, pFfb->rop_cache,
- pFfb->drawop_cache, pFfb->fg_cache, pFfb->fbc_cache));
-
- FFBFifo(pFfb, need_count);
- if (need_mask & NEED_PPC)
- ffb->ppc = (pFfb->ppc_cache & FFB_PPC_GCMASK);
- if (need_mask & NEED_PMASK)
- ffb->pmask = pFfb->pmask_cache;
- if (need_mask & NEED_ROP)
- ffb->rop = pFfb->rop_cache;
- if (need_mask & NEED_DRAWOP)
- ffb->drawop = pFfb->drawop_cache;
- if (need_mask & NEED_FG)
- ffb->fg = pFfb->fg_cache;
- if (need_mask & NEED_FBC)
- ffb->fbc = pFfb->fbc_cache;
-}
-
-void __FFB_Attr_FastfillWin(FFBPtr pFfb, WindowPtr pWin,
- unsigned int ppc, unsigned int pixel)
-{
- ffb_fbcPtr ffb = pFfb->regs;
- unsigned int rop, need_mask, need_count;
-
- need_mask = need_count = 0;
- if ((pFfb->ppc_cache & FFB_PPC_WINMASK) != ppc) {
- unsigned int newppc = pFfb->ppc_cache & ~FFB_PPC_WINMASK;
-
- newppc |= (ppc & FFB_PPC_WINMASK);
- pFfb->ppc_cache = newppc;
- need_mask |= NEED_PPC;
- need_count++;
- }
-
- if (pFfb->pmask_cache != 0x00ffffff) {
- pFfb->pmask_cache = 0x00ffffff;
- need_mask |= NEED_PMASK;
- need_count++;
- }
-
- rop = FFB_ROP_NEW | (FFB_ROP_NEW<<8);
- if (pFfb->rop_cache != rop) {
- pFfb->rop_cache = rop;
- need_mask |= NEED_ROP;
- need_count++;
- }
-
- if (pFfb->drawop_cache != FFB_DRAWOP_FASTFILL) {
- pFfb->drawop_cache = FFB_DRAWOP_FASTFILL;
- need_mask |= NEED_DRAWOP;
- need_count++;
- }
-
- if (pFfb->fg_cache != pixel) {
- pFfb->fg_cache = pixel;
- need_mask |= NEED_FG;
- need_count++;
- }
-
- {
- CreatorPrivWinPtr pWinPriv = CreatorGetWindowPrivate(pWin);
- unsigned int fbc = pWinPriv->fbc_base;
-
- if (pFfb->has_double_buffer) {
- fbc &= ~FFB_FBC_WB_MASK;
- fbc |= FFB_FBC_WB_AB;
- }
- fbc &= ~(FFB_FBC_XE_MASK | FFB_FBC_RGBE_MASK);
- fbc |= FFB_FBC_XE_ON | FFB_FBC_RGBE_ON;
- if (pFfb->ffb_res == ffb_res_high)
- fbc |= FFB_FBC_WB_B;
-
- if (pFfb->fbc_cache != fbc) {
- pFfb->fbc_cache = fbc;
- need_mask |= NEED_FBC;
- need_count++;
- }
-
- if (pFfb->wid_cache != pWinPriv->wid) {
- pFfb->wid_cache = pWinPriv->wid;
- need_mask |= NEED_WID;
- need_count++;
- }
- }
-
- pFfb->rp_active = 1;
-
- FFBLOG(("WRATTRS_GC: PPC[%08x:%08x] PMSK[%08x] ROP[%08x] DOP[%08x] FG[%08x] FBC[%08x] WID[%02x]\n",
- pFfb->ppc_cache & FFB_PPC_WINMASK, FFB_PPC_WINMASK,
- pFfb->pmask_cache, pFfb->rop_cache,
- pFfb->drawop_cache, pFfb->fg_cache, pFfb->fbc_cache, pFfb->wid_cache));
-
- FFBFifo(pFfb, need_count);
- if (need_mask & NEED_PPC)
- ffb->ppc = (pFfb->ppc_cache & FFB_PPC_WINMASK);
- if (need_mask & NEED_PMASK)
- ffb->pmask = pFfb->pmask_cache;
- if (need_mask & NEED_ROP)
- ffb->rop = pFfb->rop_cache;
- if (need_mask & NEED_DRAWOP)
- ffb->drawop = pFfb->drawop_cache;
- if (need_mask & NEED_FG)
- ffb->fg = pFfb->fg_cache;
- if (need_mask & NEED_FBC)
- ffb->fbc = pFfb->fbc_cache;
- if (need_mask & NEED_WID)
- ffb->wid = pFfb->wid_cache;
-}
diff --git a/src/ffb_dri.c b/src/ffb_dri.c
Reply to: