Author: patrys Date: Thu Jul 1 18:56:55 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- 7.9 snapshot
- removed demos (they are now a full-fledged package with their own autotools)
---- Files affected:
packages/Mesa:
Mesa.spec (1.251 -> 1.251.2.1)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.251 packages/Mesa/Mesa.spec:1.251.2.1
--- packages/Mesa/Mesa.spec:1.251 Wed Jun 23 12:05:17 2010
+++ packages/Mesa/Mesa.spec Thu Jul 1 20:56:50 2010
@@ -6,11 +6,10 @@
# - subpackage egl?
#
# Conditional build:
-%bcond_without demos # don't build demos
%bcond_with egl # don't build egl
%bcond_without gallium # don't build gallium
%bcond_with gallium_intel # gallium i915 driver (but doesn't work with
AIGLX)
-%bcond_with gallium_nouveau
+%bcond_without gallium_nouveau
%bcond_without motif # build static libGLw without Motif interface
%bcond_with multigl # package libGL in a way allowing concurrent install
with nvidia/fglrx drivers
%bcond_without osmesa # don't build osmesa
@@ -27,25 +26,23 @@
%define dri2proto_ver 1.99.3
%define glproto_ver 1.4.11
#
+%define snap 20100701
+#
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 7.8.2
-Release: 1%{?with_multigl:.mgl}
+Version: 7.9
+Release: 0.%{snap}.1%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see license.html file
Group: X11/Libraries
-Source0:
ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: 6be2d343a0089bfd395ce02aaf8adb57
-Source1:
ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Demos-%{version}.tar.bz2
-# Source1-md5: 757d9e2e06f48b1a52848be9b0307ced
+#Source0:
ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
+Source0: %{name}Lib-%{snap}.tar.bz2
+# Source0-md5: 9923c6618a39a645225b9c64309da6d5
Patch0: %{name}-realclean.patch
-Patch1: %{name}-tgsi_dump.patch
URL: http://www.mesa3d.org/
-%{?with_demos:BuildRequires: OpenGL-glut-devel >= 3.8}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: expat-devel
-#%%{?with_demos:BuildRequires: glew-devel}
BuildRequires: libdrm-devel >= %{libdrm_ver}
BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel
@@ -318,19 +315,6 @@
%description utils -l pl.UTF-8
Programy narzędziowe OpenGL z projektu Mesa3D: glxgears i glxinfo.
-%package demos
-Summary: Mesa Demos source code
-Summary(pl.UTF-8): Kod źródłowy programów demonstrujących dla bibliotek
Mesa
-License: various (MIT, SGI, GPL - see copyright notes in sources)
-Group: Development/Libraries
-Requires: OpenGL-devel
-
-%description demos
-Demonstration programs for the Mesa libraries in source code form.
-
-%description demos -l pl.UTF-8
-Kod źródłowy programów demonstracyjnych dla bibliotek Mesa.
-
%package dri-driver-ati-mach64
Summary: X.org DRI driver for ATI Mach64 card family
Summary(pl.UTF-8): Sterownik X.org DRI dla rodziny kart ATI Mach64
@@ -632,12 +616,8 @@
Sterownik X.org DRI dla VMware.
%prep
-%setup -q -b1
+%setup -q
%patch0 -p0
-%patch1 -p1
-
-# fix demos
-find progs -type f|xargs sed -i -e
"s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
%build
autoreconf --install
@@ -665,8 +645,7 @@
--enable-glx-tls \
--disable-glut \
--disable-os-mesa \
- --%{?with_egl:en}%{!?with_egl:dis}able-egl \
- --with%{!?with_demos:out}-demos"
+ --%{?with_egl:en}%{!?with_egl:dis}able-egl"
osmesa_common_flags="\
--with-driver=osmesa \
@@ -700,7 +679,7 @@
--%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
--enable-gallium-svga \
%{?with_gallium_nouveau:--enable-gallium-nouveau} \
- --with-state-trackers=dri,xorg,glx \
+ --with-state-trackers=dri,glx \
%else
--disable-gallium \
%endif
@@ -709,38 +688,20 @@
--with-dri-driverdir=%{_libdir}/xorg/modules/dri
%{__make}
-%{__make} -C progs/xdemos glxgears glxinfo
-%if %{with demos}
-%{__make} -C progs/demos
-%endif
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version}}
# libs without drivers
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%if %{with osmesa}
-rm -f osmesa*/libGLEW.*
install osmesa*/* $RPM_BUILD_ROOT%{_libdir}
%endif
-install progs/xdemos/{glxgears,glxinfo} $RPM_BUILD_ROOT%{_bindir}
-# work on copy to keep -bi --short-circuit working
-rm -rf progs-clean
-install -d progs-clean
-for l in demos glsl osdemos redbook samples xdemos ; do
- cp -a progs/$l progs-clean/$l
- %{__make} -C progs-clean/$l clean
- cp -Rf progs-clean/$l
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$l
-done
-rm -rf progs-clean
-for l in util images ; do
- cp -Rf progs/$l $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$l
-done
rm -rf
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}}
# strip out undesirable headers
@@ -867,11 +828,6 @@
%endif
%endif
-%files utils
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/glxgears
-%attr(755,root,root) %{_bindir}/glxinfo
-
%files dri-driver-ati-mach64
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/mach64_dri.so
@@ -930,7 +886,7 @@
%if %{with gallium_nouveau}
%files dri-driver-nouveau
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
+#%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
%endif
%endif
@@ -948,6 +904,7 @@
%files dri-driver-swrast
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrastg_dri.so
%files dri-driver-tdfx
%defattr(644,root,root,755)
@@ -960,22 +917,19 @@
%if %{with gallium}
%files dri-driver-vmwgfx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
%attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
%endif
-%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
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.251.2.1 2010/07/01 18:56:50 patrys
+- 7.9 snapshot
+- removed demos (they are now a full-fledged package with their own autotools)
+
Revision 1.251 2010/06/23 10:05:17 patrys
- typo
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.251&r2=1.251.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
