packages: Mesa/Mesa.spec - moved from DEVEL; 7.4 on MESA_7_4
arekm
arekm at pld-linux.org
Sun Jul 19 14:31:28 CEST 2009
Author: arekm Date: Sun Jul 19 12:31:28 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- moved from DEVEL; 7.4 on MESA_7_4
---- Files affected:
packages/Mesa:
Mesa.spec (1.205 -> 1.206)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.205 packages/Mesa/Mesa.spec:1.206
--- packages/Mesa/Mesa.spec:1.205 Sun Jun 28 23:50:03 2009
+++ packages/Mesa/Mesa.spec Sun Jul 19 14:31:22 2009
@@ -3,9 +3,11 @@
# TODO:
# - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
# - resurrect static if it's useful
+# - what's libEGL?
#
# Conditional build:
%bcond_without motif # build static libGLw without Motif interface
+%bcond_without gallium
%bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers
%bcond_with static
#
@@ -19,14 +21,14 @@
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 7.4.4
+Version: 7.5
Release: 1%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see license.html file
Group: X11/Libraries
Source0: http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: b66528d314c574dccbe0ed963cac5e93
+# Source0-md5: 459f332551f6ebb86f384d21dd15e1f0
Source1: http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5: 628142ec9a54cd28cc027e6ce26cff47
+# Source1-md5: 398ee8801814a00e47f6c2314e3dfddc
Source2: http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
# Source2-md5: 6ae05158e678f4594343f32c2ca50515
Patch0: %{name}-realclean.patch
@@ -37,7 +39,6 @@
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.4d
%{?with_motif:BuildRequires: motif-devel}
-BuildRequires: OpenGL-glut-devel
BuildRequires: rpmbuild(macros) >= 1.470
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libXdamage-devel
@@ -595,7 +596,12 @@
find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
%build
-dri_drivers="i810 i915 i965 mach64 mga r128 r200 r300 radeon savage s3v trident \
+[ ! -f configure ] && ./autogen.sh
+
+dri_drivers="i810 i965 mach64 mga r128 r200 r300 radeon savage s3v trident \
+%if %{without gallium}
+i915 \
+%endif
%ifarch sparc sparcv9 sparc64
ffb \
%endif
@@ -643,6 +649,7 @@
--enable-glu \
--enable-glw \
--disable-glut \
+ --%{?with_gallium:en}%{!?with_gallium:dis}able-gallium \
--with-driver=dri \
--with-dri-drivers=${dri_drivers} \
--with-dri-driverdir=%{_libdir}/xorg/modules/dri
@@ -690,6 +697,10 @@
olddir=$(pwd)
cd $RPM_BUILD_ROOT%{_includedir}/GL
rm [a-fh-np-wyz]*.h gg*.h glf*.h
+cd $RPM_BUILD_ROOT%{_libdir}
+%if %{without gallium}
+rm libEGL*
+%endif
cd $olddir
%if %{with multigl}
@@ -723,10 +734,13 @@
%attr(755,root,root) %ghost %{_libdir}/Mesa/libGL.so.1
%else
%attr(755,root,root) %{_libdir}/libGL.so.*.*
+%attr(755,root,root) %{_libdir}/libEGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
+%attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
# symlink for binary apps which fail to conform Linux OpenGL ABI
# (and dlopen libGL.so instead of libGL.so.1)
%attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) %{_libdir}/libEGL.so
%endif
%files libGL-devel
@@ -855,7 +869,7 @@
%files dri-driver-intel-i915
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/EGL_i915.so
%files dri-driver-intel-i965
%defattr(644,root,root,755)
@@ -905,660 +919,21 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.205 2009/06/28 21:50:03 arekm
-- up to 7.4.4
-
-Revision 1.204 2009/06/22 17:54:32 arekm
-- up to 7.4.3
-
-Revision 1.203 2009/05/17 18:17:21 arekm
-- up to 7.4.2
-
-Revision 1.202 2009/05/17 16:15:44 lkrotowski
-- missing BR
-
-Revision 1.201 2009/04/24 08:33:23 arekm
-- rel 2; Fixes front-buffer rendering with DRI1.
-
-Revision 1.200 2009/04/22 09:20:50 arekm
-- up to 7.4.1
-
-Revision 1.199 2009/04/04 16:06:24 arekm
-- rel .3
-
-Revision 1.198 2009/04/03 21:51:28 arekm
-- make sure that glut is disabled
-
-Revision 1.197 2009/04/03 21:31:03 arekm
-- switch to configure + make style; static dropped; some non-dri stuff also dropped
-
-Revision 1.196 2009/04/03 20:01:40 arekm
-- rel 2; fixes from stable 7.4 branch
-
-Revision 1.195 2009/03/28 12:01:24 arekm
-- up to 7.4
-
-Revision 1.194 2009/01/26 11:40:45 arekm
-- up to 7.3 final (formally this is devel line of Mesa)
-
-Revision 1.193 2009/01/18 14:30:35 gotar
-- BR: rpmbuild(macros) >= 1.470 due to rpmcppflags use since 1.186 rev
-
-Revision 1.192 2009/01/16 08:32:41 arekm
-- rel 0.2
-
-Revision 1.191 2009/01/16 08:28:00 arekm
-- up to 7.3rc2
-
-Revision 1.190 2009/01/12 21:49:45 arekm
-- up to 7.3 rc1; drop ttm bcond
-
-Revision 1.189 2008/11/05 08:33:11 hawk
-- release 3
-
-Revision 1.188 2008/10/29 18:37:07 luzik
-- reverted last change
-- fixed unichrome requires from via to openchrome
-
-Revision 1.187 2008/10/28 08:53:53 hawk
-- drop dri-driver-via-unichrome, it requires xorg-driver-video-via which
- was deprecated upstream (where should O: go? basesystem.spec?)
-
-Revision 1.186 2008/09/28 09:07:42 arekm
-- rel 1
-
-Revision 1.185 2008/09/22 18:45:09 qboosh
-- fixed libOSMesa build
-
-Revision 1.184 2008/09/22 18:24:42 qboosh
-- glapi unchanged since 7.1, no need to bump glapi_ver
-
-Revision 1.183 2008/09/22 17:54:34 qboosh
-- updated SGI license version for GLU (B v2.0, MIT-like now)
-
-Revision 1.182 2008/09/21 09:23:30 arekm
-- stable 7.2 but doesn't build
-
-Revision 1.181 2008/09/13 05:31:01 qboosh
-- release 2
-
-Revision 1.180 2008/09/13 00:22:18 qboosh
-- added tdfx patch (fixes crash on init and non-existing visuals)
-- test release 1.1
-
-Revision 1.179 2008/09/12 18:15:15 qboosh
-- No-no-no. glapi symbols are built in libglx module (not swrast driver) and must be in sync
-- -dri-driver-swrast requires proper glapi in libglx too
-- R xserver >= 1.5.0
-- updated intel and ati video driver names
-
-Revision 1.178 2008/09/06 21:55:50 gotar
-- added ttm bcond with patch,
-- fixed -bc --short-circuit,
-- fixed passing CFLAGS to osmesa
-
-Revision 1.177 2008/08/31 10:39:58 qboosh
-- i915tex and nouveau removed upstream
-
-Revision 1.176 2008/08/30 11:37:07 pluto
-- BR: libdrm-devel >= 2.3.1, minor log fixes.
-
-Revision 1.175 2008/08/30 08:54:39 arekm
-- BR: xorg-proto-dri2proto-devel
-
-Revision 1.174 2008/08/29 09:22:09 arekm
-- final 7.1 (devel line but we go with it than with, so called, stable 7.0 line)
-
-Revision 1.173 2008/07/10 20:32:58 arekm
-- up to rc3
-
-Revision 1.172 2008/07/08 20:34:37 qboosh
-- unified -dri-* descs
-- man pages todo done (OpenGL-doc.spec)
-
-Revision 1.171 2008/07/01 10:29:48 arekm
-- dri-swrast replaces libGLcore so add appropriate provides
-
-Revision 1.170 2008/07/01 10:18:20 arekm
-- enable swrast dri (replaces xserver libGLcore.so); fix build with libdrm 2.3.1
-
-Revision 1.169 2008-05-28 20:49:17 arekm
-- up to 7.1 rc1
-
-Revision 1.168 2008-04-05 20:44:31 arekm
-- rel 2; glw.pc is back
-
-Revision 1.167 2008-04-05 20:34:30 arekm
-- up to 7.0.3
-
-Revision 1.166 2008-02-28 09:35:41 arekm
-- rel 6; fix/workaround http://bugs.freedesktop.org/show_bug.cgi?id=13957 from mesa git
-
-Revision 1.165 2008-02-27 19:23:06 arekm
-- rel 5
-
-Revision 1.164 2007-12-02 16:52:42 qboosh
-- use x86-64 targets for x86_64 assembly
-- release 4
-
-Revision 1.163 2007-12-02 16:26:15 qboosh
-- moved libOSMesa.a to -static as it's usable only with non-dri libGL.a
-- build usable shared libOSMesa
-- updated License tags
-- fixed ffb disabling if building without nouveau
-- package gl,glu pkgconfig files
-- xmesa*.h headers (with x11 non-dri Mesa API) moved to libGL-static
-- dropped glfbdev.h header (fbdev Mesa API - no implementation built)
-- test release 3.1
-
-Revision 1.162 2007-11-25 21:13:44 arekm
-- uh, really nouveau off by default
-
-Revision 1.161 2007-11-25 20:31:25 arekm
-- rel 2; disable building nouveau; we don't have libdrm for it anyway
-
-Revision 1.160 2007-11-11 18:04:34 arekm
-- up to 7.0.2
-
-Revision 1.159 2007/09/28 22:15:55 baggins
-- moved contents of MULTIGL branch to multigl bcond on HEAD
-
-Revision 1.158 2007/09/03 12:12:26 baggins
-- rel 2
-- i965 driver shouldn't obsolete i915 driver
-
-Revision 1.157 2007/08/27 16:39:25 qboosh
-- don't package libOSMesa as it's currently unusable anyway
- (and thus allow using Mesa-libGL-devel with foreign libGL implementations)
-
-Revision 1.156 2007/08/25 18:42:51 qboosh
-- soname symlinks as ghost
-
-Revision 1.155 2007/08/05 00:31:31 qboosh
-- fixed invalid changelog entries
-
-Revision 1.154 2007/08/04 08:34:43 deejay1
-- [nothing]
-
-Revision 1.153 2007/08/04 08:32:41 deejay1
-- [updated to 7.0.1]
-
-Revision 1.152 2007/06/24 22:17:31 qboosh
-- build -dri-driver-nouveau, fix ffb disabling
-
-Revision 1.151 2007/06/23 11:07:16 arekm
-- up to 7.0
-
-Revision 1.150 2007/06/03 09:40:07 tommat
-- BR xorg-lib-libXdamage-devel
-
-Revision 1.149 2007/05/03 21:20:09 arekm
-- rel 2; apply fixes from git
-
-Revision 1.148 2007/04/30 19:42:40 qboosh
-- versioned Obsoletes not to conflict with metapackage-xorg
-
-Revision 1.147 2007/04/30 19:34:17 qboosh
-- added Obsoletes for X11-driver-*-dri packages
-
-Revision 1.146 2007/04/29 15:53:36 qboosh
-- cleanup
-
-Revision 1.145 2007/04/29 12:19:43 qboosh
-- updated ffb disabling
-
-Revision 1.144 2007/04/29 12:12:38 qboosh
-- updated to 6.5.3 (supports OpenGL 2.1)
-- added nouveau_drm.h as source (not yet in released libdrm)
-- added -dri-driver-nouveau package
-
-Revision 1.143 2007/02/19 14:56:48 arekm
-- rebuild to fix FileDigestParameterized rpm issue
-
-Revision 1.142 2007/02/12 21:23:44 glen
-- tabs in preamble
-
-Revision 1.141 2007/02/12 00:48:33 baggins
-- converted to UTF-8
-
-Revision 1.140 2007/01/07 00:25:28 arekm
-- rel 4; drop _noautoreqdep (not needed in th); package so symlinks
-
-Revision 1.139 2007/01/06 23:52:59 arekm
-- rel 3; obsolete only ac x11
-
-Revision 1.138 2006/12/12 10:07:25 dzeus
-- rel. 2, STBR please
-
-Revision 1.137 2006/12/07 00:25:32 wolvverine
-- correct R
-
-Revision 1.136 2006/12/06 22:05:22 wolvverine
-- add BR
-
-Revision 1.135 2006/12/03 21:35:30 arekm
-- rel 1
-
-Revision 1.134 2006/12/03 16:26:58 qboosh
-- dri drivers are loaded by video drivers, so should require them
-
-Revision 1.133 2006/12/03 15:26:29 arekm
-- rel 0.3; why downgrading release for final version?
-
-Revision 1.132 2006/12/03 13:39:45 qboosh
-- well, actually it's not client libGL but server-side glapi (used in libglx)
-
-Revision 1.131 2006/12/03 13:31:59 qboosh
-- dri drivers require libGL in the same version they were built with
-
-Revision 1.130 2006/12/03 12:48:34 qboosh
-- Glide3 headers or lib not needed to build, but libglide3-v{3,5}.so is needed
- (dlopened) by tdfx driver
-
-Revision 1.129 2006/12/03 12:36:09 qboosh
-- updated libdrm deps (>= 2.2.0 now)
-- moved Mesa-dri Obsoletes to existing package (-libGL)
-
-Revision 1.128 2006/12/03 03:14:38 shadzik
-- ups,fix %setup
-
-Revision 1.127 2006/12/03 03:08:32 shadzik
-- 6.5.2 stable, NFY
-
-Revision 1.126 2006/11/03 20:11:55 arekm
-- new snap; should fix ppc
-
-Revision 1.125 2006/11/03 17:45:18 twittner
-- glxgears and glxinfo linking fixed - they were linked with
- already installed Mesa libraries (/usr/lib) instead of fresh built
- (located in source tree) - thnx to BeCe
-- note: building triggers zylions warnings:
-makedepend: warning: ../../common/driverfuncs.c (reading /usr/include/libio.h, line 53): cannot find include file "stdarg.h"
-makedepend: warning: ../../common/driverfuncs.c (reading /usr/include/gconv.h, line 31): cannot find include file "stddef.h"
-
-Revision 1.124 2006/11/03 08:13:15 arekm
-- updated to 20061103 snap
-
-Revision 1.123 2006/09/16 21:25:05 qboosh
-- updated to 6.5.1
-- removed modules_dir patch, pass DRI_DRIVER_SEARCH_DIR to make
-
-Revision 1.122 2006/09/11 15:34:16 shadzik
-- snap up to 20060911
-- back to the roots, to dropin Source0
-
-Revision 1.121 2006/08/15 22:15:11 shadzik
-- snap 20060810 from http://intellinuxgraphics.org/, we use this as Source0 now, not dropin.pld
-- support for intel i965 graphic cards
-
-Revision 1.120 2006/07/30 16:12:33 arekm
-- up to 20060730
-
-Revision 1.119 2006/07/12 08:32:36 czarny
- - corrected unpacked dirname
- - why was that dir different here, then in xorg-xserver-server-xgl?
-
-Revision 1.118 2006/07/11 20:30:34 czarny
- - fixed my previous emtpy log
-
-Revision 1.117 2006/07/11 20:13:14 czarny
-- up to snap 20060711
-
-Revision 1.116 2006/07/01 18:19:16 arekm
-- up to snap 20060701
-
-Revision 1.115 2006/05/05 14:22:37 wolf
-- add compiz patch, rel 2
-
-Revision 1.114 2006/04/11 21:29:21 arekm
-- correct md5
-
-Revision 1.113 2006/04/11 21:27:40 arekm
-- try 20060411 snap
-
-Revision 1.112 2006/04/02 18:20:47 qboosh
-- i915 driver obsoletes i830
-
-Revision 1.111 2006/04/02 12:23:44 arekm
-- fix dri path
-
-Revision 1.110 2006/04/02 11:25:52 qboosh
-- typo
-
-Revision 1.109 2006/04/02 11:25:30 qboosh
-- logic
-
-Revision 1.108 2006/04/02 10:54:20 arekm
-- disable sis in files ,too
-
-Revision 1.107 2006/04/02 10:52:16 arekm
-- disable sis on non x86/x8664
-
-Revision 1.106 2006/04/02 10:21:30 arekm
-- up to devel 6.5 release
-
-Revision 1.105 2006/02/20 15:58:07 adasi
-- grasp
-
-Revision 1.104 2006/02/20 15:07:35 adasi
-- added patch needed for glxcompmgr
-- UNTESTED
-
-Revision 1.103 2006/02/18 19:33:24 qboosh
-- Obsoletes for X11-OpenGL* packages
-
-Revision 1.102 2006/02/09 12:01:16 qboosh
-- updated to 6.4.2
-
-Revision 1.101 2006/02/08 18:34:43 qboosh
-- better Group for dri-drivers
-
-Revision 1.100 2006/02/08 14:35:29 freetz
-- de-adapterized
-
-Revision 1.99 2006/02/08 14:16:35 freetz
-- DRI drivers split
-
-Revision 1.98 2006/02/03 11:15:25 pluto
-- build fixed (glxinfo vs -lGLU).
-
-Revision 1.97 2005/12/20 13:43:42 wrobell
-- added patch to look for dri modules in /usr/lib/xorg/modules
-- rel. 2
-
-Revision 1.96 2005/12/03 15:31:56 qboosh
-- updated to 6.4.1 (bugfixes)
-
-Revision 1.95 2005/11/02 10:41:30 qboosh
-- -libGL Obsoletes old Mesa base package
-
-Revision 1.94 2005/11/01 21:36:31 qboosh
-- make utils before moving libGLU; upadated todo
-
-Revision 1.93 2005/11/01 09:46:19 pluto
-- BR xorg-lib-libXt-devel (GLwDrawA.c needs X11/IntrinsicP.h,StringDefs.h)
-
-Revision 1.92 2005/11/01 00:26:56 pluto
-- avoid violations of aliasing rules.
-
-Revision 1.91 2005/10/31 13:04:55 qboosh
-- split libGL/libGLU/libGLw/utils
-- build ffb_dri.so only on sparc*
-
-Revision 1.90 2005/10/28 16:47:06 qboosh
-- updated to 6.4, removed obsolete dri-asm patch
-- needs post-1.0.4 libdrm-devel
-
-Revision 1.89 2005/10/22 23:04:41 qboosh
-- don't build glut (we have it in glut.spec)
-- build glxgears,glxinfo demos, don't link them with glut (not needed)
-- unified examples dir
-- package shared libGLw (built without Motif interface)
-- BR: expat-devel (for dri drivers)
-
-Revision 1.88 2005/10/21 11:36:07 qboosh
-- BR: libXxf86vm-devel,glproto,makedepend (for dri build)
-
-Revision 1.87 2005/10/21 10:17:40 qboosh
-- added motif bcond (not tested yet)
-- BR: libdrm-devel (for linux-dri build)
-- BR: libstdc++-devel (for SGI libGLU)
-
-Revision 1.86 2005/10/21 01:01:37 jpc
-- add glut
-- take libGL from the DRI build (I guess this could make a difference
- but I can't get anything more than software rendering and no output
- from LIBGL_DEBUG=verbose) Help?
-- don't build demos (they are not packaged anyway)
-
-Revision 1.85 2005/10/20 19:47:18 jpc
-- add missing asm files (patch from Gentoo)
-- sort BRs
-- build dri drivers (and add a subpackage for them)
-
-Revision 1.84 2005/10/20 18:04:37 jpc
-- up to 6.3.2
-- remove outdated opt patch
-- use modular deps
-- use sed instead of perl in prep
-
-Revision 1.83 2004/12/16 11:03:32 adamg
-- updated to 6.2.1
-
-Revision 1.82 2004/11/20 20:49:08 radek
-- BR: %__perl instead of perl-devel (even microperl would do)
-
-Revision 1.81 2004/10/17 21:11:13 qboosh
-- updated to 6.2, updated opt patch and desc
-
-Revision 1.80 2004/08/28 21:07:29 qboosh
-- version 6.1, added opt patch, libGLw patch replaced by make overrides
-- versioned OpenGL provides make more sense
-
-Revision 1.79 2004/07/11 09:37:49 jpc
-- xlibize ;)
-
-Revision 1.78 2004/06/22 22:30:29 paszczus
-- sorry, motif-devel is back in BR
-
-Revision 1.77 2004/06/22 18:35:37 paszczus
-- BR: s/motif-devel/openmotif-devel pointed out by darekr
-
-Revision 1.76 2004/05/17 18:19:46 qboosh
-- BR s/perl/perl-base/
-
-Revision 1.75 2004/05/17 17:44:48 qboosh
-- updated to 6.0.1, updated libGLw patch, removed obsolete ac,am patches
-
-Revision 1.74 2003/10/05 22:27:30 qboosh
-- 5.0.2, updated am and libGLw patches
-
-Revision 1.73 2003/08/18 08:07:51 gotar
-- mass commit: cosmetics (removed trailing white spaces)
-
-Revision 1.72 2003/07/07 19:05:02 qboosh
-- use _examplesdir macro
-
-Revision 1.71 2003/07/06 23:27:14 blues
-- many small fixes, mostly inpired by kloczek
-
-Revision 1.70 2003/06/06 12:19:19 qboosh
-- updated feedback address
-
-Revision 1.69 2003/05/26 16:24:19 malekith
-- massive attack: adding Source-md5
-
-Revision 1.68 2003/05/25 05:45:21 misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.67 2003/04/03 20:05:31 qboosh
-- 5.0.1
-
-Revision 1.66 2003/03/14 09:52:56 qboosh
-- use http for sources on sourceforge
-
-Revision 1.65 2003/01/18 22:53:35 juandon
-- removed two lines with define
-
-Revision 1.64 2002/11/25 14:12:19 ankry
-- massive attack: no need for 755 for *.la
-
-Revision 1.63 2002/11/20 14:20:52 qboosh
-- 5.0
-
-Revision 1.62 2002/10/24 16:01:36 qboosh
-- 4.0.4
-
-Revision 1.61 2002/07/11 19:48:48 qboosh
-- updated paths patch, killed subshells
-
-Revision 1.60 2002/07/10 23:22:33 blues
-- new doc
-
-Revision 1.59 2002/07/10 21:36:17 cieciwa
-- removed unneded patch no. 2.
-
-Revision 1.58 2002/07/10 21:20:29 cieciwa
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.205&r2=1.206&f=u
More information about the pld-cvs-commit
mailing list