hrw pushed to xorg-x11-drv-armsoc (master). "treat pointer as pointer - fixes FTBFS on AArch64"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 11 10:13:27 UTC 2015


From 78fd099cba9007ee5c883e3582bf07822c65a27e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
Date: Mon, 11 May 2015 12:12:22 +0200
Subject: treat pointer as pointer - fixes FTBFS on AArch64


diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644
index 0000000..ce0f630
--- /dev/null
+++ b/gcc5.patch
@@ -0,0 +1,15 @@
+Index: xf86-video-armsoc-20150212/src/armsoc_dri2.c
+===================================================================
+--- xf86-video-armsoc-20150212.orig/src/armsoc_dri2.c
++++ xf86-video-armsoc-20150212/src/armsoc_dri2.c
+@@ -247,8 +247,8 @@ static Bool create_buffer(DrawablePtr pD
+ #if DRI2INFOREC_VERSION >= 6
+ 		else if (FALSE == DRI2SwapLimit(pDraw, pARMSOC->swap_chain_size)) {
+ 			WARNING_MSG(
+-				"Failed to set DRI2SwapLimit(%x,%d)",
+-				(unsigned int)pDraw, pARMSOC->swap_chain_size);
++				"Failed to set DRI2SwapLimit(%p,%d)",
++				pDraw, pARMSOC->swap_chain_size);
+ 		}
+ #endif /* DRI2INFOREC_VERSION >= 6 */
+ 	}
diff --git a/xorg-x11-drv-armsoc.spec b/xorg-x11-drv-armsoc.spec
index 435a6b2..2096908 100644
--- a/xorg-x11-drv-armsoc.spec
+++ b/xorg-x11-drv-armsoc.spec
@@ -6,13 +6,14 @@
 Summary:   Xorg X11 armsocdrm driver
 Name:      xorg-x11-drv-armsoc
 Version:   1.1.0
-Release:   1%{?gitrev}%{?dist}
+Release:   2%{?gitrev}%{?dist}
 URL:       http://cgit.freedesktop.org/xorg/driver/xf86-video-armsoc
 License:   MIT
 Group:     User Interface/X Hardware Support
 
 Source0:    xf86-video-armsoc-%{gitdate}.tar.bz2
 Source2:    make-git-snapshot.sh
+Patch0:     gcc5.patch
 
 ExclusiveArch: %{arm} aarch64
 
@@ -45,6 +46,7 @@ Exynos 4/5 series ARM devices.
 %prep
 %setup -q -n xf86-video-armsoc-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} 
 touch AUTHORS
+%patch0 -p1
 
 %build
 %{?gitdate:autoreconf -v --install}
@@ -65,6 +67,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 %{_mandir}/man4/armsoc.4*
 
 %changelog
+* Mon May 11 2015 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 1.1.0-2.20150212
+- Handle pointer as a pointer to make gcc happy.
+
 * Thu Feb 12 2015 Hans de Goede <hdegoede at redhat.com> - 1.1.0-1.20150212
 - Update to git snapshot of the day to fix FTBFS
 - This also bumps the version we're based on from 0.7.0 + git patches to
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-armsoc.git/commit/?h=master&id=78fd099cba9007ee5c883e3582bf07822c65a27e


More information about the scm-commits mailing list