[packages/Mesa/MESA_12_0] 12.0.0-rc1

Tue May 31 13:33:14 CEST 2016

commit 9405a391d3ee92677e13167278a28910ddfdb710
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Tue May 31 13:32:41 2016 +0200

    12.0.0-rc1

 Mesa.spec                | 22 +++++++---------------
 keep_git_sha.patch       | 32 --------------------------------
 missing-type.patch       | 12 ------------
 vulkan_icd-DESTDIR.patch | 10 ----------
 x32.patch                | 11 -----------
 5 files changed, 7 insertions(+), 80 deletions(-)
---

diff --git a/Mesa.spec b/Mesa.spec
index 36d0245..edaa4ae 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -53,21 +53,17 @@
 %undefine	with_wayland
 %endif
 
-%define snap	20160418
+%define prerel	rc1
 %define	rel	1
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	11.3.0
-Release:	0.s%{snap}.%{rel}
+Version:	12.0.0
+Release:	0.%{prerel}.%{rel}
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
-# git archive --format=tar --prefix=Mesa-s20160418/ master | xz > ../Mesa-s20160418.tar.xz
-Source0:	Mesa-s%{snap}.tar.xz
-# Source0-md5:	9837de67444fdf54ab837788ef342076
-Patch0:		missing-type.patch
-Patch1:		keep_git_sha.patch
-Patch2:		vulkan_icd-DESTDIR.patch
+Source0:	ftp://ftp.freedesktop.org/pub/mesa/%{version}/mesa-%{version}-%{prerel}.tar.xz
+# Source0-md5:	1b2d2764beca249bb81f23274fc1d75d
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -1191,10 +1187,7 @@ eader files for Mesa Intel GPU Vulkan driver.
 Pliki nagłówkowe sterownika Vulkan dla GPU Intel.
 
 %prep
-%setup -q -n Mesa-s%{snap}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n mesa-%{version}-%{prerel}
 
 %build
 %{__libtoolize}
@@ -1279,8 +1272,6 @@ vulkan_drivers="intel"
 	--with-sha1=libnettle \
 	--with-va-libdir=%{_libdir}/libva/dri
 
-echo "#define MESA_GIT_SHA1 \"$(xzcat %{SOURCE0}|git get-tar-commit-id|cut -c-7)\"" > src/mesa/main/git_sha1.h
-
 %{__make}
 
 %{?with_tests:%{__make} check}
@@ -1400,6 +1391,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glx.h
 %{_includedir}/GL/glxext.h
 %{_includedir}/GL/glx_mangle.h
+%{_includedir}/GL/mesa_glinterop.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
 %{_pkgconfigdir}/dri.pc
diff --git a/keep_git_sha.patch b/keep_git_sha.patch
deleted file mode 100644
index 044005b..0000000
--- a/keep_git_sha.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -dur -x '*~' Mesa-vulkan-s20160220.orig/src/mesa/Makefile.am Mesa-vulkan-s20160220/src/mesa/Makefile.am
---- Mesa-vulkan-s20160220.orig/src/mesa/Makefile.am	2016-02-19 17:05:35.000000000 +0100
-+++ Mesa-vulkan-s20160220/src/mesa/Makefile.am	2016-02-20 16:06:38.690371982 +0100
-@@ -36,28 +36,6 @@
- gldir = $(includedir)/GL
- gl_HEADERS = $(top_srcdir)/include/GL/*.h
- 
--.PHONY: main/git_sha1.h.tmp
--main/git_sha1.h.tmp:
--	@# Don't assume that $(top_srcdir)/.git is a directory. It may be
--	@# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
--	@# worktree.
--	@touch main/git_sha1.h.tmp
--	@if test -e $(top_srcdir)/.git; then \
--		if which git > /dev/null; then \
--		    git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
--			sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
--			> main/git_sha1.h.tmp ; \
--		fi \
--	fi
--
--main/git_sha1.h: main/git_sha1.h.tmp
--	@echo "updating main/git_sha1.h"
--	@if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
--		mv main/git_sha1.h.tmp main/git_sha1.h ;\
--	else \
--		rm main/git_sha1.h.tmp ;\
--	fi
--
- include Makefile.sources
- 
- EXTRA_DIST = \
diff --git a/missing-type.patch b/missing-type.patch
deleted file mode 100644
index c692ee4..0000000
--- a/missing-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Mesa-10.3.2/include/GL/glxext.h~	2014-10-22 16:37:26.000000000 +0200
-+++ Mesa-10.3.2/include/GL/glxext.h	2014-10-30 19:49:51.561677653 +0100
-@@ -477,6 +477,9 @@
- 
- #ifndef GLX_NV_copy_buffer
- #define GLX_NV_copy_buffer 1
-+#include <stddef.h>
-+typedef ptrdiff_t GLsizeiptr;
-+typedef ptrdiff_t GLintptr;
- typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
- typedef void ( *PFNGLXNAMEDCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
- #ifdef GLX_GLXEXT_PROTOTYPES
diff --git a/vulkan_icd-DESTDIR.patch b/vulkan_icd-DESTDIR.patch
deleted file mode 100644
index befd210..0000000
--- a/vulkan_icd-DESTDIR.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
-index cba6671..5aedef8 100644
---- a/src/intel/vulkan/Makefile.am
-+++ b/src/intel/vulkan/Makefile.am
-@@ -209,4 +209,4 @@ libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD)
- include $(top_srcdir)/install-lib-links.mk
- 
- install-data-local:
--	$(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(VULKAN_ICD_INSTALL_DIR)/intel_icd.json
-+	$(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(DESTDIR)/$(VULKAN_ICD_INSTALL_DIR)/intel_icd.json
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index 0551349..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mesa-11.0.3/include/D3D9/d3d9types.h~	2015-10-02 10:45:51.000000000 +0200
-+++ mesa-11.0.3/include/D3D9/d3d9types.h	2015-10-11 23:43:57.442310720 +0200
-@@ -178,7 +178,7 @@
- #undef WINAPI
- #endif /* WINAPI*/
- 
--#if defined(__x86_64__) || defined(_M_X64)
-+#if (defined(__x86_64__) || defined(_M_X64)) && !defined(__ILP32__)
- #define WINAPI __attribute__((ms_abi))
- #else /* x86_64 */
- #define WINAPI __attribute__((__stdcall__))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/9405a391d3ee92677e13167278a28910ddfdb710

