[mesa] Rebase to 'master' branch (f381c27c548aa28b003c8e188f5d627ab4105f76 commit)
Igor Gnatenko
ignatenkobrain at fedoraproject.org
Fri Jul 11 15:29:47 UTC 2014
commit 007eb4e80d57f55e7e37920fc3fa1137bc84d6ff
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Fri Jul 11 19:27:50 2014 +0400
Rebase to 'master' branch (f381c27c548aa28b003c8e188f5d627ab4105f76 commit)
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
.gitignore | 1 +
...e-Work-without-sse2-if-llvm-is-new-enough.patch | 33 -
...s-casual-about-texture-formats-in-st_fina.patch | 39 -
0001-opencl-use-versioned-.so-in-mesa.icd.patch | 22 +-
make-git-snapshot.sh | 12 +-
mesa-7.10-swrastg.patch | 23 -
mesa-8.0-nouveau-tfp-blacklist.patch | 201 ----
mesa-9.0.1-less-cxx-please.patch | 13 -
mesa-no-libkms.patch | 978 --------------------
mesa-undefined-symbols.patch | 57 --
mesa.spec | 25 +-
sources | 2 +-
12 files changed, 37 insertions(+), 1369 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8cc23a5..031afd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ mesa-20100720.tar.bz2
/mesa-20140608.tar.xz
/mesa-20140625.tar.xz
/mesa-20140711.tar.xz
+/mesa-f381c27c548aa28b003c8e188f5d627ab4105f76.tar.xz
diff --git a/0001-opencl-use-versioned-.so-in-mesa.icd.patch b/0001-opencl-use-versioned-.so-in-mesa.icd.patch
index 35c9c47..564ee2a 100644
--- a/0001-opencl-use-versioned-.so-in-mesa.icd.patch
+++ b/0001-opencl-use-versioned-.so-in-mesa.icd.patch
@@ -1,4 +1,4 @@
-From 062e79e1cc1e2d22d5d9d7fe5d394b923372fe45 Mon Sep 17 00:00:00 2001
+From 69b30e8f48b24a28c7d27ba59b02776da10cc5a6 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Sun, 12 Jan 2014 02:09:16 +0400
Subject: [PATCH] opencl: use versioned .so in mesa.icd
@@ -19,7 +19,7 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
create mode 100644 src/gallium/targets/opencl/mesa.icd.in
diff --git a/configure.ac b/configure.ac
-index 164b662..fe64a9a 100644
+index 4646212..89a4f48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
@@ -31,27 +31,27 @@ index 164b662..fe64a9a 100644
dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.38
-@@ -2111,6 +2113,7 @@ AC_CONFIG_FILES([Makefile
- src/gallium/targets/egl-static/Makefile
- src/gallium/targets/gbm/Makefile
+@@ -2215,6 +2217,7 @@ AC_CONFIG_FILES([Makefile
+ src/gallium/targets/libgl-xlib/Makefile
+ src/gallium/targets/omx/Makefile
src/gallium/targets/opencl/Makefile
+ src/gallium/targets/opencl/mesa.icd
- src/gallium/targets/xa/Makefile
- src/gallium/targets/xa/xatracker.pc
- src/gallium/targets/omx-nouveau/Makefile
+ src/gallium/targets/osmesa/Makefile
+ src/gallium/targets/osmesa/osmesa.pc
+ src/gallium/targets/pipe-loader/Makefile
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
-index ba45aee..0a3d134 100644
+index ca047f0..82e29a6 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
-@@ -5,7 +5,7 @@ lib_LTLIBRARIES = lib at OPENCL_LIBNAME@.la
+@@ -7,7 +7,7 @@ lib_LTLIBRARIES = lib at OPENCL_LIBNAME@.la
lib at OPENCL_LIBNAME@_la_LDFLAGS = \
$(LLVM_LDFLAGS) \
-no-undefined \
- -version-number 1:0 \
+ -version-number @OPENCL_VERSION@:0 \
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym \
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
+
diff --git a/src/gallium/targets/opencl/mesa.icd b/src/gallium/targets/opencl/mesa.icd
deleted file mode 100644
index 6a6a870..0000000
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
index b5045fe..eacbac9 100755
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@@ -11,15 +11,21 @@ else
XZ=/usr/bin/xz
fi
-DIRNAME=mesa-$( date +%Y%m%d )
+if [ -z "$1" ]; then
+ DIRNAME=mesa-$( date +%Y%m%d )
+ BRANCH=10.2
+else
+ DIRNAME=mesa-$1
+ BRANCH=master
+fi
echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
-echo HEAD ${1:-10.2}
+echo HEAD ${1:-$BRANCH}
rm -rf $DIRNAME
-git clone --depth 1 ${REF:+--reference $REF} --branch 10.2 \
+git clone --depth 1 ${REF:+--reference $REF} --branch $BRANCH \
git://git.freedesktop.org/git/mesa/mesa $DIRNAME
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
diff --git a/mesa.spec b/mesa.spec
index 1c63e4f..062eb23 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,7 +13,7 @@
# S390 doesn't have video cards, but we need swrast for xserver's GLX
# llvm (and thus llvmpipe) doesn't actually work on ppc32
-%ifnarch s390 ppc
+%ifnarch s390 ppc ppc64le
%define with_llvm 1
%endif
@@ -47,19 +47,20 @@
%define _default_patch_fuzz 2
-%define gitdate 20140711
-#% define snapshot
+#% define gitdate 20140510
+%define githash f381c27c548aa28b003c8e188f5d627ab4105f76
+%define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
Summary: Mesa graphics libraries
Name: mesa
-Version: 10.2.3
-Release: 1.%{gitdate}%{?dist}
+Version: 10.3
+Release: 0.devel.19.%{git}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
# Source0: MesaLib-%{version}.tar.xz
-Source0: %{name}-%{gitdate}.tar.xz
+Source0: %{name}-%{git}.tar.xz
Source1: sanitize-tarball.sh
Source2: make-release-tarball.sh
Source3: make-git-snapshot.sh
@@ -327,7 +328,7 @@ Mesa OpenCL development package.
%prep
#setup -q -n Mesa-%{version}%{?snapshot}
-%setup -q -n mesa-%{gitdate}
+%setup -q -n mesa-%{git}
grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
%patch1 -p1 -b .nv50rtti
@@ -546,9 +547,7 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{?with_omx}
%files omx-drivers
%defattr(-,root,root,-)
-%{_libdir}/bellagio/libomx_nouveau.so*
-%{_libdir}/bellagio/libomx_r600.so*
-%{_libdir}/bellagio/libomx_radeonsi.so*
+%{_libdir}/bellagio/libomx_mesa.so
%endif
%if 0%{?with_vdpau}
%files vdpau-drivers
@@ -585,6 +584,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/EGL/egl.h
%{_includedir}/EGL/eglmesaext.h
%{_includedir}/EGL/eglplatform.h
+%{_includedir}/EGL/eglextchromium.h
%dir %{_includedir}/KHR
%{_includedir}/KHR/khrplatform.h
%{_libdir}/pkgconfig/egl.pc
@@ -673,7 +673,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libMesaOpenCL.so
%endif
+# Generate changelog using:
+# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
%changelog
+* Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 10.3-0.devel.1.f381c27c548aa28b003c8e188f5d627ab4105f76
+- Rebase to 'master' branch (f381c27c548aa28b003c8e188f5d627ab4105f76 commit)
+
* Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 10.2.3-1.20140711
- 10.2.3 upstream release
diff --git a/sources b/sources
index 87e408d..27e8de9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74c4f5f50aca7006cd537f99c085ab1b mesa-20140711.tar.xz
+4dce9cb9f6e9e0f7f8e12f08dccd4285 mesa-f381c27c548aa28b003c8e188f5d627ab4105f76.tar.xz
More information about the scm-commits
mailing list