From f5f8fc56e7349316b5bc68a0203d0f7eedf32014 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Mar 2011 15:08:53 -0400 Subject: [PATCH] today's git snap --- mesa.spec | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/mesa.spec b/mesa.spec index 56d1454..fd9ca7d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -6,16 +6,19 @@ %define with_hardware 1 %endif +# broken atm, sorry. fix before any f15 merge. +%define with_llvmcore 0 + %define _default_patch_fuzz 2 %define manpages gl-manpages-1.0.1 -%define gitdate 20110107 +%define gitdate 20110315 #% define snapshot Summary: Mesa graphics libraries Name: mesa -Version: 7.10 -Release: 0.26%{?dist} +Version: 7.11 +Release: 0.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -37,21 +40,12 @@ Patch8: mesa-7.10-llvmcore.patch Patch30: mesa-7.6-hush-vblank-warning.patch Patch31: mesa-7.10-swrastg.patch -# nouveau patches -# -# update nouveau gallium drivers to git as of 20110117, nvc0 support -Patch50: mesa-7.10-nouveau-updates.patch -# revert various bits to be compatible with 7.10 -Patch51: mesa-7.10-nouveau-revert.patch -# fixup classic drivers to new libdrm api -Patch52: mesa-7.10-nouveau-classic-libdrm.patch - BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6 BuildRequires: xorg-x11-server-devel %endif -BuildRequires: libdrm-devel >= 2.4.24-0 +BuildRequires: libdrm-devel >= 2.4.24-1 BuildRequires: libXxf86vm-devel BuildRequires: expat-devel >= 2.0 BuildRequires: xorg-x11-proto-devel >= 7.4-35 @@ -68,6 +62,7 @@ BuildRequires: llvm-static BuildRequires: libxml2-python BuildRequires: libudev-devel BuildRequires: libtalloc-devel +BuildRequires: bison flex %description Mesa @@ -114,6 +109,7 @@ Group: User Interface/X Hardware Support %description dri-filesystem Mesa DRI driver filesystem +%if %{with_llvmcore} %package dri-llvmcore Summary: Mesa common LLVM support Group: User Interface/X Hardware Support @@ -122,6 +118,7 @@ Requires: mesa-dri-filesystem%{?_isa} Common DSO for LLVM support for gallium-based DRI drivers. This package exists solely as a disk space hack for Mesa. Do not link against this library if you are not Mesa. You have been warned. +%endif %package dri-drivers Summary: Mesa-based DRI drivers @@ -220,12 +217,12 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide %patch3 -p1 -b .no-mach64 %patch4 -p1 -b .classic #patch7 -p1 -b .dricore -%patch8 -p1 -b .llvmcore %patch30 -p1 -b .vblank-warning #patch31 -p1 -b .swrastg -%patch50 -p1 -b .nv-update -%patch51 -p1 -b .nv-revert -%patch52 -p1 -b .nv-libdrm + +%if %{with_llvmcore} +%patch8 -p1 -b .llvmcore +%endif %build @@ -252,9 +249,11 @@ make clean [ `find . -name \*.o | wc -l` -eq 0 ] || exit 1 # build llvmcore +%if %{with_llvmcore} TOP=`pwd` make -f %{SOURCE4} llvmcore mkdir -p %{_lib} mv libllvmcore*.so %{_lib} +%endif # now build the rest of mesa %configure %{common_flags} \ @@ -298,7 +297,9 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS= # just the DRI drivers that are sane install -d $RPM_BUILD_ROOT%{_libdir}/dri +%if %{with_llvmcore} install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libllvmcore-2.8.so >& /dev/null +%endif # use gallium driver iff built [ -f %{_lib}/gallium/r300_dri.so ] && cp %{_lib}/gallium/r300_dri.so %{_lib}/r300_dri.so [ -f %{_lib}/gallium/r600_dri.so ] && cp %{_lib}/gallium/r600_dri.so %{_lib}/r600_dri.so @@ -360,8 +361,6 @@ rm -rf $RPM_BUILD_ROOT %doc docs/COPYING %{_libdir}/libEGL.so.1 %{_libdir}/libEGL.so.1.* -%{_libdir}/egl/egl_glx.so -%{_libdir}/egl/egl_dri2.so %files libGLES %defattr(-,root,root,-) @@ -370,15 +369,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libGLESv1_CM.so.1.* %{_libdir}/libGLESv2.so.2 %{_libdir}/libGLESv2.so.2.* +%{_libdir}/libglapi.so.0 +%{_libdir}/libglapi.so.0.* %files dri-filesystem %defattr(-,root,root,-) %doc docs/COPYING %dir %{_libdir}/dri +%if %{with_llvmcore} %files dri-llvmcore %defattr(-,root,root,-) %{_libdir}/dri/libllvmcore-2.8.so +%endif %files dri-drivers %defattr(-,root,root,-) @@ -448,6 +451,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/glesv2.pc %{_libdir}/libGLESv1_CM.so %{_libdir}/libGLESv2.so +%{_libdir}/libglapi.so %files libGLU %defattr(-,root,root,-) @@ -473,6 +477,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Tue Mar 15 2011 Adam Jackson 7.11-0.20110315.0 +- Today's git snap +- Add with_llvmcore macro, and turn it off momentarily + * Wed Feb 09 2011 Adam Jackson 7.10-0.26 - BuildRequires: libdrm >= 2.4.24-0 (#668363)