add missing dependency for /etc/OpenCL/vendors ownership (RHBZ #1265948)

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

Makefile

@@ -4,7 +4,7 @@ SANITIZE ?= 1
 
 ifeq ($(strip $(COMMIT)),)
 	COMMIT = `date +%Y%m%d`
-	BRANCH = 10.6
+	BRANCH = 11.1
 else
 	BRANCH = master
 endif

mesa.spec

@@ -48,14 +48,14 @@
 
 %define _default_patch_fuzz 2
 
-#% define gitdate 20150218
-%define githash 21ccdbd
+%define gitdate 20151218
+#% define githash 21ccdbd
 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 11.0.0
-Release: 0.devel.2.%{git}%{?dist}
+Version: 11.1.0
+Release: 4.%{git}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,7 +75,7 @@ Patch20: mesa-10.2-evergreen-big-endian.patch
 Patch30: mesa-10.3-bigendian-assert.patch
 
 # To have sha info in glxinfo
-BuildRequires: git
+BuildRequires: git-core
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -130,6 +130,7 @@ BuildRequires: libomxil-bellagio-devel
 BuildRequires: libclc-devel llvm-static opencl-filesystem
 %endif
 BuildRequires: python-mako
+BuildRequires: libstdc++-static
 
 %description
 Mesa
@@ -312,6 +313,7 @@ Summary: Mesa OpenCL runtime library
 Requires: ocl-icd
 Requires: libclc
 Requires: mesa-libgbm = %{version}-%{release}
+Requires: opencl-filesystem
 
 %description libOpenCL
 Mesa OpenCL runtime library.
@@ -366,6 +368,8 @@ export CFLAGS="$RPM_OPT_FLAGS"
 # We do say 'catch' in the clover and d3d1x state trackers, but we're not
 # building those yet.
 export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_opencl:-fno-rtti -fno-exceptions}"
+export LDFLAGS="%{__global_ldflags} -static-libstdc++"
+
 %ifarch %{ix86}
 # i do not have words for how much the assembly dispatch code infuriates me
 %define asm_flags --disable-asm
@@ -395,7 +399,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
 %if %{with_hardware}
     %{?with_xa:--enable-xa} \
     %{?with_nine:--enable-nine} \
-    --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}%{?with_vc4:vc4,}%{?with_ilo:ilo,}r300,nouveau \
+    --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}%{?with_vc4:vc4,}%{?with_ilo:ilo,}r300,nouveau,virgl \
 %else
     --with-gallium-drivers=%{?with_llvm:swrast} \
 %endif
@@ -404,6 +408,14 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
 %endif
     %{?dri_drivers}
 
+# libtool refuses to pass through things you ask for in LDFLAGS that it doesn't
+# know about, like -static-libstdc++, so...
+sed -i 's/-fuse-linker-plugin|/-static-lib*|&/' libtool
+sed -i 's/-nostdlib//g' libtool
+sed -i 's/^predep_objects=.*$/#&/' libtool
+sed -i 's/^postdep_objects=.*$/#&/' libtool
+sed -i 's/^postdeps=.*$/#&/' libtool
+
 make %{?_smp_mflags} MKDEP=/bin/true
 
 %install
@@ -434,6 +446,8 @@ pushd $RPM_BUILD_ROOT%{_libdir}
 for i in libOSMesa*.so libGL.so ; do
     eu-findtextrel $i && exit 1
 done
+# check that we really didn't link libstdc++ dynamically
+eu-readelf -d i965_dri.so | grep -q libstdc && exit 1
 popd
 
 %clean
@@ -533,6 +547,7 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?with_vmware}
 %{_libdir}/dri/vmwgfx_dri.so
 %endif
+%{_libdir}/dri/virtio_gpu_dri.so
 %endif
 %if 0%{?with_llvm}
 %ifarch %{ix86} x86_64
@@ -675,6 +690,45 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jun 14 2016 Dominik Mierzejewski <rpm@greysector.net> - 11.1.0-4
+- add missing dependency for /etc/OpenCL/vendors ownership (RHBZ #1265948)
+
+* Fri Feb 26 2016 Dave Airlie <airlied@redhat.com> 11.1.0-3
+- enable virgl
+
+* Fri Jan 08 2016 Adam Jackson <ajax@redhat.com> 11.1.0-2
+- Link with -static-libstdc++
+
+* Fri Dec 18 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.1.0-1.20151218
+- 11.1.0
+
+* Sun Nov 22 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.0.6-1.20151122
+- 11.0.6
+
+* Thu Nov 05 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.0.4-1.20151105
+- 11.0.4
+
+* Mon Oct 12 2015 Dave Airlie <airlied@redhat.com> 11.0.3-1.20151012
+- 11.0.3
+
+* Fri Oct 02 2015 Dave Airlie <airlied@redhat.com> 11.0.2-1.20151002
+- 11.0.2
+
+* Mon Sep 21 2015 Dave Airlie <airlied@redhat.com> 11.0.0-2.20150913
+- rebuild 11.0.0 against llvm 3.7
+
+* Sun Sep 13 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.0.0-1.20150913
+- 11.0.0
+
+* Thu Sep 10 2015 Rex Dieter <rdieter@fedoraproject.org> 11.0.0-0.rc2.2.20150902
+- Add brw_meta_fast_clear crash workaround patch (#1259443, fdo#86281)
+
+* Wed Sep 02 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 11.0.0-0.rc2.1.20150902
+- 11.0.0-rc2
+
+* Mon Aug 24 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 11.0.0-0.rc1.1.20150824
+- 11.0.0-rc1
+
 * Sun Aug 09 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 11.0.0-0.devel.2.21ccdbd
 - 21ccdbd
 - add surfaceless EGL platform (RHBZ #1251747)

sources

@@ -1 +1 @@
-a8bd72c65daf9cc9b889cfaf11e9bdf2  mesa-21ccdbd.tar.xz
+0e7dbbeb7fe55a779b16014fdd710b44  mesa-20151218.tar.xz