Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Mon Sep 12 10:38:21 CEST 2011.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-07-10 22:04:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-09-11 02:45:29.000000000 +0200
@@ -1,0 +2,25 @@
+Sun Sep 11 00:44:15 UTC 2011 - sndirsch@suse.com
+
+- change VIDEO_ABI_VERSION to 10
+
+-------------------------------------------------------------------
+Thu Sep 8 10:40:37 UTC 2011 - sndirsch@suse.com
+
+- update to latest available video drivers
+ * xf86-video-ast 0.93.9
+ * xf86-video-geode 2.11.12
+ * xf86-video-glint 1.2.6
+ * xf86-video-intel 2.16.0
+- obsoletes U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch
+- get rid of obsolete sax2/hwinfo meta files; sax2 is dead since
+ openSUSE 11.3
+
+-------------------------------------------------------------------
+Thu Sep 8 10:17:26 UTC 2011 - sndirsch@suse.com
+
+- updated drivers to fix the build against xorg-server 1.10
+ * xf86-video-chips 1.2.4
+ * xf86-video-mach64 6.8.2
+ * xf86-video-siliconmotion 1.7.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch
sax2-hwinfo-data.tar.gz
xf86-video-ast-0.91.10.tar.bz2
xf86-video-chips-1.2.3.tar.bz2
xf86-video-geode-2.11.10.tar.bz2
xf86-video-glint-1.2.5.tar.bz2
xf86-video-intel-2.15.0.tar.bz2
xf86-video-mach64-6.8.2.tar.bz2
xf86-video-siliconmotion-1.7.4.tar.bz2
New:
----
xf86-video-ast-0.93.9.tar.bz2
xf86-video-chips-1.2.4.tar.bz2
xf86-video-geode-2.11.12.tar.bz2
xf86-video-glint-1.2.6.tar.bz2
xf86-video-intel-2.16.0.tar.bz2
xf86-video-mach64-6.9.0.tar.bz2
xf86-video-siliconmotion-1.7.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.UtVtwk/_old 2011-09-12 10:38:13.000000000 +0200
+++ /var/tmp/diff_new_pack.UtVtwk/_new 2011-09-12 10:38:13.000000000 +0200
@@ -23,13 +23,13 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 75
+Release: 77
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Provides: xorg-x11-driver-video-nvidia 855resolution 915resolution
Provides: intel-i810-xorg-x11 xorg-x11-driver-video-intel
-Requires: VIDEO_ABI_VERSION = 8
+Requires: VIDEO_ABI_VERSION = 10
Requires: libdrm >= 2.4.21
Obsoletes: xorg-x11-driver-video-nvidia 855resolution 915resolution
Obsoletes: intel-i810-xorg-x11 xorg-x11-driver-video-intel
@@ -38,12 +38,12 @@
ExcludeArch: s390 s390x
Source0: xf86-video-apm-1.2.3.tar.bz2
Source1: xf86-video-ark-0.7.3.tar.bz2
-Source2: xf86-video-ast-0.91.10.tar.bz2
-Source4: xf86-video-chips-1.2.3.tar.bz2
+Source2: xf86-video-ast-0.93.9.tar.bz2
+Source4: xf86-video-chips-1.2.4.tar.bz2
Source5: xf86-video-cirrus-1.3.2.tar.bz2
Source7: xf86-video-dummy-0.3.4.tar.bz2
Source8: xf86-video-fbdev-0.4.2.tar.bz2
-Source9: xf86-video-glint-1.2.5.tar.bz2
+Source9: xf86-video-glint-1.2.6.tar.bz2
Source10: xf86-video-i128-1.3.4.tar.bz2
Source11: xf86-video-i740-1.3.2.tar.bz2
Source14: xf86-video-mga-1.4.13.tar.bz2
@@ -54,7 +54,7 @@
Source20: xf86-video-s3-0.6.3.tar.bz2
Source21: xf86-video-s3virge-1.10.4.tar.bz2
Source22: xf86-video-savage-2.3.2.tar.bz2
-Source23: xf86-video-siliconmotion-1.7.4.tar.bz2
+Source23: xf86-video-siliconmotion-1.7.5.tar.bz2
Source24: xf86-video-sis-0.10.3.tar.bz2
Source25: xf86-video-sisusb-0.9.4.tar.bz2
Source33: xf86-video-tdfx-1.4.3.tar.bz2
@@ -65,17 +65,16 @@
Source38: xf86-video-vesa-2.3.0.tar.bz2
Source41: xf86-video-vmware-11.0.3.tar.bz2
Source42: xf86-video-voodoo-1.2.4.tar.bz2
-Source45: xf86-video-intel-2.15.0.tar.bz2
+Source45: xf86-video-intel-2.16.0.tar.bz2
Source46: xf86-video-ati-6.14.2.tar.bz2
-Source51: xf86-video-geode-2.11.10.tar.bz2
-Source54: xf86-video-mach64-6.8.2.tar.bz2
+Source51: xf86-video-geode-2.11.12.tar.bz2
+Source54: xf86-video-mach64-6.9.0.tar.bz2
Source55: xf86-video-r128-6.8.1.tar.bz2
Source56: intel-gpu-tools-1.0.2-20101210-292ae45.tar.bz2
Source57: xf86-video-xgi-1.6.0.tar.bz2
Source58: xf86-video-xgixp-1.8.0.tar.bz2
Source59: xf86-video-qxl-0.0.13.tar.bz2
Source99: baselibs.conf
-Source100: sax2-hwinfo-data.tar.gz
%if %broken_kms_blacklist
Source101: kms-blacklist.tar.bz2
%endif
@@ -97,7 +96,6 @@
Patch145: xf86-video-xgixp-symbols.diff
Patch150: xf86-video-intel-dell_backlight.diff
Patch155: xf86-video-intel-copyfb.diff
-Patch156: U_geode-Stop-including-linux-videodev.h-in-z4l.c.patch
Patch157: U_xgi-Fix-build-on-bigendian.patch
%description
@@ -155,11 +153,6 @@
pushd xf86-video-xgixp-*
%patch145 -p1
popd
-%ifarch %ix86
-pushd xf86-video-geode-*
-%patch156 -p1
-popd
-%endif
%build
for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do
@@ -178,7 +171,6 @@
for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done
-tar xf $RPM_SOURCE_DIR/sax2-hwinfo-data.tar.gz -C $RPM_BUILD_ROOT
%if %broken_kms_blacklist
tar xf $RPM_SOURCE_DIR/kms-blacklist.tar.bz2 -C $RPM_BUILD_ROOT
%endif
@@ -187,36 +179,13 @@
%clean
rm -rf "$RPM_BUILD_ROOT"
-%post
-/sbin/ldconfig
-if ls var/lib/hardware/ids/* &> /dev/null; then
- cat var/lib/hardware/ids/* > var/lib/hardware/hd.ids
-else
- rm -f var/lib/hardware/hd.ids
-fi
-exit 0
-
-%postun
-/sbin/ldconfig
-if ls var/lib/hardware/ids/* &> /dev/null; then
- cat var/lib/hardware/ids/* > var/lib/hardware/hd.ids
-else
- rm -f var/lib/hardware/hd.ids
-fi
-exit 0
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%dir /etc/X11/xorg.conf.d
-%dir /usr/share/sax
-%dir /usr/share/sax/api
-%dir /usr/share/sax/api/data
-%dir /usr/share/sax/api/data/cdb
-%dir /usr/share/sax/sysp
-%dir /usr/share/sax/sysp/maps
-%dir /usr/share/sax/sysp/maps/update
-%dir /var/lib/hardware
-%dir /var/lib/hardware/ids
%if %broken_kms_blacklist
%config /etc/X11/kms-blacklist.local
/etc/X11/kms-blacklist.nouveau
@@ -228,12 +197,9 @@
%{_libdir}/xorg/modules/
%{_mandir}/man1/*
%{_mandir}/man4/*
-/usr/share/sax/api/data/cdb/Cards.20.%{name}
-/usr/share/sax/sysp/maps/update/Identity.map.20.%{name}
%if %broken_kms_blacklist
/sbin/kms_loader.sh
%endif
-/var/lib/hardware/ids/20.%{name}
%config /etc/X11/xorg.conf.d/*
%changelog
++++++ xf86-video-ast-0.91.10.tar.bz2 -> xf86-video-ast-0.93.9.tar.bz2 ++++++
++++ 66472 lines of diff (skipped)
++++++ xf86-video-chips-1.2.3.tar.bz2 -> xf86-video-chips-1.2.4.tar.bz2 ++++++
++++ 22064 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/ChangeLog new/xf86-video-chips-1.2.4/ChangeLog
--- old/xf86-video-chips-1.2.3/ChangeLog 2010-07-23 20:34:20.000000000 +0200
+++ new/xf86-video-chips-1.2.4/ChangeLog 2011-02-27 17:13:32.000000000 +0100
@@ -1,3 +1,103 @@
+commit 314b72730340ce934c00f1756e4489e97635e1a9
+Author: Julien Cristau
+Date: Sun Feb 27 17:12:48 2011 +0100
+
+ Bump to 1.2.4
+
+commit 25c21f7c47b41283ae8b009068fe489bbdfa0b5a
+Author: Julien Cristau
+Date: Sun Feb 27 16:41:08 2011 +0100
+
+ Replace deprecated xalloc/xrealloc/xfree with malloc/realloc/free
+
+ Signed-off-by: Julien Cristau
+
+commit a7b607ed727b44d78c3e88c0f74932a8f46f6470
+Author: Julien Cristau
+Date: Sun Feb 27 16:53:31 2011 +0100
+
+ Fix compiler warning
+
+ src/ct_driver.c:160: warning: ‘chipsFindIsaDevice’ declared ‘static’ but never defined
+
+ Signed-off-by: Julien Cristau
+
+commit 3901322baf34a8e26fecc1915646d5e9c2252a9d
+Author: Julien Cristau
+Date: Sun Feb 27 16:51:24 2011 +0100
+
+ Fix unused variable warning
+
+ src/ct_driver.c: In function ‘CHIPSScreenInit’:
+ src/ct_driver.c:3920: warning: unused variable ‘racflag’
+
+ Signed-off-by: Julien Cristau
+
+commit c409e213143156893a157d73c37a14df6bf0041b
+Author: Julien Cristau
+Date: Sun Feb 27 16:50:21 2011 +0100
+
+ Fix compiler warning on 64bit
+
+ src/ct_driver.c: In function ‘chipsPreInitHiQV’:
+ src/ct_driver.c:1598: warning: format ‘%lX’ expects type ‘long unsigned int’, but argument 4 has type ‘CARD32’
+
+ Signed-off-by: Julien Cristau
+
+commit c4d03c11f889e12100f5770c13b5e50463043a4b
+Author: Julien Cristau
+Date: Sun Feb 27 16:43:45 2011 +0100
+
+ Add parentheses to fix compiler warnings
+
+ src/ct_ddc.c: In function ‘chips_ddc1Read’:
+ src/ct_ddc.c:34: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
+
+ src/ct_dga.c: In function ‘CHIPS_SetViewport’:
+ src/ct_dga.c:243: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
+
+ src/ct_driver.c: In function ‘chipsTestDACComp’:
+ src/ct_driver.c:7490: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
+
+ Signed-off-by: Julien Cristau
+
+commit 5830fed3ebce5e5bacab85e37176cb81859828ef
+Author: Adam Jackson
+Date: Mon Nov 22 16:37:29 2010 -0500
+
+ Import the xf8_16bpp implementation
+
+ This is trivial, just do it directly.
+
+ Signed-off-by: Adam Jackson
+
+commit 02b3264149703eac325026a87dfa89d68d6ae1c8
+Author: Jesse Adkins
+Date: Tue Sep 28 13:29:50 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit 8e957e501db31059e49e81e56cdc31e3440d771b
+Author: Gaetan Nadon
+Date: Fri Jul 23 19:38:21 2010 -0400
+
+ config: add AM_PROG_CC_C_O for per-target compilation flags
+
+ The use of per-target compilation flags with C sources requires
+ that the macro AM_PROG_CC_C_O be called from configure.ac
+
+ If the C compiler does not accept the -c and -o options simultaneously,
+ define NO_MINUS_C_MINUS_O. This macro actually tests both the compiler
+ found by AC_PROG_CC, and, if different, the first cc in the path.
+ The test fails if one fails. This macro was created for GNU Make
+ to choose the default C compilation rule.
+
+ Reviewed-by: Alan Coopersmith
+ Signed-off-by: Gaetan Nadon
+
commit 5665714d0de33571d97def69d00d7bfa9e0d5b8a
Author: Alan Coopersmith
Date: Fri Jul 23 11:33:37 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/compile new/xf86-video-chips-1.2.4/compile
--- old/xf86-video-chips-1.2.3/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-chips-1.2.4/compile 2011-02-27 16:34:33.000000000 +0100
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-10-06.20; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/config.h.in new/xf86-video-chips-1.2.4/config.h.in
--- old/xf86-video-chips-1.2.3/config.h.in 2010-07-23 20:34:00.000000000 +0200
+++ new/xf86-video-chips-1.2.4/config.h.in 2011-02-27 17:13:32.000000000 +0100
@@ -45,6 +45,9 @@
*/
#undef LT_OBJDIR
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/configure.ac new/xf86-video-chips-1.2.4/configure.ac
--- old/xf86-video-chips-1.2.3/configure.ac 2010-07-23 20:33:10.000000000 +0200
+++ new/xf86-video-chips-1.2.4/configure.ac 2011-02-27 17:12:38.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
- [1.2.3],
+ [1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -44,6 +44,9 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+# Checks for programs.
+AM_PROG_CC_C_O
+
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/man/chips.man new/xf86-video-chips-1.2.4/man/chips.man
--- old/xf86-video-chips-1.2.3/man/chips.man 2009-10-16 23:41:37.000000000 +0200
+++ new/xf86-video-chips-1.2.4/man/chips.man 2011-02-27 16:31:51.000000000 +0100
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.4 2001/12/17 20:52:32 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CHIPS __drivermansuffix__ __vendorversion__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/src/ct_accel.c new/xf86-video-chips-1.2.4/src/ct_accel.c
--- old/xf86-video-chips-1.2.3/src/ct_accel.c 2009-10-16 23:41:37.000000000 +0200
+++ new/xf86-video-chips-1.2.4/src/ct_accel.c 2011-02-27 17:00:25.000000000 +0100
@@ -1181,7 +1181,7 @@
} else funcNo = 2;
pad = (((pCache->w * bpp) + 31) >> 5) << 2;
- dstPtr = data = (unsigned char*)xalloc(pad * pCache->h);
+ dstPtr = data = malloc(pad * pCache->h);
srcPtr = (unsigned char*)pPix->devPrivate.ptr;
StippleFunc = StippleTab[funcNo];
@@ -1209,7 +1209,7 @@
pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data,
pad, bpp, pScrn->depth);
- xfree(data);
+ free(data);
return pCache;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/src/ct_ddc.c new/xf86-video-chips-1.2.4/src/ct_ddc.c
--- old/xf86-video-chips-1.2.3/src/ct_ddc.c 2009-10-16 23:41:37.000000000 +0200
+++ new/xf86-video-chips-1.2.4/src/ct_ddc.c 2011-02-27 17:00:25.000000000 +0100
@@ -31,7 +31,7 @@
register unsigned int tmp;
while ((hwp->readST01(hwp)) & 0x08){};
- while (!(hwp->readST01(hwp)) & 0x08){};
+ while (!((hwp->readST01(hwp)) & 0x08)){};
tmp = cPtr->readXR(cPtr, 0x63);
return (tmp & ddc_mask);
}
@@ -170,7 +170,7 @@
I2CPtr->scrnIndex = pScrn->scrnIndex;
I2CPtr->I2CPutBits = chips_I2CPutBits;
I2CPtr->I2CGetBits = chips_I2CGetBits;
- I2CPtr->DriverPrivate.ptr = xalloc(sizeof(CHIPSI2CRec));
+ I2CPtr->DriverPrivate.ptr = malloc(sizeof(CHIPSI2CRec));
((CHIPSI2CPtr)(I2CPtr->DriverPrivate.ptr))->cPtr = cPtr;
if (!xf86I2CBusInit(I2CPtr))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/src/ct_dga.c new/xf86-video-chips-1.2.4/src/ct_dga.c
--- old/xf86-video-chips-1.2.3/src/ct_dga.c 2009-10-16 23:41:37.000000000 +0200
+++ new/xf86-video-chips-1.2.4/src/ct_dga.c 2011-02-27 17:00:25.000000000 +0100
@@ -95,15 +95,15 @@
while(pMode) {
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
@@ -239,8 +239,8 @@
CHIPSPtr cPtr = CHIPSPTR(pScrn);
if (flags & DGA_FLIP_RETRACE) {
- while ((hwp->readST01(hwp)) & 0x08){};
- while (!(hwp->readST01(hwp)) & 0x08){};
+ while ((hwp->readST01(hwp)) & 0x08){};
+ while (!((hwp->readST01(hwp)) & 0x08)){};
}
CHIPSAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/src/ct_driver.c new/xf86-video-chips-1.2.4/src/ct_driver.c
--- old/xf86-video-chips-1.2.3/src/ct_driver.c 2010-06-04 20:10:43.000000000 +0200
+++ new/xf86-video-chips-1.2.4/src/ct_driver.c 2011-02-27 17:00:25.000000000 +0100
@@ -111,8 +111,7 @@
#include "micmap.h"
#include "fb.h"
-#include "cfb8_16.h"
-
+#include "fboverlay.h"
/* Needed for the 1 and 4 bpp framebuffers */
#ifdef HAVE_XF1BPP
@@ -158,7 +157,9 @@
static Bool CHIPSSaveScreen(ScreenPtr pScreen, int mode);
/* Internally used functions */
+#ifdef HAVE_ISA
static int chipsFindIsaDevice(GDevPtr dev);
+#endif
static Bool chipsClockSelect(ScrnInfoPtr pScrn, int no);
Bool chipsModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void chipsSave(ScrnInfoPtr pScrn, vgaRegPtr VgaSave,
@@ -770,7 +771,7 @@
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -1332,16 +1333,6 @@
}
break;
#endif
- case 16:
- if (cPtr->Flags & ChipsOverlay8plus16) {
- if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
- vbeFree(cPtr->pVbe);
- cPtr->pVbe = NULL;
- CHIPSFreeRec(pScrn);
- return FALSE;
- }
- break;
- }
default:
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
vbeFree(cPtr->pVbe);
@@ -1496,7 +1487,7 @@
/* Collect all of the relevant option flags (fill in pScrn->options) */
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(cPtr->Options = xalloc(sizeof(ChipsHiQVOptions))))
+ if (!(cPtr->Options = malloc(sizeof(ChipsHiQVOptions))))
return FALSE;
memcpy(cPtr->Options, ChipsHiQVOptions, sizeof(ChipsHiQVOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -1606,7 +1597,7 @@
#endif
cPtr->IOAddress = cPtr->FbAddress + 0x400000L;
xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT,
- "IOAddress is set at 0x%lX.\n",cPtr->IOAddress);
+ "IOAddress is set at 0x%lX.\n",(unsigned long)cPtr->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from,
@@ -2575,7 +2566,7 @@
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(cPtr->Options = xalloc(sizeof(ChipsWingineOptions))))
+ if (!(cPtr->Options = malloc(sizeof(ChipsWingineOptions))))
return FALSE;
memcpy(cPtr->Options, ChipsWingineOptions, sizeof(ChipsWingineOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -3046,7 +3037,7 @@
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(cPtr->Options = xalloc(sizeof(Chips655xxOptions))))
+ if (!(cPtr->Options = malloc(sizeof(Chips655xxOptions))))
return FALSE;
memcpy(cPtr->Options, Chips655xxOptions, sizeof(Chips655xxOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -3904,6 +3895,18 @@
hwp->disablePalette(hwp);
}
+static Bool
+cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+ int xsize, int ysize, int dpix, int dpiy,
+ int width16, int width8)
+{
+ return
+ (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+ dpix, dpiy, width16, width8, 16, 8) &&
+ fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+ dpix, dpiy, width16, width8, 16, 8, 16, 8));
+}
+
/* Mandatory */
static Bool
CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
@@ -3916,7 +3919,9 @@
int init_picture = 0;
VisualPtr visual;
int allocatebase, freespace, currentaddr;
+#ifndef XSERVER_LIBPCIACCESS
unsigned int racflag = 0;
+#endif
unsigned char *FBStart;
int height, width, displayWidth;
CHIPSEntPtr cPtrEnt = NULL;
@@ -4058,7 +4063,7 @@
if(cPtr->Flags & ChipsShadowFB) {
cPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
- cPtr->ShadowPtr = xalloc(cPtr->ShadowPitch * height);
+ cPtr->ShadowPtr = malloc(cPtr->ShadowPitch * height);
displayWidth = cPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = cPtr->ShadowPtr;
} else {
@@ -4620,10 +4625,8 @@
XAADestroyInfoRec(cPtr->AccelInfoRec);
if (cPtr->CursorInfoRec)
xf86DestroyCursorInfoRec(cPtr->CursorInfoRec);
- if (cPtr->ShadowPtr)
- xfree(cPtr->ShadowPtr);
- if (cPtr->DGAModes)
- xfree(cPtr->DGAModes);
+ free(cPtr->ShadowPtr);
+ free(cPtr->DGAModes);
pScrn->vtSema = FALSE;
if(cPtr->BlockHandler)
pScreen->BlockHandler = cPtr->BlockHandler;
@@ -7486,7 +7489,7 @@
hwp->writeDacWriteAddr(hwp, 0x00);
while ((hwp->readST01(hwp)) & 0x08){}; /* wait for vsync to end */
- while (!(hwp->readST01(hwp)) & 0x08){}; /* wait for new vsync */
+ while (!((hwp->readST01(hwp)) & 0x08)){}; /* wait for new vsync */
hwp->writeDacData(hwp, a); /* set pattern */
hwp->writeDacData(hwp, b);
hwp->writeDacData(hwp, c);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-1.2.3/src/ct_video.c new/xf86-video-chips-1.2.4/src/ct_video.c
--- old/xf86-video-chips-1.2.3/src/ct_video.c 2009-10-16 23:41:37.000000000 +0200
+++ new/xf86-video-chips-1.2.4/src/ct_video.c 2011-02-27 17:00:25.000000000 +0100
@@ -70,7 +70,7 @@
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -84,8 +84,7 @@
if(num_adaptors)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
@@ -236,9 +235,9 @@
XF86VideoAdaptorPtr adapt;
CHIPSPortPrivPtr pPriv;
- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
- sizeof(CHIPSPortPrivRec) +
- sizeof(DevUnion))))
+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+ sizeof(CHIPSPortPrivRec) +
+ sizeof(DevUnion))))
return NULL;
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
@@ -880,18 +879,18 @@
surface->width = w;
surface->height = h;
- if(!(surface->pitches = xalloc(sizeof(int)))) {
+ if(!(surface->pitches = malloc(sizeof(int)))) {
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(surface->offsets = xalloc(sizeof(int)))) {
- xfree(surface->pitches);
+ if(!(surface->offsets = malloc(sizeof(int)))) {
+ free(surface->pitches);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
- xfree(surface->pitches);
- xfree(surface->offsets);
+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+ free(surface->pitches);
+ free(surface->offsets);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
@@ -937,9 +936,9 @@
if(pPriv->isOn)
CHIPSStopSurface(surface);
xf86FreeOffscreenLinear(pPriv->linear);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
return Success;
}
@@ -1029,7 +1028,7 @@
XF86OffscreenImagePtr offscreenImages;
/* need to free this someplace */
- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
return;
offscreenImages[0].image = &Images[0];
++++++ xf86-video-geode-2.11.10.tar.bz2 -> xf86-video-geode-2.11.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/ChangeLog new/xf86-video-geode-2.11.12/ChangeLog
--- old/xf86-video-geode-2.11.10/ChangeLog 2010-11-09 10:22:28.000000000 +0100
+++ new/xf86-video-geode-2.11.12/ChangeLog 2011-02-13 20:55:26.000000000 +0100
@@ -1,3 +1,106 @@
+commit 1a23956758d17a8b4c1d8acebf8acc94358c37b9
+Author: Martin-Éric Racine
+Date: Sun Feb 13 21:52:55 2011 +0200
+
+ Geode 2.11.12
+
+commit 30d46e6c28479e07ac8328b6f4dfc2692eb1ac6d
+Author: Martin-Éric Racine
+Date: Mon Feb 7 00:04:06 2011 +0000
+
+ Stop including "linux/videodev.h" in z4l.c
+ V4L1 support was dropped as of Linux kernel 2.6.38
+
+commit 509f6085ce7747d76f638a7a30170c437b296a40
+Author: Daniel Drake
+Date: Sun Feb 6 20:22:01 2011 +0000
+
+ Fix packed overlay offscreen allocations
+
+ Commit 5e72a00ad2 caused packed video data to corrupt glyphs and other
+ parts of the screen, but it turns out that the commit actually at fault
+ was d681a844e, incorrectly changing the size of the allocated destination
+ memory from the number of bytes needed to the number of lines needed.
+
+ While fixing this, I noticed that LXAllocateSurface is probably making the
+ same mistake, and that the height is probably not calculated correctly for
+ some corner cases when calling LXCopyFromSys in the packed
+ video path (but I'm not sure about either).
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=33004
+
+commit 66c375d2a1d1eadb38d2cbfe2d08cfec20213cb4
+Author: Martin-Éric Racine
+Date: Mon Dec 27 15:20:38 2010 +0200
+
+ Geode 2.11.11
+
+commit b9a5a86a402832fe699e43b3030932b50ae821a0
+Author: Priit Laes
+Date: Wed Dec 15 03:54:13 2010 +0200
+
+ Restoring compatibility down to X server 1.4
+
+ Signed-off-by: Priit Laes
+
+commit bae443bb46c81702a57d4914b7e56f17e5aa1f3a
+Author: Daniel Drake
+Date: Tue Nov 30 20:31:49 2010 +0000
+
+ Improve handling of gamma correction in video vs graphics
+
+ The LX is a bit odd in that the palette can be used for gamma correction
+ of graphics data, or video data, but not both at the same time.
+
+ Right now, during X startup, X sets gamma correction (but without any
+ actual correction) causing the Geode driver to start using the palette
+ for graphics gamma correction. (this is just momentary)
+
+ Later on during startup, vg_set_custom_mode() switches to using the
+ palette for video gamma correction, and this is the end result.
+
+ If you later use xrandr to change the gamma, the palette starts being used
+ for graphics again.
+
+ If you VT switch, vg_set_custom_mode (momentarily) starts using the palette
+ for video, but then X jumps in with a gamma callback causing it to be used
+ for graphics again.
+
+ End result: no user visible bug, but this is inconsistent.
+ As there is no exposed mechanism for changing video gamma I suggest
+ we just drop that bit from vg_set_custom_mode(). Then the inconsistency
+ goes away.
+
+ Downside: this now becomes dependent on X setting gamma during startup.
+ I don't know when this was introduced but I think it is recent.
+
+ Aditionally, I think I found a (harmless) bug in
+ df_set_video_palette_entry, it doesn't do what the comments say.
+
+commit 5873bfa48f1c090d224adbc7ca7df3ebea0b198f
+Author: Priit Laes
+Date: Sun Dec 12 16:17:24 2010 +0200
+
+ Fix compilation under xorg >1.9.99
+
+ Signed-off-by: Priit Laes
+
+commit 1d8d02d64e9f5d5dd3788b3b9b1b25866c2ed6b5
+Author: Martin-Éric Racine
+Date: Fri Nov 19 17:24:35 2010 +0200
+
+ LX Panel: lower the 1024x600 refresh rate down to 60Hz.
+
+ NOTE: the eCafe EC-800's panel doesn't support a higher refresh rate.
+
+commit 256356912bbc1d1e65db5c3c03c6ae25883a81fb
+Author: Frank Huang
+Date: Fri Nov 19 10:28:31 2010 +0800
+
+ Print the panel mode BIOS uses
+
+ Signed-off-by: Frank Huang
+
commit 50f9152e2087fd50dfc09e35505c2fbcdd3183b0
Author: Martin-Éric Racine
Date: Tue Nov 9 11:12:44 2010 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/configure new/xf86-video-geode-2.11.12/configure
--- old/xf86-video-geode-2.11.10/configure 2010-11-09 10:21:23.000000000 +0100
+++ new/xf86-video-geode-2.11.12/configure 2011-02-13 20:55:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xf86-video-geode 2.11.10.
+# Generated by GNU Autoconf 2.67 for xf86-video-geode 2.11.12.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode.
#
@@ -702,8 +702,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-geode'
PACKAGE_TARNAME='xf86-video-geode'
-PACKAGE_VERSION='2.11.10'
-PACKAGE_STRING='xf86-video-geode 2.11.10'
+PACKAGE_VERSION='2.11.12'
+PACKAGE_STRING='xf86-video-geode 2.11.12'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode'
PACKAGE_URL='http://www.x.org/wiki/GeodeDriver'
@@ -1476,7 +1476,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-geode 2.11.10 to adapt to many kinds of systems.
+\`configure' configures xf86-video-geode 2.11.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1547,7 +1547,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-geode 2.11.10:";;
+ short | recursive ) echo "Configuration of xf86-video-geode 2.11.12:";;
esac
cat <<\_ACEOF
@@ -1675,7 +1675,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-geode configure 2.11.10
+xf86-video-geode configure 2.11.12
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1999,7 +1999,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-geode $as_me 2.11.10, which was
+It was created by xf86-video-geode $as_me 2.11.12, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -4727,7 +4727,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-geode'
- VERSION='2.11.10'
+ VERSION='2.11.12'
cat >>confdefs.h <<_ACEOF
@@ -12933,7 +12933,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-geode $as_me 2.11.10, which was
+This file was extended by xf86-video-geode $as_me 2.11.12, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13000,7 +13000,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-video-geode config.status 2.11.10
+xf86-video-geode config.status 2.11.12
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/configure.ac new/xf86-video-geode-2.11.12/configure.ac
--- old/xf86-video-geode-2.11.10/configure.ac 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/configure.ac 2011-02-13 20:52:33.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.59)
AC_INIT([xf86-video-geode],
- [2.11.10],
+ [2.11.12],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode],
[xf86-video-geode],
[http://www.x.org/wiki/GeodeDriver])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/ltmain.sh new/xf86-video-geode-2.11.12/ltmain.sh
--- old/xf86-video-geode-2.11.10/ltmain.sh 2010-11-09 10:21:10.000000000 +0100
+++ new/xf86-video-geode-2.11.12/ltmain.sh 2011-02-07 01:01:54.000000000 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
TIMESTAMP=""
package_revision=1.3017
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/cim/cim_df.c new/xf86-video-geode-2.11.12/src/cim/cim_df.c
--- old/xf86-video-geode-2.11.10/src/cim/cim_df.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/cim/cim_df.c 2011-02-07 01:01:09.000000000 +0100
@@ -983,11 +983,15 @@
/* Ensure that the Graphic data passes through the Gamma
* Correction RAM
+ *
+ * XXX is this a bug? perhaps it should be setting the bit so that video
+ * data is routed, according to the description above.
+ * it also mismatches df_set_video_palette().
*/
dcfg &= ~DF_DCFG_GV_PAL_BYP;
- /* The graphics and video data are passed through gamma
- * correction RAM
+ /* Unset the "bypass both" bit to make sure the above selection (gfx/video
+ * data through gamma correction RAM) takes effect.
*/
misc &= ~DF_GAMMA_BYPASS_BOTH;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/cim/cim_vg.c new/xf86-video-geode-2.11.12/src/cim/cim_vg.c
--- old/xf86-video-geode-2.11.10/src/cim/cim_vg.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/cim/cim_vg.c 2011-02-07 01:01:09.000000000 +0100
@@ -1002,8 +1002,7 @@
temp &= ~(DF_DCFG_CRT_SYNC_SKW_MASK | DF_DCFG_PWR_SEQ_DLY_MASK |
DF_DCFG_CRT_HSYNC_POL | DF_DCFG_CRT_VSYNC_POL);
- temp |= (DF_DCFG_CRT_SYNC_SKW_INIT |
- DF_DCFG_PWR_SEQ_DLY_INIT | DF_DCFG_GV_PAL_BYP);
+ temp |= DF_DCFG_CRT_SYNC_SKW_INIT | DF_DCFG_PWR_SEQ_DLY_INIT;
if (mode_params->flags & VG_MODEFLAG_NEG_HSYNC)
temp |= DF_DCFG_CRT_HSYNC_POL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/geode.h new/xf86-video-geode-2.11.12/src/geode.h
--- old/xf86-video-geode-2.11.10/src/geode.h 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/geode.h 2011-02-07 01:01:09.000000000 +0100
@@ -454,7 +454,7 @@
void LXSetupOutput(ScrnInfoPtr);
/* lx_panel.c */
-DisplayModePtr LXGetLegacyPanelMode(void);
+DisplayModePtr LXGetLegacyPanelMode(ScrnInfoPtr pScrni);
DisplayModePtr LXGetManualPanelMode(char *modestr);
void LXAdjustFrame(int scrnIndex, int x, int y, int flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/gx_randr.c new/xf86-video-geode-2.11.12/src/gx_randr.c
--- old/xf86-video-geode-2.11.10/src/gx_randr.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/gx_randr.c 2011-02-07 01:01:09.000000000 +0100
@@ -26,7 +26,12 @@
* software without specific prior written permission.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
+#include "xf86Modes.h"
#include "os.h"
#include "globals.h"
#include "xf86.h"
@@ -171,7 +176,9 @@
#endif
DisplayModePtr currentMode = NULL;
Bool ret = TRUE;
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
PixmapPtr pspix = NULL;
+ #endif
if (pRoot)
(*pScrni->EnableDisableFBAccess) (pScreen->myNum, FALSE);
@@ -210,16 +217,16 @@
pScrni->currentMode = currentMode;
}
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
/*
* Get the new Screen pixmap ptr as SwitchMode might have called
* ModifyPixmapHeader and xf86EnableDisableFBAccess will put it back...
* Unfortunately.
-
*/
-
pspix = (*pScreen->GetScreenPixmap) (pScreen);
if (pspix->devPrivate.ptr)
pScrni->pixmapPrivate = pspix->devPrivate;
+#endif
xf86ReconfigureLayout();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/lx_display.c new/xf86-video-geode-2.11.12/src/lx_display.c
--- old/xf86-video-geode-2.11.10/src/lx_display.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/lx_display.c 2011-02-07 01:01:09.000000000 +0100
@@ -389,7 +389,13 @@
{
PixmapPtr pixmap;
+
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0)
pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);
+#else
+ pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth);
+#endif
+
if (!pixmap)
return NULL;
if (!(*pScreen->ModifyPixmapHeader)(pixmap, width, height,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/lx_driver.c new/xf86-video-geode-2.11.12/src/lx_driver.c
--- old/xf86-video-geode-2.11.10/src/lx_driver.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/lx_driver.c 2011-02-07 01:01:09.000000000 +0100
@@ -452,7 +452,7 @@
pGeode->panelMode = LXGetManualPanelMode(pmode);
if (pGeode->panelMode == NULL)
- pGeode->panelMode = LXGetLegacyPanelMode();
+ pGeode->panelMode = LXGetLegacyPanelMode(pScrni);
if (pGeode->panelMode == NULL)
pGeode->Output &= ~OUTPUT_PANEL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/lx_output.c new/xf86-video-geode-2.11.12/src/lx_output.c
--- old/xf86-video-geode-2.11.10/src/lx_output.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/lx_output.c 2011-02-07 01:01:09.000000000 +0100
@@ -247,10 +247,12 @@
output->driver_private = NULL;
}
+#ifdef RANDR_GET_CRTC_INTERFACE
static xf86CrtcPtr lx_output_get_crtc(xf86OutputPtr output)
{
return output->crtc;
}
+#endif
static const xf86OutputFuncsRec lx_output_funcs = {
@@ -265,7 +267,9 @@
.commit = lx_output_commit,
.detect = lx_output_detect,
.get_modes = lx_output_get_modes,
+#ifdef RANDR_GET_CRTC_INTERFACE
.get_crtc = lx_output_get_crtc,
+#endif
.set_property = lx_output_set_property,
.destroy = lx_output_destroy,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/lx_panel.c new/xf86-video-geode-2.11.12/src/lx_panel.c
--- old/xf86-video-geode-2.11.10/src/lx_panel.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/lx_panel.c 2011-02-07 01:01:09.000000000 +0100
@@ -69,19 +69,18 @@
{MODEPREFIX, 162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
V_NHSYNC | V_NVSYNC, MODESUFFIX}
, /* 1600x1200@60 */
- {MODEPREFIX, 67630, 1024, 1080, 1184, 1344, 0, 600, 601, 604, 629, 0,
- V_NHSYNC | V_NVSYNC, MODESUFFIX}
- , /* 1024x600@80 */
+ {MODEPREFIX, 48960, 1024, 1064, 1168, 1312, 0, 600, 601, 604, 622, 0,
+ V_NHSYNC | V_NVSYNC, MODESUFFIX}
+ , /* 1024x600@60 wide panels */
};
/* Get the legacy panel size from VSA, and return the associated mode rec */
DisplayModePtr
-LXGetLegacyPanelMode(void)
+LXGetLegacyPanelMode(ScrnInfoPtr pScrni)
{
unsigned short reg = LX_READ_VG(0x00);
unsigned char ret = (reg >> 8) & 0x07;
-
if ((ret == 1 || ret == 5)) {
reg = LX_READ_VG(0x02);
@@ -94,8 +93,13 @@
* The user can use this entry for other wide screen resolutions.
*/
- if (ret < 8)
+ if (ret < 8) {
+ xf86DrvMsg(pScrni->scrnIndex, X_INFO,
+ " VSA Panel Mode is: %dx%d, pixel clock freq(kHz) is %d\n",
+ lx_panel_modes[ret].HDisplay, lx_panel_modes[ret].VDisplay,
+ lx_panel_modes[ret].Clock);
return &lx_panel_modes[ret];
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/lx_video.c new/xf86-video-geode-2.11.12/src/lx_video.c
--- old/xf86-video-geode-2.11.10/src/lx_video.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/lx_video.c 2011-02-07 01:01:09.000000000 +0100
@@ -302,7 +302,7 @@
lines = ((dstPitch * height) + pGeode->Pitch - 1) / pGeode->Pitch;
- if (LXAllocateVidMem(pScrni, pPriv, lines) == FALSE) {
+ if (LXAllocateVidMem(pScrni, pPriv, dstPitch * height) == FALSE) {
ErrorF("Error allocating an offscreen Packed region.\n");
return FALSE;
}
@@ -334,6 +334,7 @@
GeodeCopyGreyscale(buf + srcOffset, pGeode->FBBase + dstOffset,
srcPitch, dstPitch, height, pixels >> 1);
} else
+ /* FIXME: should lines be used here instead of height? */
LXCopyFromSys(pGeode, buf + srcOffset, dstOffset, dstPitch, srcPitch,
height, pixels);
@@ -818,6 +819,8 @@
pitch = ((w << 1) + 15) & ~15;
lines = ((pitch * h) + (pGeode->Pitch - 1)) / pGeode->Pitch;
+ /* FIXME: is lines the right parameter to use here,
+ * or should it be height * pitch? */
vidmem = exaOffscreenAlloc(pScrni->pScreen, lines, 4, TRUE,
NULL, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-geode-2.11.10/src/z4l.c new/xf86-video-geode-2.11.12/src/z4l.c
--- old/xf86-video-geode-2.11.10/src/z4l.c 2010-11-09 10:20:07.000000000 +0100
+++ new/xf86-video-geode-2.11.12/src/z4l.c 2011-02-07 01:03:38.000000000 +0100
@@ -55,7 +55,6 @@
#define __u64 __u_64
typedef unsigned long long __u64;
-#include "linux/videodev.h"
#define __user
#include "linux/videodev2.h"
++++++ xf86-video-glint-1.2.5.tar.bz2 -> xf86-video-glint-1.2.6.tar.bz2 ++++++
++++ 22321 lines of diff (skipped)
++++++ xf86-video-intel-2.15.0.tar.bz2 -> xf86-video-intel-2.16.0.tar.bz2 ++++++
++++ 89838 lines of diff (skipped)
++++++ xf86-video-mach64-6.8.2.tar.bz2 -> xf86-video-mach64-6.9.0.tar.bz2 ++++++
++++ 64565 lines of diff (skipped)
++++++ xf86-video-siliconmotion-1.7.4.tar.bz2 -> xf86-video-siliconmotion-1.7.5.tar.bz2 ++++++
++++ 23715 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/ChangeLog new/xf86-video-siliconmotion-1.7.5/ChangeLog
--- old/xf86-video-siliconmotion-1.7.4/ChangeLog 2010-04-28 00:12:01.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.5/ChangeLog 2011-02-27 17:13:28.000000000 +0100
@@ -1,3 +1,144 @@
+commit 087226bf4e442b83985078f5df481eb91f4f65ed
+Author: Julien Cristau
+Date: Sun Feb 27 17:12:58 2011 +0100
+
+ Bump to 1.7.5
+
+commit b20cfa3d4f531b612a28ea88e5f5a6b1df183ea0
+Author: Julien Cristau
+Date: Sun Feb 27 15:49:12 2011 +0100
+
+ Replace calls to xalloc/xcalloc/xfree with malloc/calloc/free
+
+ Also don't check for NULL before calling free().
+
+ Signed-off-by: Julien Cristau
+
+commit 312540ac447acaf80db7e341aa75f90f3e821438
+Author: Julien Cristau
+Date: Sun Feb 27 15:52:33 2011 +0100
+
+ Fix compiler warning on 64bit
+
+ src/smi_driver.c: In function ‘SMI_MapMem’:
+ src/smi_driver.c:1498: warning: format ‘%08lX’ expects type ‘long unsigned int’, but argument 6 has type ‘CARD32’
+
+ Signed-off-by: Julien Cristau
+
+commit 6008906f0e328180b17e7b604b97dfdfd4280508
+Author: Julien Cristau
+Date: Sun Feb 27 15:46:13 2011 +0100
+
+ Fix build with xserver 1.10
+
+ ScrnInfo->pixmapPrivate is gone
+
+ Signed-off-by: Julien Cristau
+
+commit 903aac1db82e17954b74581019ebb946d5b43fe3
+Author: Alan Coopersmith
+Date: Sat Oct 30 09:41:07 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith
+
+commit 71e61276ac62dfee15b275568084f8b8a55fc661
+Author: Gaetan Nadon
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 5cdb9326ab19da691f4a417def47fd0c869cefb7
+Author: Gaetan Nadon
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon
+
+commit 987c55bc8f69551eea917fba94827ac31c04a49f
+Author: Gaetan Nadon
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon
+
+commit f2569300c0f1b5714b4c4f09d07a16e9434bee00
+Author: Gaetan Nadon
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon
+
+commit 6b1d1833b38e1d21760174493e4f8f0af4214574
+Author: Gaetan Nadon
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon
+
+commit dc67a8e8fe220697c3dcbca63c9ce0608a75888c
+Author: Gaetan Nadon
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon
+
+commit 64995ca7f1287493e0616cc6469fdc2465900325
+Author: Gaetan Nadon
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 9520e4e64fa758eef024feda09cb6435e41db705
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 53cddc508ea0026db04f04772c401010d62d6af3
+Author: Gaetan Nadon
+Date: Tue Jul 20 16:15:30 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+commit 8087bc23a7662f1426a8bd6febf0d5d3844e6107
+Author: Francisco Jerez
+Date: Wed Jun 16 14:59:37 2010 +0200
+
+ xv: Make sure we have a CRTC before setting up the overlay.
+
+ Fixes a segfault when the destination area is off screen.
+
+ Signed-off-by: Francisco Jerez
+ Tested-by: Krzysztof Halasa
+
commit 2de1f7ae0b4441c1501568358acf2b870bb9dcc6
Author: Alan Coopersmith
Date: Tue Apr 27 15:11:35 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/configure.ac new/xf86-video-siliconmotion-1.7.5/configure.ac
--- old/xf86-video-siliconmotion-1.7.4/configure.ac 2010-04-28 00:11:22.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.5/configure.ac 2011-02-27 17:12:44.000000000 +0100
@@ -20,46 +20,47 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+# Initialize Autoconf
+AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
- 1.7.4,
+ [1.7.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-siliconmotion)
+ [xf86-video-siliconmotion])
-# Require xorg-macros 1.4 for XORG_DEFAULT_OPTIONS & XORG_INSTALL
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
@@ -76,9 +77,6 @@
[XMODES=yes], [XMODES=no], [#include "xorg-server.h"])
CPPFLAGS="$SAVE_CPPFLAGS"
-# Checks for header files.
-AC_HEADER_STDC
-
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
fi
@@ -94,8 +92,9 @@
DRIVER_NAME=siliconmotion
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/man/Makefile.am new/xf86-video-siliconmotion-1.7.5/man/Makefile.am
--- old/xf86-video-siliconmotion-1.7.4/man/Makefile.am 2010-04-28 00:06:58.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.5/man/Makefile.am 2011-02-23 16:27:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. 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"),
@@ -19,7 +19,7 @@
# LIABILITY, WHETHER 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.
-#
+#
drivermandir = $(DRIVER_MAN_DIR)
@@ -31,21 +31,8 @@
CLEANFILES = $(driverman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/src/smi_crtc.c new/xf86-video-siliconmotion-1.7.5/src/smi_crtc.c
--- old/xf86-video-siliconmotion-1.7.4/src/smi_crtc.c 2009-10-16 23:43:13.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.5/src/smi_crtc.c 2011-02-27 15:59:45.000000000 +0100
@@ -170,8 +170,8 @@
{
ENTER();
- xfree(SMICRTC(crtc));
- xfree(crtc->funcs);
+ free(SMICRTC(crtc));
+ free((xf86CrtcFuncsPtr)crtc->funcs);
LEAVE();
}
@@ -210,10 +210,12 @@
pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
-1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
if(pScrn->pixmapPrivate.ptr)
/* The pixmap devPrivate just set may be overwritten by
xf86EnableDisableFBAccess */
pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset;
+#endif
/* Modify the screen pitch */
pScrn->displayWidth = aligned_pitch / pSmi->Bpp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/src/smi_driver.c new/xf86-video-siliconmotion-1.7.5/src/smi_driver.c
--- old/xf86-video-siliconmotion-1.7.4/src/smi_driver.c 2009-10-16 23:43:13.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.5/src/smi_driver.c 2011-02-27 15:53:11.000000000 +0100
@@ -281,9 +281,9 @@
ENTER();
if (pSmi) {
- xfree(pSmi->save);
- xfree(pSmi->mode);
- xfree(pScrn->driverPrivate);
+ free(pSmi->save);
+ free(pSmi->mode);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -338,7 +338,7 @@
numDevSections, drv, &usedChips);
/* Free it since we don't need that list after this */
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
LEAVE(FALSE);
@@ -364,14 +364,14 @@
if ((pEnt = xf86GetEntityInfo(usedChips[i]))) {
pScrn->EnterVT = SMI_EnterVT;
pScrn->LeaveVT = SMI_LeaveVT;
- xfree(pEnt);
+ free(pEnt);
}
pScrn->FreeScreen = SMI_FreeScreen;
foundScreen = TRUE;
}
}
}
- xfree(usedChips);
+ free(usedChips);
LEAVE(foundScreen);
}
@@ -421,7 +421,7 @@
}
if (pEnt->location.type != BUS_PCI) {
- xfree(pEnt);
+ free(pEnt);
SMI_FreeRec(pScrn);
LEAVE(FALSE);
}
@@ -519,7 +519,7 @@
}
/* Process the options */
- if (!(pSmi->Options = xalloc(sizeof(SMIOptions))))
+ if (!(pSmi->Options = malloc(sizeof(SMIOptions))))
LEAVE(FALSE);
memcpy(pSmi->Options, SMIOptions, sizeof(SMIOptions));
@@ -662,7 +662,7 @@
}
else
pSmi->ChipRev = PCI_DEV_REVISION(pSmi->PciInfo);
- xfree(pEnt);
+ free(pEnt);
/*
* This shouldn't happen because such problems should be caught in
@@ -927,7 +927,9 @@
/* FBBase may have changed after remapping the memory */
pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
-1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset;
+#endif
if(pSmi->useEXA)
pSmi->EXADriverPtr->memoryBase=pSmi->FBBase;
@@ -1493,7 +1495,7 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
"Physical frame buffer at 0x%08lX offset: 0x%08lX\n",
- pScrn->memPhysBase, pSmi->fbMapOffset);
+ pScrn->memPhysBase, (unsigned long)pSmi->fbMapOffset);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
"Logical frame buffer at %p - %p\n", pSmi->FBBase,
pSmi->FBBase + pSmi->videoRAMBytes - 1);
@@ -1856,7 +1858,7 @@
pSmi->pInt10 = NULL;
}
if (pSmi->ptrAdaptor != NULL) {
- xfree(pSmi->ptrAdaptor);
+ free(pSmi->ptrAdaptor);
}
if (pSmi->BlockHandler != NULL) {
pScreen->BlockHandler = pSmi->BlockHandler;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/src/smi_output.c new/xf86-video-siliconmotion-1.7.5/src/smi_output.c
--- old/xf86-video-siliconmotion-1.7.4/src/smi_output.c 2009-10-16 23:43:13.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.5/src/smi_output.c 2011-02-27 16:00:30.000000000 +0100
@@ -156,7 +156,7 @@
{
ENTER();
- xfree(output->funcs);
+ free((xf86OutputFuncsPtr)output->funcs);
LEAVE();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.4/src/smi_video.c new/xf86-video-siliconmotion-1.7.5/src/smi_video.c
--- old/xf86-video-siliconmotion-1.7.4/src/smi_video.c 2010-02-25 08:33:07.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.5/src/smi_video.c 2011-02-27 15:56:24.000000000 +0100
@@ -520,7 +520,7 @@
input_string = VideoInputs[input].name;
sprintf(channel_string, "%d", channel);
enc[i].id = i;
- enc[i].name = xalloc(strlen(norm_string) +
+ enc[i].name = malloc(strlen(norm_string) +
strlen(input_string) +
strlen(channel_string)+3);
if (NULL == enc[i].name)
@@ -547,22 +547,22 @@
ENTER();
/* allocate memory for encoding array */
- p->enc = xalloc(sizeof(XF86VideoEncodingRec) * N_ENCODINGS);
+ p->enc = malloc(sizeof(XF86VideoEncodingRec) * N_ENCODINGS);
if (NULL == p->enc)
goto fail;
memset(p->enc,0,sizeof(XF86VideoEncodingRec) * N_ENCODINGS);
/* allocate memory for video norm array */
- p->norm = xalloc(sizeof(int) * N_ENCODINGS);
+ p->norm = malloc(sizeof(int) * N_ENCODINGS);
if (NULL == p->norm)
goto fail;
memset(p->norm,0,sizeof(int) * N_ENCODINGS);
/* allocate memory for video input format array */
- p->input = xalloc(sizeof(int) * N_ENCODINGS);
+ p->input = malloc(sizeof(int) * N_ENCODINGS);
if (NULL == p->input)
goto fail;
memset(p->input,0,sizeof(int) * N_ENCODINGS);
/* allocate memory for video channel number array */
- p->channel = xalloc(sizeof(int) * N_ENCODINGS);
+ p->channel = malloc(sizeof(int) * N_ENCODINGS);
if (NULL == p->channel)
goto fail;
memset(p->channel,0,sizeof(int) * N_ENCODINGS);
@@ -590,13 +590,13 @@
LEAVE();
fail:
- if (p->input) xfree(p->input);
+ free(p->input);
p->input = NULL;
- if (p->norm) xfree(p->norm);
+ free(p->norm);
p->norm = NULL;
- if (p->channel) xfree(p->channel);
+ free(p->channel);
p->channel = NULL;
- if (p->enc) xfree(p->enc);
+ free(p->enc);
p->enc = NULL;
p->nenc = 0;
LEAVE();
@@ -632,7 +632,7 @@
numAdaptors = 1;
ptrAdaptors = &newAdaptor;
} else {
- newAdaptors = xalloc((numAdaptors + 1) *
+ newAdaptors = malloc((numAdaptors + 1) *
sizeof(XF86VideoAdaptorPtr*));
if (newAdaptors != NULL) {
memcpy(newAdaptors, ptrAdaptors,
@@ -648,9 +648,7 @@
xf86XVScreenInit(pScreen, ptrAdaptors, numAdaptors);
}
- if (newAdaptors != NULL) {
- xfree(newAdaptors);
- }
+ free(newAdaptors);
LEAVE();
}
@@ -824,7 +822,7 @@
ENTER();
- ptrAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+ ptrAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
sizeof(DevUnion) + sizeof(SMI_PortRec));
if (ptrAdaptor == NULL)
LEAVE(NULL);
@@ -1060,7 +1058,7 @@
if(!xf86_crtc_clip_video_helper(pScrn, &crtc, crtcConf->crtc[0], &dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height))
LEAVE(Success);
- if(pSmi->Dualhead && crtc == crtcConf->crtc[1])
+ if (crtc != crtcConf->crtc[0])
LEAVE(Success);
/* Transform dstBox to the CRTC coordinates */
@@ -1521,6 +1519,9 @@
width, height))
LEAVE(Success);
+ if (!crtc)
+ LEAVE(Success);
+
/* Transform dstBox to the CRTC coordinates */
dstBox.x1 -= crtc->x;
dstBox.y1 -= crtc->y;
@@ -2161,7 +2162,7 @@
ENTER();
- offscreenImages = xalloc(sizeof(XF86OffscreenImageRec));
+ offscreenImages = malloc(sizeof(XF86OffscreenImageRec));
if (offscreenImages == NULL) {
LEAVE();
}
@@ -2374,22 +2375,22 @@
if (offset == 0)
LEAVE(BadAlloc);
- surface->pitches = xalloc(sizeof(int));
+ surface->pitches = malloc(sizeof(int));
if (surface->pitches == NULL) {
SMI_FreeMemory(pScrn, surface_memory);
LEAVE(BadAlloc);
}
- surface->offsets = xalloc(sizeof(int));
+ surface->offsets = malloc(sizeof(int));
if (surface->offsets == NULL) {
- xfree(surface->pitches);
+ free(surface->pitches);
SMI_FreeMemory(pScrn, surface_memory);
LEAVE(BadAlloc);
}
- ptrOffscreen = xalloc(sizeof(SMI_OffscreenRec));
+ ptrOffscreen = malloc(sizeof(SMI_OffscreenRec));
if (ptrOffscreen == NULL) {
- xfree(surface->offsets);
- xfree(surface->pitches);
+ free(surface->offsets);
+ free(surface->pitches);
SMI_FreeMemory(pScrn, surface_memory);
LEAVE(BadAlloc);
}
@@ -2423,9 +2424,9 @@
}
SMI_FreeMemory(pScrn, ptrOffscreen->surface_memory);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
LEAVE(Success);
}
@@ -2468,6 +2469,9 @@
&x1, &x2, &y1, &y2, clipBoxes, surface->width, surface->height))
LEAVE(Success);
+ if (!crtc)
+ LEAVE(Success);
+
/* Transform dstBox to the CRTC coordinates */
dstBox.x1 -= crtc->x;
dstBox.y1 -= crtc->y;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
root＠hilbert.suse.de