diff --git a/.gitignore b/.gitignore index 64c048c..01ccef8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ mesa-20100720.tar.bz2 /mesa-20120816.tar.xz /mesa-20120827.tar.xz /mesa-20120924.tar.xz +/glu-9.0.0.tar.bz2 diff --git a/mesa.spec b/mesa.spec index 29b12a6..c5f5a71 100644 --- a/mesa.spec +++ b/mesa.spec @@ -45,6 +45,7 @@ URL: http://www.mesa3d.org #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2 #Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2 Source0: %{name}-%{gitdate}.tar.xz +Source1: ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2 Source2: %{manpages}.tar.bz2 Source3: make-git-snapshot.sh @@ -278,7 +279,7 @@ Mesa shared glapi %prep #% setup -q -n Mesa-%{version}%{?snapshot} -b2 -%setup -q -n mesa-%{gitdate} -b2 +%setup -q -n mesa-%{gitdate} -b1 -b2 #patch7 -p1 -b .dricore %patch9 -p1 -b .shmget %patch11 -p1 -b .nouveau @@ -333,6 +334,11 @@ export CXXFLAGS="$RPM_OPT_FLAGS" #%{?_smp_mflags} - broke parallel make in glsl make MKDEP=/bin/true +pushd ../glu-9.0.0 +%configure --disable-static +make %{?_smp_mflags} +popd + pushd ../%{manpages} autoreconf -v --install %configure @@ -359,6 +365,11 @@ pushd $RPM_BUILD_ROOT%{_includedir}/GL rm -f [vw]*.h popd +# glu +pushd ../glu-9.0.0 +make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT +popd + # remove .la files find $RPM_BUILD_ROOT -name \*.la | xargs rm -f @@ -581,6 +592,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Sep 24 2012 Dave Airlie 9.0-0.1 - rebase to latest upstream 9.0 pre-release branch +- add back glu from new upstream (split for f18 later) * Fri Sep 14 2012 Dave Airlie 8.1-0.21 - why fix one yylex when you can fix two diff --git a/sources b/sources index fbae2c2..a6f5ad8 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 9f4b33ba3e41185966d333ff4b4594f4 mesa-20120924.tar.xz +be9249132ff49275461cf92039083030 glu-9.0.0.tar.bz2