Author: gotar Date: Sat Sep 6 21:55:55 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - added ttm bcond with patch, - fixed -bc --short-circuit, - fixed passing CFLAGS to osmesa
---- Files affected: SPECS: Mesa.spec (1.177 -> 1.178) ---- Diffs: ================================================================ Index: SPECS/Mesa.spec diff -u SPECS/Mesa.spec:1.177 SPECS/Mesa.spec:1.178 --- SPECS/Mesa.spec:1.177 Sun Aug 31 12:39:58 2008 +++ SPECS/Mesa.spec Sat Sep 6 23:55:50 2008 @@ -6,6 +6,7 @@ # 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 Summary: Free OpenGL implementation Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa @@ -18,9 +19,11 @@ Source1: http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2 # Source1-md5: abfc9775e1462363af8ec160d1feb01f 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: libstdc++-devel BuildRequires: libtool >= 2:1.4d %{?with_motif:BuildRequires: motif-devel} @@ -575,6 +578,7 @@ %prep %setup -q -b1 %patch0 -p0 +%patch1 -p1 # fix demos find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g" @@ -594,7 +598,7 @@ # sis needs write-memory barrier sed -i -e 's/ sis / /' configs/linux-dri %endif - + %build # use $lib, not %{_lib} as Mesa uses lib64 only for *-x86-64* targets %ifarch %{x8664} @@ -609,6 +613,11 @@ %endif %endif +# required for -bc --short-circuit +%{__make} realclean +# as above - existing directory makes mv move into instead of rename +rm -rf lib-{dri,osmesa,static} + %{__make} linux${targ}-static \ CC="%{__cc}" \ CXX="%{__cxx}" \ @@ -623,7 +632,7 @@ %{__make} linux-osmesa \ CC="%{__cc}" \ CXX="%{__cxx}" \ - OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \ + CFLAGS="%{rpmcflags} -fno-strict-aliasing" \ XLIB_DIR=%{_libdir} \ SRC_DIRS="mesa" \ PROGRAM_DIRS= @@ -634,7 +643,7 @@ CC="%{__cc}" \ CXX="%{__cxx}" \ MKDEP=makedepend \ - OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \ + OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing %{?with_ttm:-DTTM_API}" \ XLIB_DIR=%{_libdir} \ DRI_DRIVER_SEARCH_DIR=%{_libdir}/xorg/modules/dri \ SRC_DIRS="glx/x11 mesa glu glw" \ @@ -900,6 +909,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Mesa.spec?r1=1.177&r2=1.178&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
