diff --git a/.gitignore b/.gitignore index 1cc6c9d..e3eb4c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-video-ati-20140113.tar.xz +SOURCES/xf86-video-ati-20140918.tar.xz diff --git a/.xorg-x11-drv-ati.metadata b/.xorg-x11-drv-ati.metadata index 989f9f5..640bd11 100644 --- a/.xorg-x11-drv-ati.metadata +++ b/.xorg-x11-drv-ati.metadata @@ -1 +1 @@ -f1eb98e1b177d551fdd2ca7e9a1ec267b52ca8a8 SOURCES/xf86-video-ati-20140113.tar.xz +f6127d5c71baca381260e09fdadeee329f2d7ba4 SOURCES/xf86-video-ati-20140918.tar.xz diff --git a/SOURCES/fix-ppc-rendering.patch b/SOURCES/fix-ppc-rendering.patch deleted file mode 100644 index 1b5adbc..0000000 --- a/SOURCES/fix-ppc-rendering.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 93681736d3ed1f2063c50581a779b793bcaba715 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= -Date: Mon, 24 Feb 2014 14:50:25 -0500 -Subject: [PATCH] evergreen: fix shader constant upload on ppc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The number of dword we have to swap is (16*4) ie 16 vectors of -4 floats each not 16 floats. Never hit this issue before because -we never had more than 4 constant vector. - -Signed-off-by: Jérôme Glisse ---- - src/evergreen_accel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/evergreen_accel.c b/src/evergreen_accel.c -index e25010b..3a76a71 100644 ---- a/src/evergreen_accel.c -+++ b/src/evergreen_accel.c -@@ -561,7 +561,7 @@ evergreen_set_alu_consts(ScrnInfoPtr pScrn, const_config_t *const_conf, uint32_t - - #if X_BYTE_ORDER == X_BIG_ENDIAN - { -- uint32_t count = size << 4, *p = const_conf->cpu_ptr; -+ uint32_t count = size << 6, *p = const_conf->cpu_ptr; - - while(count--) { - *p = cpu_to_le32(*p); --- -1.8.4.2 - diff --git a/SPECS/xorg-x11-drv-ati.spec b/SPECS/xorg-x11-drv-ati.spec index bda0ce0..54ccb88 100644 --- a/SPECS/xorg-x11-drv-ati.spec +++ b/SPECS/xorg-x11-drv-ati.spec @@ -1,8 +1,8 @@ %define tarball xf86-video-ati %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20140113 -%define gitversion 3213df1 +%define gitdate 20140918 +%define gitversion 56c7fb8 %if 0%{?gitdate} %define gver .%{gitdate}git%{gitversion} @@ -10,8 +10,8 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati -Version: 7.2.0 -Release: 9%{?gver}%{?dist} +Version: 7.4.0 +Release: 1%{?gver}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -21,7 +21,6 @@ Source0: %{tarball}-%{gitdate}.tar.xz Patch10: radeon-6.12.2-lvds-default-modes.patch Patch13: fix-default-modes.patch -Patch14: fix-ppc-rendering.patch ExcludeArch: s390 s390x @@ -32,8 +31,8 @@ BuildRequires: kernel-headers >= 3.10.0-31 BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.17-3 BuildRequires: systemd-devel -%ifnarch ppc ppc64 -BuildRequires: xorg-x11-glamor-devel +%ifnarch ppc ppc64 ppc64le +BuildRequires: xorg-x11-glamor-devel >= 0.6.0 %endif BuildRequires: xorg-x11-server-devel >= 1.14.2 @@ -48,11 +47,10 @@ X.Org X11 ati video driver. %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}} %patch10 -p1 -b .lvds %patch13 -p1 -b .def -%patch14 -p1 -b .ppc %build autoreconf -iv -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64le %configure --disable-static --disable-glamor %else %configure --disable-static --enable-glamor @@ -80,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Thu Sep 25 2014 Jérôme Glisse 7.4.0-1.20140918git56c7fb8 +- Rebase for 7.1 (#1144069) and ppc64le changes (related #1117076) + * Tue Feb 25 2014 Jerome Glisse 7.2.0-9.20140113git3213df1 - Fix ppc rendering issue + fix spec file (#1054548 #1043624)