Author: arekm Date: Mon Jan 12 21:49:51 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 7.3 rc1; drop ttm bcond
---- Files affected:
SPECS:
Mesa.spec (1.189 -> 1.190)
---- Diffs:
================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.189 SPECS/Mesa.spec:1.190
--- SPECS/Mesa.spec:1.189 Wed Nov 5 09:33:11 2008
+++ SPECS/Mesa.spec Mon Jan 12 22:49:45 2009
@@ -6,7 +6,6 @@
# Conditional build:
%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_with ttm # enable TTM API
#
# minimal supported xserver version
%define xserver_ver 1.5.0
@@ -14,23 +13,25 @@
# set to current Mesa version on ABI break, when xserver tables get regenerated
# (until they start to be somehow versioned themselves)
%define glapi_ver 7.1.0
+#
+%define snap rc1
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 7.2
-Release: 3%{?with_multigl:.mgl}
+Version: 7.3
+Release: 0.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: 04d379292e023df0b0266825cb0dbde5
-Source1: http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5: 22e03dc4038cd63f32c21eb60994892b
+# Source0: http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
+Source0: http://www.mesa3d.org/beta/MesaLib-%{version}-%{snap}.tar.gz
+# Source0-md5: 507af8dbb33306d7cfe2374630bac328
+# Source1: http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
+Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}-%{snap}.tar.gz
+# Source1-md5: b86b3bc398e5cfe4eff9b2a6cec3d7a7
Patch0: %{name}-realclean.patch
-Patch1: %{name}-dri_mm.patch
URL: http://www.mesa3d.org/
BuildRequires: expat-devel
-BuildRequires: libdrm-devel >= 2.3.1
-%{?with_ttm:BuildRequires: libdrm-devel >= 2.4.0}
+BuildRequires: libdrm-devel >= 2.4.3
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.4d
%{?with_motif:BuildRequires: motif-devel}
@@ -38,7 +39,7 @@
BuildRequires: xorg-lib-libXdamage-devel
BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXxf86vm-devel
-BuildRequires: xorg-proto-dri2proto-devel
+BuildRequires: xorg-proto-dri2proto-devel >= 1.99.3
BuildRequires: xorg-proto-glproto-devel
BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-util-makedepend
@@ -583,9 +584,8 @@
Sterownik X.org DRI dla rodziny kart VIA Unichrome.
%prep
-%setup -q -b1
+%setup -q -b1 -n %{name}-%{version}-%{snap}
%patch0 -p0
-%patch1 -p1
# fix demos
find progs -type f|xargs sed -i -e
"s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
@@ -650,7 +650,7 @@
CC="%{__cc}" \
CXX="%{__cxx}" \
MKDEP=makedepend \
- OPT_FLAGS="%{rpmcppflags} %{rpmcflags} -fno-strict-aliasing
%{?with_ttm:-DTTM_API}" \
+ OPT_FLAGS="%{rpmcppflags} %{rpmcflags} -fno-strict-aliasing" \
XLIB_DIR=%{_libdir} \
DRI_DRIVER_SEARCH_DIR=%{_libdir}/xorg/modules/dri \
SRC_DIRS="glx/x11 mesa glu glw" \
@@ -688,7 +688,7 @@
cp -df lib-static/lib* $RPM_BUILD_ROOT%{_libdir}
cp -df lib-osmesa/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
cp -df lib-dri/lib* $RPM_BUILD_ROOT%{_libdir}
-cp -rf include/GL/{gl[!f]*,osmesa.h,xmesa*} src/glw/GLw*.h
$RPM_BUILD_ROOT%{_includedir}/GL
+cp -rf include/GL/{gl[!f]*,osmesa.h*} src/glw/GLw*.h
src/mesa/drivers/x11/xmesa*.h $RPM_BUILD_ROOT%{_includedir}/GL
cp -rf include/GL/internal/dri_interface.h
$RPM_BUILD_ROOT%{_includedir}/GL/internal
cp -df lib-dri/*_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri
@@ -916,6 +916,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Mesa.spec?r1=1.189&r2=1.190&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
