packages: Mesa/Mesa.spec - without demos bcond - sparc64 patch from FC - no...
tommat
tommat at pld-linux.org
Thu Aug 6 09:41:00 CEST 2009
Author: tommat Date: Thu Aug 6 07:41:00 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- without demos bcond
- sparc64 patch from FC
- nouveau abi patch to bump to ver 15 - builds with libdrm-2.4.12-3
- updated BRs
---- Files affected:
packages/Mesa:
Mesa.spec (1.213 -> 1.214)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.213 packages/Mesa/Mesa.spec:1.214
--- packages/Mesa/Mesa.spec:1.213 Sun Jul 26 00:45:17 2009
+++ packages/Mesa/Mesa.spec Thu Aug 6 09:40:55 2009
@@ -5,6 +5,7 @@
# - resurrect static if it's useful
#
# Conditional build:
+%bcond_without demos # don't build demos
%bcond_without motif # build static libGLw without Motif interface
%bcond_without gallium
%bcond_with gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
@@ -32,10 +33,12 @@
Source2: http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
# Source2-md5: 6ae05158e678f4594343f32c2ca50515
Patch0: %{name}-realclean.patch
+Patch1: %{name}-noveau-abi-0.0.15.patch
+Patch2: %{name}-sparc64.patch
URL: http://www.mesa3d.org/
BuildRequires: expat-devel
-BuildRequires: glew-devel
-BuildRequires: libdrm-devel >= 2.4.12-2
+%{?with_demos:BuildRequires: glew-devel}
+BuildRequires: libdrm-devel >= 2.4.12-3
BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.4d
@@ -43,9 +46,9 @@
BuildRequires: rpmbuild(macros) >= 1.470
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libXdamage-devel
+BuildRequires: xorg-lib-libXext-devel >= 1.0.99.4
BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXxf86vm-devel
-BuildRequires: xorg-proto-dri2proto-devel >= 1.99.3
BuildRequires: xorg-proto-glproto-devel
BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-util-makedepend
@@ -611,6 +614,8 @@
%prep
%setup -q -b1 -a2
%patch0 -p0
+%patch1 -p1
+%patch2 -p1
# fix demos
find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
@@ -636,7 +641,8 @@
--enable-shared \
--enable-selinux \
--enable-pic \
- --disable-egl"
+ --disable-egl \
+ --with%{!?with_demos:out}-demos"
# osmesa variants
%configure $common_flags \
@@ -684,7 +690,9 @@
%{__make}
%{__make} -C progs/xdemos glxgears glxinfo
+%if %{with demos}
%{__make} -C progs/demos
+%endif
cd gl-manpages-*
%configure
@@ -938,9 +946,11 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/unichrome_dri.so
+%if %{with demos}
%files demos
%defattr(644,root,root,755)
%{_examplesdir}/%{name}-%{version}
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -948,6 +958,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.214 2009/08/06 07:40:55 tommat
+- without demos bcond
+- sparc64 patch from FC
+- nouveau abi patch to bump to ver 15 - builds with libdrm-2.4.12-3
+- updated BRs
+
Revision 1.213 2009/07/25 22:45:17 adamg
- BR: libdrm >= 2.4.12-2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.213&r2=1.214&f=u
More information about the pld-cvs-commit
mailing list