[packages/Mesa] - fetch Mesa 9.0; 8.0.x left on MESA_8_0 branch - updated link patch
qboosh
qboosh at pld-linux.org
Tue Oct 9 21:25:35 CEST 2012
commit 5853b3abbccd625cfff7316929b64b2d5c148250
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Oct 9 21:25:28 2012 +0200
- fetch Mesa 9.0; 8.0.x left on MESA_8_0 branch
- updated link patch
Mesa-link.patch | 11 -----------
Mesa.spec | 23 ++++++++++-------------
2 files changed, 10 insertions(+), 24 deletions(-)
---
diff --git a/Mesa.spec b/Mesa.spec
index 4584510..d1308cb 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -22,7 +22,7 @@
# (until they start to be somehow versioned themselves)
%define glapi_ver 7.1.0
#
-%define libdrm_ver 2.4.34
+%define libdrm_ver 2.4.39
%define dri2proto_ver 2.6
%define glproto_ver 1.4.14
#
@@ -31,13 +31,12 @@
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 9.0.0
-Release: 0.%{snap}.1
+Version: 9.0
+Release: 0.1
License: MIT (core) and others - see license.html file
Group: X11/Libraries
-#Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
-Source0: %{name}Lib-%{snap}.tar.bz2
-# Source0-md5: 6a81ca41f8f131d98e95371ea0b6717e
+Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
+# Source0-md5: 60e557ce407be3732711da484ab3db6c
Patch0: %{name}-realclean.patch
Patch1: %{name}-link.patch
Patch2: %{name}-wayland.patch
@@ -50,7 +49,7 @@ BuildRequires: libdrm-devel >= %{libdrm_ver}
BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel >= 5:3.3.0
BuildRequires: libtalloc-devel >= 2:2.0.1
-BuildRequires: libtool >= 2:1.4d
+BuildRequires: libtool >= 2:2.2
BuildRequires: libvdpau-devel >= 0.4.1
BuildRequires: llvm-devel >= 2.9
BuildRequires: pixman-devel
@@ -919,19 +918,17 @@ Mesa softpipe driver for the vdpau API.
Sterownik Mesa softpipe dla API vdpau.
%prep
-%setup -q -n %{name}
+%setup -q
#%patch100 -p1
#patch0 -p0
%patch1 -p1
#patch2 -p1
%build
-if [ -x autogen.sh ]; then
- ./autogen.sh
-else
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4
%{__autoconf}
-fi
+%{__automake}
dri_drivers="r200 radeon \
%if %{without gallium_intel}
diff --git a/Mesa-link.patch b/Mesa-link.patch
index 152ea8a..cf561ee 100644
--- a/Mesa-link.patch
+++ b/Mesa-link.patch
@@ -108,17 +108,6 @@
include ../Makefile.vdpau
---- p/src/mapi/shared-glapi/Makefile.am~ 2012-05-10 22:56:51.000000000 +0200
-+++ p/src/mapi/shared-glapi/Makefile.am 2012-05-11 09:41:41.159294241 +0200
-@@ -6,7 +6,7 @@
-
- lib_LTLIBRARIES = libglapi.la
- libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
--libglapi_la_LDFLAGS = -no-undefined
-+libglapi_la_LDFLAGS = -no-undefined -pthread
-
- include $(GLAPI)/gen/glapi_gen.mk
- glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
--- p/src/gallium/targets/vdpau-radeonsi/Makefile~ 2012-08-06 18:56:40.000000000 +0200
+++ p/src/gallium/targets/vdpau-radeonsi/Makefile 2012-09-07 22:44:07.304997361 +0200
@@ -23,7 +23,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/5853b3abbccd625cfff7316929b64b2d5c148250
More information about the pld-cvs-commit
mailing list