xserver-xorg-video-sisusb: Changes to 'upstream-experimental'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
man/Makefile.am | 1 -
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/sisusb.h | 10 ++++------
src/sisusb_accel.c | 2 --
src/sisusb_accel.h | 2 --
src/sisusb_cursor.c | 2 --
src/sisusb_cursor.h | 2 --
src/sisusb_dac.c | 2 --
src/sisusb_dac.h | 2 --
src/sisusb_driver.c | 6 ++----
src/sisusb_driver.h | 2 --
src/sisusb_init.c | 2 --
src/sisusb_init.h | 2 --
src/sisusb_opt.c | 2 --
src/sisusb_osdef.h | 2 --
src/sisusb_regs.h | 2 --
src/sisusb_setup.c | 2 --
src/sisusb_shadow.c | 2 --
src/sisusb_struct.h | 2 --
src/sisusb_types.h | 2 --
src/sisusb_utility.c | 2 --
src/sisusb_vga.c | 2 --
src/sisusb_video.c | 2 --
src/sisusb_video.h | 2 --
src/sisusb_videostr.h | 2 --
31 files changed, 35 insertions(+), 81 deletions(-)
New commits:
commit d4b0b8ebba1e8cc2e1b270ff229782ae05b034ac
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:36:15 2008 -0400
sisusb 0.9.0
diff --git a/configure.ac b/configure.ac
index 9045a62..9eaf057 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.8.1,
+ 0.9.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
commit 4e73725b6adc1637fb8d13b02e59b9493c5ea9a7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:34:48 2008 -0400
open() is not fopen(). Use O_RDONLY, not 'r'.
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 7969637..ec7fe81 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -507,7 +507,7 @@ SiSUSB_SiSFB_Lock(ScrnInfoPtr pScrn, Bool lock)
if(!pSiSUSB->sisfbfound) return;
if(!pSiSUSB->sisfb_havelock) return;
- if((fd = open(pSiSUSB->sisfbdevname, 'r')) != -1) {
+ if((fd = open(pSiSUSB->sisfbdevname, O_RDONLY)) != -1) {
parm = lock ? 1 : 0;
ioctl(fd, SISUSBFB_SET_LOCK, &parm);
close(fd);
@@ -930,7 +930,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
sprintf(name, "/dev/fb/%1d", i-8);
}
- if((fd = open(name, 'r')) != -1) {
+ if((fd = open(name, O_RDONLY)) != -1) {
Bool gotit = FALSE;
commit e70cfd55c7562ea37c2b7d4ab9c70d7dd3f2189e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:33:49 2008 -0400
Death to RCS tags.
diff --git a/src/sisusb.h b/src/sisusb.h
index fef0ae3..b5126f6 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb.h,v 1.16 2006/04/07 21:10:49 ajax Exp $ */
/*
* Main global data and definitions
*
diff --git a/src/sisusb_accel.c b/src/sisusb_accel.c
index e7b2b9d..d9c0665 100644
--- a/src/sisusb_accel.c
+++ b/src/sisusb_accel.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* 2D Acceleration for SiS 315/USB - not functional!
*
diff --git a/src/sisusb_accel.h b/src/sisusb_accel.h
index e214532..da02aaf 100644
--- a/src/sisusb_accel.h
+++ b/src/sisusb_accel.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* 2D Acceleration for SiS 315/USB
* Definitions for the SIS engine communication.
diff --git a/src/sisusb_cursor.c b/src/sisusb_cursor.c
index 71bb580..1de1554 100644
--- a/src/sisusb_cursor.c
+++ b/src/sisusb_cursor.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS 315/USB hardware cursor handling
*
diff --git a/src/sisusb_cursor.h b/src/sisusb_cursor.h
index 81542c3..a184814 100644
--- a/src/sisusb_cursor.h
+++ b/src/sisusb_cursor.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiSUSB hardware cursor handling definitions
*
diff --git a/src/sisusb_dac.c b/src/sisusb_dac.c
index 4955bb7..5e3eb7f 100644
--- a/src/sisusb_dac.c
+++ b/src/sisusb_dac.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
*
diff --git a/src/sisusb_dac.h b/src/sisusb_dac.h
index 2b616e2..462e571 100644
--- a/src/sisusb_dac.h
+++ b/src/sisusb_dac.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
* Definitions and prototypes
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 6f96263..7969637 100644
--- a/src/sisusb_driver.c
+++ b/src/sisusb_driver.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiSUSB driver main code
*
diff --git a/src/sisusb_driver.h b/src/sisusb_driver.h
index 842f911..eb7d9e0 100644
--- a/src/sisusb_driver.h
+++ b/src/sisusb_driver.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Global data and definitions
*
diff --git a/src/sisusb_init.c b/src/sisusb_init.c
index 88b4154..ba44431 100644
--- a/src/sisusb_init.c
+++ b/src/sisusb_init.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Mode initializing code (CRT1 section) for SiS315/USB
* (Universal module for Linux kernel framebuffer and X.org/XFree86 4.x)
diff --git a/src/sisusb_init.h b/src/sisusb_init.h
index 1c81904..79b1331 100644
--- a/src/sisusb_init.h
+++ b/src/sisusb_init.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Data and prototypes for init.c
*
diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c
index fdc64c6..491d1ce 100644
--- a/src/sisusb_opt.c
+++ b/src/sisusb_opt.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiSUSB driver option evaluation
*
diff --git a/src/sisusb_osdef.h b/src/sisusb_osdef.h
index 2da19db..2d938ad 100644
--- a/src/sisusb_osdef.h
+++ b/src/sisusb_osdef.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* OS depending defines
*
diff --git a/src/sisusb_regs.h b/src/sisusb_regs.h
index d299924..064132c 100644
--- a/src/sisusb_regs.h
+++ b/src/sisusb_regs.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Register access macros and register definitions
*
diff --git a/src/sisusb_setup.c b/src/sisusb_setup.c
index 3824425..67fc963 100644
--- a/src/sisusb_setup.c
+++ b/src/sisusb_setup.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Basic hardware and memory detection
*
diff --git a/src/sisusb_shadow.c b/src/sisusb_shadow.c
index 4052aed..e04cadd 100644
--- a/src/sisusb_shadow.c
+++ b/src/sisusb_shadow.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS USB driver shadow framebuffer handling
*
diff --git a/src/sisusb_struct.h b/src/sisusb_struct.h
index 232faf1..2858f56 100644
--- a/src/sisusb_struct.h
+++ b/src/sisusb_struct.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* General structure definitions for universal mode switching modules
*
diff --git a/src/sisusb_types.h b/src/sisusb_types.h
index 666c7f3..04d9ff9 100644
--- a/src/sisusb_types.h
+++ b/src/sisusb_types.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* General type definitions for universal mode switching modules
*
diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c
index 57f472a..07477db 100644
--- a/src/sisusb_utility.c
+++ b/src/sisusb_utility.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiSUSB driver utility interface & routines
*
diff --git a/src/sisusb_vga.c b/src/sisusb_vga.c
index 3158005..404a2b1 100644
--- a/src/sisusb_vga.c
+++ b/src/sisusb_vga.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Mode setup and basic video bridge detection
*
diff --git a/src/sisusb_video.c b/src/sisusb_video.c
index 9ca01b8..13db9c3 100644
--- a/src/sisusb_video.c
+++ b/src/sisusb_video.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_video.c,v 1.8 2005/07/11 02:30:00 ajax Exp $ */
/*
* Xv driver for SiS 315 USB
*
diff --git a/src/sisusb_video.h b/src/sisusb_video.h
index 19563df..9dafbaf 100644
--- a/src/sisusb_video.h
+++ b/src/sisusb_video.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Xv driver for SiS 315 USB
*
diff --git a/src/sisusb_videostr.h b/src/sisusb_videostr.h
index 7de90ec..3d82911 100644
--- a/src/sisusb_videostr.h
+++ b/src/sisusb_videostr.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Xv driver for SiS 315 USB
*
commit 10c3f050cd97fa90db40182f1846c2463f2f0e35
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 8 23:53:14 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index 9ea16e0..d076dc4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit ec1d219d933d865f107b68566ea5bb87f3521b22
Author: Tomasz Dominikowski <dominikowski@gmail.com>
Date: Fri Nov 16 19:36:43 2007 +0100
Fix xserver version detection.
Since xorg-server 1.3, XORG_VERSION_CURRENT is smaller than 6.8.99.13.
diff --git a/src/sisusb.h b/src/sisusb.h
index 813ef1f..fef0ae3 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -150,7 +150,7 @@
#undef SISGAMMARAMP
#ifdef XORG_VERSION_CURRENT
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
#define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
#endif
#endif
commit a294456d5dc5be9086c0b3296eb7adfb5735be82
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:44 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 79c66ee5e6b59049de02edf5808613db277c75d3
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:56 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 5497d19cfcdbd284bccc71ae2dab43c211c66145
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 13:00:34 2007 +0200
Define SISUSB_*_VERSION using PACKAGE_VERSION*
diff --git a/src/sisusb.h b/src/sisusb.h
index 0eb17d0..813ef1f 100644
--- a/src/sisusb.h
+++ b/src/sisusb.h
@@ -70,9 +70,9 @@
#define SISUSB_NAME "SISUSB"
#define SISUSB_DRIVER_NAME "sisusb"
-#define SISUSB_MAJOR_VERSION 0
-#define SISUSB_MINOR_VERSION 8
-#define SISUSB_PATCHLEVEL 1
+#define SISUSB_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define SISUSB_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define SISUSB_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define SISUSB_CURRENT_VERSION ((SISUSB_MAJOR_VERSION << 16) | \
(SISUSB_MINOR_VERSION << 8) | \
SISUSB_PATCHLEVEL)
Reply to: