Hello community,
here is the log from the commit of package xorg-x11-driver-video-nouveau for
openSUSE:Factory checked in at 2013-11-26 06:15:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-driver-video-nouveau (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-driver-video-nouveau.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-driver-video-nouveau"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xorg-x11-driver-video-nouveau/xorg-x11-driver-video-nouveau.changes
2013-09-11 13:25:04.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xorg-x11-driver-video-nouveau.new/xorg-x11-driver-video-nouveau.changes
2013-11-26 06:15:15.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 7 16:30:26 UTC 2013 - [email protected]
+
+- Update to version 1.0.10:
+ + recognise GK208 as a Kepler board
+ + nouveau: fix build on ppc by wrapping immintrin include.
+ + nouveau: add gpu identifier to connector names for secondary gpus
+ + nouveau: fix build against older servers.
+- Remove upstream patches:
+ + U_xf86-video-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch
+ + U_xf86-video-nouveau-add-gpu-identifier-to-connector-names-for-se.patch
+
+-------------------------------------------------------------------
Old:
----
U_xf86-video-nouveau-add-gpu-identifier-to-connector-names-for-se.patch
U_xf86-video-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch
xf86-video-nouveau-1.0.9.tar.bz2
New:
----
xf86-video-nouveau-1.0.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video-nouveau.spec ++++++
--- /var/tmp/diff_new_pack.Lg9BR6/_old 2013-11-26 06:15:16.000000000 +0100
+++ /var/tmp/diff_new_pack.Lg9BR6/_new 2013-11-26 06:15:16.000000000 +0100
@@ -24,7 +24,7 @@
BuildRequires: pkgconfig(libdrm) >= 2.4.25
BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.25
Url: http://nouveau.freedesktop.org/wiki/
-Version: 1.0.9
+Version: 1.0.10
Release: 0
Summary: Accelerated Open Source driver for nVidia cards
License: MIT
@@ -35,8 +35,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-nouveau-%{version}.tar.bz2
Patch0: N_xf86-video-nouveau_nva3-noaccel-info.patch
-Patch1:
U_xf86-video-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch
-Patch2:
U_xf86-video-nouveau-add-gpu-identifier-to-connector-names-for-se.patch
Supplements: modalias(xorg-x11-server:pci:v000012D2d*sv*sd*bc03sc*i*)
Supplements: modalias(xorg-x11-server:pci:v000010DEd*sv*sd*bc03sc*i*)
@@ -49,8 +47,6 @@
%prep
%setup -qn xf86-video-nouveau-%{version}
%patch0 -p1 -F 1 -b .nva3info
-%patch1 -p1
-%patch2 -p1
%build
autoreconf -fi
++++++ xf86-video-nouveau-1.0.9.tar.bz2 -> xf86-video-nouveau-1.0.10.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/ChangeLog
new/xf86-video-nouveau-1.0.10/ChangeLog
--- old/xf86-video-nouveau-1.0.9/ChangeLog 2013-07-30 07:34:50.000000000
+0200
+++ new/xf86-video-nouveau-1.0.10/ChangeLog 2013-11-07 06:00:41.000000000
+0100
@@ -1,3 +1,47 @@
+commit 480f0998ffed6d9a5c6656dba75182f00fd88a1b
+Author: Ben Skeggs <[email protected]>
+Date: Thu Nov 7 14:56:48 2013 +1000
+
+ bump to 1.0.10 for release
+
+ Signed-off-by: Ben Skeggs <[email protected]>
+
+commit 59395c738ebdc21087109075ada67ea8d7783141
+Author: Ben Skeggs <[email protected]>
+Date: Thu Nov 7 14:56:06 2013 +1000
+
+ recognise GK208 as a Kepler board
+
+ Signed-off-by: Ben Skeggs <[email protected]>
+
+commit 03642323a954d0adb11662a98e92dfa20bee9728
+Author: Dave Airlie <[email protected]>
+Date: Wed Jul 31 11:19:50 2013 +1000
+
+ nouveau: fix build against older servers.
+
+ Older servers had no GPU support.
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
+commit 27323ce68d58fcb82a648ab14abbc99acdc36f44
+Author: Dave Airlie <[email protected]>
+Date: Wed Jul 31 11:01:15 2013 +1000
+
+ nouveau: add gpu identifier to connector names for secondary gpus
+
+ this avoids clashes with identifiers from other GPUs.
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
+commit 1df177f35a05db505577cdc929e63fde906a704b
+Author: Dave Airlie <[email protected]>
+Date: Wed Jul 31 10:51:03 2013 +1000
+
+ nouveau: fix build on ppc by wrapping immintrin include.
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
commit 300c5a32d79cf507b5fede96710335bcd316eccb
Author: Dave Airlie <[email protected]>
Date: Tue Jul 30 15:28:06 2013 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/Makefile.in
new/xf86-video-nouveau-1.0.10/Makefile.in
--- old/xf86-video-nouveau-1.0.9/Makefile.in 2013-07-30 07:28:29.000000000
+0200
+++ new/xf86-video-nouveau-1.0.10/Makefile.in 2013-11-07 06:00:29.000000000
+0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/aclocal.m4
new/xf86-video-nouveau-1.0.10/aclocal.m4
--- old/xf86-video-nouveau-1.0.9/aclocal.m4 2013-07-30 07:28:28.000000000
+0200
+++ new/xf86-video-nouveau-1.0.10/aclocal.m4 2013-11-07 06:00:27.000000000
+0100
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -10729,7 +10729,7 @@
[am__api_version='1.13'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.13.2], [],
+m4_if([$1], [1.13.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -10745,7 +10745,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.2])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/configure
new/xf86-video-nouveau-1.0.10/configure
--- old/xf86-video-nouveau-1.0.9/configure 2013-07-30 07:28:30.000000000
+0200
+++ new/xf86-video-nouveau-1.0.10/configure 2013-11-07 06:00:30.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-nouveau 1.0.9.
+# Generated by GNU Autoconf 2.69 for xf86-video-nouveau 1.0.10.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-nouveau'
PACKAGE_TARNAME='xf86-video-nouveau'
-PACKAGE_VERSION='1.0.9'
-PACKAGE_STRING='xf86-video-nouveau 1.0.9'
+PACKAGE_VERSION='1.0.10'
+PACKAGE_STRING='xf86-video-nouveau 1.0.10'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1369,7 +1369,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-nouveau 1.0.9 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-nouveau 1.0.10 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1440,7 +1440,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nouveau 1.0.9:";;
+ short | recursive ) echo "Configuration of xf86-video-nouveau 1.0.10:";;
esac
cat <<\_ACEOF
@@ -1578,7 +1578,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-nouveau configure 1.0.9
+xf86-video-nouveau configure 1.0.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1902,7 +1902,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-nouveau $as_me 1.0.9, which was
+It was created by xf86-video-nouveau $as_me 1.0.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2791,7 +2791,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-nouveau'
- VERSION='1.0.9'
+ VERSION='1.0.10'
cat >>confdefs.h <<_ACEOF
@@ -19994,7 +19994,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-nouveau $as_me 1.0.9, which was
+This file was extended by xf86-video-nouveau $as_me 1.0.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20060,7 +20060,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-nouveau config.status 1.0.9
+xf86-video-nouveau config.status 1.0.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/configure.ac
new/xf86-video-nouveau-1.0.10/configure.ac
--- old/xf86-video-nouveau-1.0.9/configure.ac 2013-07-30 07:28:02.000000000
+0200
+++ new/xf86-video-nouveau-1.0.10/configure.ac 2013-11-07 05:59:45.000000000
+0100
@@ -22,7 +22,7 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-nouveau],
- [1.0.9],
+ [1.0.10],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-nouveau])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/man/Makefile.in
new/xf86-video-nouveau-1.0.10/man/Makefile.in
--- old/xf86-video-nouveau-1.0.9/man/Makefile.in 2013-07-30
07:32:32.000000000 +0200
+++ new/xf86-video-nouveau-1.0.10/man/Makefile.in 2013-11-07
06:00:29.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -349,9 +349,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu man/Makefile
+ $(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/src/Makefile.in
new/xf86-video-nouveau-1.0.10/src/Makefile.in
--- old/xf86-video-nouveau-1.0.9/src/Makefile.in 2013-07-30
07:32:32.000000000 +0200
+++ new/xf86-video-nouveau-1.0.10/src/Makefile.in 2013-11-07
06:00:29.000000000 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -491,9 +491,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/src/drmmode_display.c
new/xf86-video-nouveau-1.0.10/src/drmmode_display.c
--- old/xf86-video-nouveau-1.0.9/src/drmmode_display.c 2013-07-30
07:27:53.000000000 +0200
+++ new/xf86-video-nouveau-1.0.10/src/drmmode_display.c 2013-11-07
05:59:45.000000000 +0100
@@ -1098,6 +1098,12 @@
if (koutput->connector_type >= NUM_OUTPUT_NAMES)
snprintf(name, 32, "Unknown%d-%d", koutput->connector_type,
koutput->connector_type_id);
+#ifdef NOUVEAU_PIXMAP_SHARING
+ else if (pScrn->is_gpu)
+ snprintf(name, 32, "%s-%d-%d",
+ output_names[koutput->connector_type],
pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1,
+ koutput->connector_type_id);
+#endif
else
snprintf(name, 32, "%s-%d",
output_names[koutput->connector_type],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/src/nouveau_xv.c
new/xf86-video-nouveau-1.0.10/src/nouveau_xv.c
--- old/xf86-video-nouveau-1.0.9/src/nouveau_xv.c 2013-07-30
07:06:04.000000000 +0200
+++ new/xf86-video-nouveau-1.0.10/src/nouveau_xv.c 2013-07-31
03:15:19.000000000 +0200
@@ -25,7 +25,9 @@
#include "config.h"
#endif
+#ifdef __SSE2__
#include <immintrin.h>
+#endif
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-nouveau-1.0.9/src/nv_driver.c
new/xf86-video-nouveau-1.0.10/src/nv_driver.c
--- old/xf86-video-nouveau-1.0.9/src/nv_driver.c 2013-07-30
07:06:04.000000000 +0200
+++ new/xf86-video-nouveau-1.0.10/src/nv_driver.c 2013-11-07
05:59:45.000000000 +0100
@@ -309,7 +309,7 @@
nouveau_device_del(&dev);
- switch (chipset & 0xf0) {
+ switch (chipset & ~0xf) {
case 0x00:
case 0x10:
case 0x20:
@@ -324,6 +324,7 @@
case 0xd0:
case 0xe0:
case 0xf0:
+ case 0x100:
break;
default:
xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02x\n", chipset);
@@ -839,7 +840,7 @@
sprintf(pScrn->chipset, "NVIDIA NV%02X", dev->chipset);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Chipset: \"%s\"\n",
pScrn->chipset);
- switch (dev->chipset & 0xf0) {
+ switch (dev->chipset & ~0xf) {
case 0x00:
pNv->Architecture = NV_ARCH_04;
break;
@@ -868,6 +869,7 @@
break;
case 0xe0:
case 0xf0:
+ case 0x100:
pNv->Architecture = NV_ARCH_E0;
break;
default:
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
