diff --git a/mesa.spec b/mesa.spec index 52b9294..a4349e4 100644 --- a/mesa.spec +++ b/mesa.spec @@ -59,7 +59,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.2.1 -Release: 1.%{gitdate}%{?dist} +Release: 2.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -87,8 +87,6 @@ Patch21: 0001-mesa-Don-t-optimize-out-glClear-if-drawbuffer-size-i.patch # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch -Patch100: radeonsi-llvm-version-hack.patch - BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers @@ -113,7 +111,7 @@ BuildRequires: gettext %if 0%{?with_private_llvm} BuildRequires: mesa-private-llvm-devel %else -BuildRequires: llvm-devel >= 3.4-6 +BuildRequires: llvm-devel >= 3.4-7 %if 0%{?with_opencl} BuildRequires: clang-devel >= 3.0 %endif @@ -357,8 +355,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch99 -p1 -b .icd %endif -%patch100 -p1 -b .radeonsi_llvm_hack - %if 0%{with_private_llvm} sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac @@ -682,6 +678,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 11 2014 Igor Gnatenko - 10.2.1-2.20140608 +- drop radeonsi llvm hack + * Sun Jun 08 2014 Igor Gnatenko - 10.2.1-1.20140608 - 10.2.1 upstream release diff --git a/radeonsi-llvm-version-hack.patch b/radeonsi-llvm-version-hack.patch deleted file mode 100644 index e82a1c8..0000000 --- a/radeonsi-llvm-version-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr mesa-20140521.orig/configure.ac mesa-20140521/configure.ac ---- mesa-20140521.orig/configure.ac 2014-05-21 20:11:53.662619590 +0400 -+++ mesa-20140521/configure.ac 2014-05-21 20:14:19.361398680 +0400 -@@ -1642,7 +1642,7 @@ - LLVM_COMPONENTS="${LLVM_COMPONENTS} option" - fi - fi -- DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DLLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" -+ DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DLLVM_VERSION_PATCH=1" - MESA_LLVM=1 - - dnl Check for Clang internal headers