Attachment 866787 Details for Bug 1068994 – 'xorg-x11-drv-nouveau' update to 1.0.10

[patch] 'xorg-x11-drv-nouveau' update to 1.0.10

xorg-x11-drv-nouveau-1.0.10.diff (text/plain), 5.36 KB, created by poma on 2014-02-23 21:45:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-02-23 21:45:56 UTC

Size: 5.36 KB

patch

obsolete

>diff --git a/0001-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch b/0001-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch
>deleted file mode 100644
>index 0545710..0000000
>--- a/0001-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-From 1df177f35a05db505577cdc929e63fde906a704b Mon Sep 17 00:00:00 2001
>-From: Dave Airlie <airlied@gmail.com>
>-Date: Wed, 31 Jul 2013 10:51:03 +1000
>-Subject: [PATCH 1/2] nouveau: fix build on ppc by wrapping immintrin include.
>-
>-Signed-off-by: Dave Airlie <airlied@redhat.com>
>----
>- src/nouveau_xv.c | 2 ++
>- 1 file changed, 2 insertions(+)
>-
>-diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
>-index 5569b7c..e19378d 100644
>---- a/src/nouveau_xv.c
>-+++ b/src/nouveau_xv.c
>-@@ -25,7 +25,9 @@
>- #include "config.h"
>- #endif
>- 
>-+#ifdef __SSE2__
>- #include <immintrin.h>
>-+#endif
>- 
>- #include "xf86xv.h"
>- #include <X11/extensions/Xv.h>
>--- 
>-1.8.3.1
>-
>diff --git a/0002-nouveau-add-gpu-identifier-to-connector-names-for-se.patch b/0002-nouveau-add-gpu-identifier-to-connector-names-for-se.patch
>deleted file mode 100644
>index 7c6e496..0000000
>--- a/0002-nouveau-add-gpu-identifier-to-connector-names-for-se.patch
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-From 27323ce68d58fcb82a648ab14abbc99acdc36f44 Mon Sep 17 00:00:00 2001
>-From: Dave Airlie <airlied@gmail.com>
>-Date: Wed, 31 Jul 2013 11:01:15 +1000
>-Subject: [PATCH 2/2] nouveau: add gpu identifier to connector names for
>- secondary gpus
>-
>-this avoids clashes with identifiers from other GPUs.
>-
>-Signed-off-by: Dave Airlie <airlied@redhat.com>
>----
>- src/drmmode_display.c | 4 ++++
>- 1 file changed, 4 insertions(+)
>-
>-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>-index 570a9e4..3563b2a 100644
>---- a/src/drmmode_display.c
>-+++ b/src/drmmode_display.c
>-@@ -1098,6 +1098,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
>- 	if (koutput->connector_type >= NUM_OUTPUT_NAMES)
>- 		snprintf(name, 32, "Unknown%d-%d", koutput->connector_type,
>- 			 koutput->connector_type_id);
>-+	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);
>- 	else
>- 		snprintf(name, 32, "%s-%d",
>- 			 output_names[koutput->connector_type],
>--- 
>-1.8.3.1
>-
>diff --git a/sources b/sources
>index 8690d12..5541bf3 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-8b2c0df5de3929597ade8c5ddb489a44  xf86-video-nouveau-1.0.9.tar.bz2
>+44fd65897630fdd19c086133cc1bd679  xf86-video-nouveau-1.0.10.tar.bz2
>diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
>index 8843002..987d611 100644
>--- a/xorg-x11-drv-nouveau.spec
>+++ b/xorg-x11-drv-nouveau.spec
>@@ -1,28 +1,18 @@
> %define tarball xf86-video-nouveau
> %define moduledir %(pkg-config xorg-server --variable=moduledir )
> %define driverdir %{moduledir}/drivers
>-#define gitdate 20120816
> 
> Summary:   Xorg X11 nouveau video driver for NVIDIA graphics chipsets
> Name:      xorg-x11-drv-nouveau
> # need to set an epoch to get version number in sync with upstream
> Epoch:     1
>-Version:   1.0.9
>-Release:   7%{?dist}
>+Version:   1.0.10
>+Release:   1%{?dist}
> URL:       http://www.x.org
> License:   MIT
> Group:     User Interface/X Hardware Support
> 
>-# Fedora specific snapshot no upstream release
>-%if 0%{?gitdate}
>-Source0: xf86-video-nouveau-%{gitdate}.tar.xz
>-%else
> Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-nouveau-%{version}.tar.bz2
>-%endif
>-Source1: make-git-snapshot.sh
>-
>-Patch0: 0001-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch
>-Patch1: 0002-nouveau-add-gpu-identifier-to-connector-names-for-se.patch
> 
> ExcludeArch: s390 s390x
> 
>@@ -31,7 +21,7 @@ Obsoletes: xorg-x11-drv-nv < 2.1.20-3
> %endif
> 
> BuildRequires: libtool automake autoconf
>-BuildRequires: xorg-x11-server-devel >= xorg-x11-server-1.14.2-8
>+BuildRequires: xorg-x11-server-devel >= 1.14.2-8
> BuildRequires: libdrm-devel >= 2.4.24-0.1.20110106
> BuildRequires: mesa-libGL-devel
> %if 0%{?fedora} > 17 || 0%{?rhel} > 6
>@@ -47,19 +37,12 @@ Requires:  libdrm >= 2.4.33-0.1
> %description 
> X.Org X11 nouveau video driver.
> 
>-%if 0%{?gitdate}
>-%define dirsuffix %{gitdate}
>-%else
> %define dirsuffix %{version}
>-%endif
> 
> %prep
> %setup -q -n xf86-video-nouveau-%{dirsuffix}
>-%patch0 -p1 -b .ppc
>-%patch1 -p1 -b .randrnames
> 
> %build
>-autoreconf -v --install
> %configure --disable-static
> 
> make
>@@ -80,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man4/nouveau.4*
> 
> %changelog
>+* Sun Feb 23 2014 poma <poma@gmail.com> - 1:1.0.10-1
>+- nouveau 1.0.10
>+
> * Mon Jan 13 2014 Adam Jackson <ajax@redhat.com> - 1:1.0.9-7
> - 1.15 ABI rebuild
> 
>@@ -239,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT
> * Wed Dec 01 2010 Peter Hutterer <peter.hutterer@redhat.com>  0.0.16-14
> - Rebuild for X Server 1.10
> 
>-* Mon Nov 30 2010 Ben Skeggs <bskeggs@redhat.com> 0.0.16.13
>+* Tue Nov 30 2010 Ben Skeggs <bskeggs@redhat.com> 0.0.16.13
> - fix compiz breakage
> 
> * Mon Nov 29 2010 Ben Skeggs <bskeggs@redhat.com> 0.0.16-12
>@@ -321,7 +307,7 @@ rm -rf $RPM_BUILD_ROOT
> * Wed Jul 15 2009 Adam Jackson <ajax@redhat.com> - 1:0.0.14-1.20090701git6d14327.1
> - ABI bump
> 
>-* Mon Jul 7 2009 Ben Skeggs <bskeggs@redhat.com> 0.0.14-1.20090701git6d14327
>+* Tue Jul 07 2009 Ben Skeggs <bskeggs@redhat.com> 0.0.14-1.20090701git6d14327
> - update from upstream + bring back additional features found in F11
> 
> * Fri Jun 26 2009 Ben Skeggs <bskeggs@redhat.com> 0.0.14-0.20090625gitc0bf670

Actions: View | Diff

Attachments on bug 1068994: 866787