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 new file mode 100644 index 0000000..0545710 --- /dev/null +++ b/0001-nouveau-fix-build-on-ppc-by-wrapping-immintrin-inclu.patch @@ -0,0 +1,27 @@ +From 1df177f35a05db505577cdc929e63fde906a704b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +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 +--- + 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 ++#endif + + #include "xf86xv.h" + #include +-- +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 new file mode 100644 index 0000000..7c6e496 --- /dev/null +++ b/0002-nouveau-add-gpu-identifier-to-connector-names-for-se.patch @@ -0,0 +1,31 @@ +From 27323ce68d58fcb82a648ab14abbc99acdc36f44 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +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 +--- + 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/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec index e04dda7..0ecb5be 100644 --- a/xorg-x11-drv-nouveau.spec +++ b/xorg-x11-drv-nouveau.spec @@ -8,7 +8,7 @@ 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: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -21,6 +21,9 @@ Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-nouvea %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 %if 0%{?fedora} > 18 @@ -53,6 +56,8 @@ X.Org X11 nouveau video driver. %prep %setup -q -n xf86-video-nouveau-%{dirsuffix} +%patch0 -p1 -b .ppc +%patch1 -p1 -b .randrnames %build autoreconf -v --install @@ -76,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/nouveau.4* %changelog +* Wed Jul 31 2013 Dave Airlie 1.0.9-2 +- fix powerpc build - fix name collisions in randr + * Tue Jul 30 2013 Dave Airlie 1.0.9-1 - add upstream 1.0.9 release - fixes dual head offload + nvf0 support