Hello community,
here is the log from the commit of package xf86-video-neomagic for
openSUSE:Factory checked in at 2013-08-19 10:52:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-neomagic (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-neomagic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-neomagic"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-neomagic/xf86-video-neomagic.changes
2013-03-22 13:02:22.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xf86-video-neomagic.new/xf86-video-neomagic.changes
2013-08-19 10:52:36.000000000 +0200
@@ -1,0 +2,22 @@
+Sat Aug 17 19:06:11 UTC 2013 - [email protected]
+
+- Update to version 1.2.8:
+ + Unbreak shadowfb initialization with modern X servers.
+ + Remove mibstore.h.
+ + Don't check for unneeded proto headers.
+ + Remove uses of xf86PciInfo.h.
+ + Add &component=Driver/Neomagic to Bugzilla link.
+ + Don't call NEO_Sync with no XAA.
+- Drop U_Remove-mibstore.h.patch, fixed upstream.
+- Drop pkgconfig(fontsproto), pkgconfig(randrproto),
+ pkgconfig(renderproto), pkgconfig(videoproto),
+ pkgconfig(xextproto), pkgconfig(xf86dgaproto),
+ pkgconfig(xproto) and pkgconfig(pciaccess) BuildRequires
+ following upstream changes.
+
+-------------------------------------------------------------------
+Wed Aug 7 15:03:30 CEST 2013 - [email protected]
+
+- add ExcludeArch for s390 and s390x
+
+-------------------------------------------------------------------
Old:
----
U_Remove-mibstore.h.patch
xf86-video-neomagic-1.2.7.tar.bz2
New:
----
xf86-video-neomagic-1.2.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-neomagic.spec ++++++
--- /var/tmp/diff_new_pack.ATzszL/_old 2013-08-19 10:52:37.000000000 +0200
+++ /var/tmp/diff_new_pack.ATzszL/_new 2013-08-19 10:52:37.000000000 +0200
@@ -17,29 +17,21 @@
Name: xf86-video-neomagic
-Version: 1.2.7
+Version: 1.2.8
Release: 0
Summary: Neomagic video driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-Patch0: U_Remove-mibstore.h.patch
BuildRequires: pkg-config
-BuildRequires: pkgconfig(fontsproto)
-BuildRequires: pkgconfig(pciaccess) >= 0.8.0
-BuildRequires: pkgconfig(randrproto)
-BuildRequires: pkgconfig(renderproto)
-BuildRequires: pkgconfig(videoproto)
-BuildRequires: pkgconfig(xextproto)
-BuildRequires: pkgconfig(xf86dgaproto)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xorg-server) >= 1.0.99.901
-BuildRequires: pkgconfig(xproto)
Supplements: modalias(xorg-x11-server:pci:v000010C8d*sv*sd*bc03sc*i*)
# This was part of the xorg-x11-driver-video package up to version 7.6
Conflicts: xorg-x11-driver-video <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExcludeArch: s390 s390x
%x11_abi_videodrv_req
%description
@@ -48,7 +40,6 @@
%prep
%setup -q
-%patch0 -p1
%build
%configure
++++++ xf86-video-neomagic-1.2.7.tar.bz2 -> xf86-video-neomagic-1.2.8.tar.bz2
++++++
++++ 7630 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-neomagic-1.2.7/ChangeLog new/xf86-video-neomagic-1.2.8/ChangeLog
--- old/xf86-video-neomagic-1.2.7/ChangeLog 2012-07-17 08:24:00.000000000
+0200
+++ new/xf86-video-neomagic-1.2.8/ChangeLog 2013-08-16 20:15:19.000000000
+0200
@@ -1,3 +1,69 @@
+commit a559a07989265a84ee31530a2b002899b40389ae
+Author: Matt Turner <[email protected]>
+Date: Fri Aug 16 11:12:14 2013 -0700
+
+ xf86-video-neomagic 1.2.8
+
+ Signed-off-by: Matt Turner <[email protected]>
+
+commit d7c14dfbac1b50ad484c0070075f060b53783550
+Author: Matthieu Herrb <[email protected]>
+Date: Thu Jun 13 23:38:13 2013 +0200
+
+ Unbreak shadowfb initialization with modern X servers.
+
+ Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=434468
+ Signed-off-by: Matthieu Herrb <[email protected]>
+ Signed-off-by: Matt Turner <[email protected]>
+
+commit 005d61313e989bf054b1cc2190f1c743362d86ff
+Author: Adam Jackson <[email protected]>
+Date: Tue Sep 25 08:54:44 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <[email protected]>
+
+commit bc78be1c268d02c91926425cdf09ba1f7f1e3879
+Author: Matt Turner <[email protected]>
+Date: Sun Sep 9 14:07:22 2012 -0700
+
+ Don't check for unneeded proto headers
+
+ DGA unneeded since b6633ee7, others probably never needed.
+
+ Signed-off-by: Matt Turner <[email protected]>
+
+commit a419c141d67728f84fdb376257618fe199154d29
+Author: Matt Turner <[email protected]>
+Date: Sun Sep 9 13:29:24 2012 -0700
+
+ Remove uses of xf86PciInfo.h
+
+ Signed-off-by: Matt Turner <[email protected]>
+
+commit 3a4cd45c63671f89bed7b1c9cc518ac028c189d3
+Author: Matt Turner <[email protected]>
+Date: Sun Sep 9 13:23:35 2012 -0700
+
+ Add &component=Driver/Neomagic to Bugzilla link
+
+ Signed-off-by: Matt Turner <[email protected]>
+
+commit 66f7229838ce725cff0813a9eae02ed452204ad1
+Author: Matt Turner <[email protected]>
+Date: Sun Sep 9 13:10:24 2012 -0700
+
+ Don't call NEO_Sync with no XAA
+
+ The commit that makes XAA optional left a use of NEO_Sync while putting
+ the body inside an #ifdef HAVE_XAA_H block, which caused undefined
+ symbol errors when loading the driver. NEO_Sync doesn't do anything
+ without XAA, so don't bother calling it without XAA.
+
+ Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=434468
+ Reviewed-by: Alex Deucher <[email protected]>
+
commit 7a10cbda5a0a9ae31e33c5cc77c6b1bda8cae852
Author: Dave Airlie <[email protected]>
Date: Tue Jul 17 16:05:09 2012 +1000
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-neomagic-1.2.7/configure.ac
new/xf86-video-neomagic-1.2.8/configure.ac
--- old/xf86-video-neomagic-1.2.7/configure.ac 2012-07-17 08:00:16.000000000
+0200
+++ new/xf86-video-neomagic-1.2.8/configure.ac 2013-08-16 20:12:13.000000000
+0200
@@ -23,8 +23,8 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-neomagic],
- [1.2.7],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [1.2.8],
+
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
[xf86-video-neomagic])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
@@ -53,14 +53,6 @@
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-
-# 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)
-XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
-
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
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-neomagic-1.2.7/missing new/xf86-video-neomagic-1.2.8/missing
--- old/xf86-video-neomagic-1.2.7/missing 2012-06-06 13:03:41.000000000
+0200
+++ new/xf86-video-neomagic-1.2.8/missing 2013-08-16 20:13:51.000000000
+0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <[email protected]>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# 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
@@ -26,68 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <[email protected]>."
exit $?
@@ -99,228 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
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-neomagic-1.2.7/src/neo.h new/xf86-video-neomagic-1.2.8/src/neo.h
--- old/xf86-video-neomagic-1.2.7/src/neo.h 2012-07-16 04:29:25.000000000
+0200
+++ new/xf86-video-neomagic-1.2.8/src/neo.h 2013-08-16 20:10:25.000000000
+0200
@@ -261,6 +261,7 @@
vbeInfoPtr pVbe;
unsigned char * ShadowPtr;
int ShadowPitch;
+ CreateScreenResourcesProcPtr CreateScreenResources;
RefreshAreaFuncPtr refreshArea;
void (*PointerMoved)(SCRN_ARG_TYPE arg, int x, int y);
int rotate;
@@ -320,3 +321,14 @@
#define PROBED_NM2097 0x83
#define PROBED_NM2160 0x44
#define PROBED_NM2200 0x45
+
+#define PCI_VENDOR_NEOMAGIC 0x10C8
+#define PCI_CHIP_NM2070 0x0001
+#define PCI_CHIP_NM2090 0x0002
+#define PCI_CHIP_NM2093 0x0003
+#define PCI_CHIP_NM2097 0x0083
+#define PCI_CHIP_NM2160 0x0004
+#define PCI_CHIP_NM2200 0x0005
+#define PCI_CHIP_NM2230 0x0025
+#define PCI_CHIP_NM2360 0x0006
+#define PCI_CHIP_NM2380 0x0016
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-neomagic-1.2.7/src/neo_2090.c
new/xf86-video-neomagic-1.2.8/src/neo_2090.c
--- old/xf86-video-neomagic-1.2.7/src/neo_2090.c 2012-07-16
04:24:09.000000000 +0200
+++ new/xf86-video-neomagic-1.2.8/src/neo_2090.c 2012-09-11
22:57:23.000000000 +0200
@@ -42,7 +42,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
-#include "xf86PciInfo.h"
/* Drivers that use XAA need this */
#include "xf86fbman.h"
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-neomagic-1.2.7/src/neo_dga.c
new/xf86-video-neomagic-1.2.8/src/neo_dga.c
--- old/xf86-video-neomagic-1.2.7/src/neo_dga.c 2012-07-16 04:28:46.000000000
+0200
+++ new/xf86-video-neomagic-1.2.8/src/neo_dga.c 2012-09-11 22:57:23.000000000
+0200
@@ -29,7 +29,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "neo.h"
#include "neo_reg.h"
#include "dgaproc.h"
@@ -38,10 +37,10 @@
static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
int *, int *, int *);
static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
-static void NEO_Sync(ScrnInfoPtr);
static int NEO_GetViewport(ScrnInfoPtr);
static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
#ifdef HAVE_XAA_H
+static void NEO_Sync(ScrnInfoPtr);
static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
#if 0
@@ -57,8 +56,8 @@
NEO_SetMode,
NEO_SetViewport,
NEO_GetViewport,
- NEO_Sync,
#ifdef HAVE_XAA_H
+ NEO_Sync,
NEO_FillRect,
NEO_BlitRect,
#if 0
@@ -219,17 +218,14 @@
}
}
-
static void
NEO_Sync(
ScrnInfoPtr pScrn
){
NEOPtr pNEO = NEOPTR(pScrn);
-#ifdef HAVE_XAA_H
if(pNEO->AccelInfoRec) {
(*pNEO->AccelInfoRec->Sync)(pScrn);
}
-#endif
}
static void
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-neomagic-1.2.7/src/neo_driver.c
new/xf86-video-neomagic-1.2.8/src/neo_driver.c
--- old/xf86-video-neomagic-1.2.7/src/neo_driver.c 2012-07-16
04:29:43.000000000 +0200
+++ new/xf86-video-neomagic-1.2.8/src/neo_driver.c 2013-08-16
20:10:25.000000000 +0200
@@ -60,9 +60,6 @@
#include "xf86RAC.h"
#endif
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
@@ -72,9 +69,6 @@
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
@@ -1407,6 +1401,44 @@
}
}
+static Bool
+NEOCreateScreenResources(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NEOPtr pNeo = NEOPTR(pScrn);
+ PixmapPtr pPixmap;
+ Bool ret;
+
+ pScreen->CreateScreenResources = pNeo->CreateScreenResources;
+ ret = pScreen->CreateScreenResources(pScreen);
+ pScreen->CreateScreenResources = NEOCreateScreenResources;
+
+ if (!ret)
+ return FALSE;
+
+ pPixmap = pScreen->GetScreenPixmap(pScreen);
+
+ if (!shadowAdd(pScreen, pPixmap, neoShadowUpdate,
+ NULL, 0, NULL)) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static Bool
+NEOShadowInit(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NEOPtr pNeo = NEOPTR(pScrn);
+
+ if (!shadowSetup(pScreen))
+ return FALSE;
+ pNeo->CreateScreenResources = pScreen->CreateScreenResources;
+ pScreen->CreateScreenResources = NEOCreateScreenResources;
+
+ return TRUE;
+}
+
/* Mandatory */
static Bool
NEOScreenInit(SCREEN_INIT_ARGS_DECL)
@@ -1621,7 +1653,6 @@
"Acceleration %s Initialized\n",ret ? "" : "not");
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
@@ -1658,7 +1689,7 @@
#if 0
ShadowFBInit(pScreen, nPtr->refreshArea);
#else
- shadowInit (pScreen, neoShadowUpdate, 0);
+ NEOShadowInit (pScreen);
#endif
}
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-neomagic-1.2.7/src/neo_i2c.c
new/xf86-video-neomagic-1.2.8/src/neo_i2c.c
--- old/xf86-video-neomagic-1.2.7/src/neo_i2c.c 2012-06-06 13:05:24.000000000
+0200
+++ new/xf86-video-neomagic-1.2.8/src/neo_i2c.c 2012-09-11 22:57:23.000000000
+0200
@@ -44,7 +44,6 @@
#include "compiler.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "vgaHW.h"
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-neomagic-1.2.7/src/neo_shadow.c
new/xf86-video-neomagic-1.2.8/src/neo_shadow.c
--- old/xf86-video-neomagic-1.2.7/src/neo_shadow.c 2012-06-06
13:21:47.000000000 +0200
+++ new/xf86-video-neomagic-1.2.8/src/neo_shadow.c 2012-09-11
22:57:23.000000000 +0200
@@ -10,7 +10,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
#include "servermd.h"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
