From c7806154bce188a4230e72d8f8aabe801482f01b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 8 Jan 2013 12:01:10 -0500 Subject: [PATCH] update to 8.0.1 git checkout, xdriinfo 1.0.4, remove non-free files --- .gitignore | 2 ++ mesa-demos-8.0.1-legal.patch | 19 +++++++++++ mesa-demos.spec | 62 +++++++++++++++++------------------- sources | 4 +-- 4 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 mesa-demos-8.0.1-legal.patch diff --git a/.gitignore b/.gitignore index bbcfaf2..7fda1aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ mesa-demos-20100615.tar.bz2 xdriinfo-1.0.3.tar.bz2 /mesa-demos-20101028.tar.bz2 +/xdriinfo-1.0.4.tar.bz2 +/mesa-demos-6eef979.tar.bz2 diff --git a/mesa-demos-8.0.1-legal.patch b/mesa-demos-8.0.1-legal.patch new file mode 100644 index 0000000..9f83193 --- /dev/null +++ b/mesa-demos-8.0.1-legal.patch @@ -0,0 +1,19 @@ +diff -up mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am.legal mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am +--- mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am.legal 2013-01-08 11:24:38.805867866 -0500 ++++ mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am 2013-01-08 11:24:44.975870107 -0500 +@@ -65,7 +65,6 @@ bin_PROGRAMS = \ + multiarb \ + paltex \ + pixeltest \ +- pointblast \ + projtex \ + ray \ + readpix \ +@@ -74,7 +73,6 @@ bin_PROGRAMS = \ + shadowtex \ + singlebuffer \ + spectex \ +- spriteblast \ + stex3d \ + teapot \ + terrain \ diff --git a/mesa-demos.spec b/mesa-demos.spec index 3155243..df6df42 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,27 +1,30 @@ -%define gitdate 20101028 -%define tarball mesa-demos -%define xdriinfo xdriinfo-1.0.3 - -%define demodir %{_libdir}/mesa +%global gitdate 20121218 +%global gitcommit 6eef979a5488dab01088412f88374b2ea9d615cd +%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) +%global tarball mesa-demos +%global xdriinfo xdriinfo-1.0.4 +%global demodir %{_libdir}/mesa Summary: Mesa demos Name: mesa-demos -Version: 7.10 -Release: 9.%{gitdate}%{?dist} +Version: 8.0.1 +Release: 1.%{gitdate}git%{shortcommit}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org - -Source0: %{tarball}-%{gitdate}.tar.bz2 +# git clone http://anongit.freedesktop.org/git/mesa/demos.git +# mv demos mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd +# tar --exclude-vcs -cjf mesa-demos-6eef979.tar.bz2 mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd +Source0: %{tarball}-%{shortcommit}.tar.bz2 Source1: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 Source2: mesad-git-snapshot.sh - +# Patch pointblast/spriteblast out of the Makefile for legal reasons +Patch0: mesa-demos-8.0.1-legal.patch BuildRequires: pkgconfig autoconf automake libtool BuildRequires: freeglut-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: glew-devel - Group: Development/Libraries %description @@ -35,18 +38,16 @@ Group: Development/Libraries The glx-utils package provides the glxinfo and glxgears utilities. %prep -%setup -q -n %{tarball}-%{gitdate} -b1 +%setup -q -n %{tarball}-%{gitcommit} -b1 +%patch0 -p1 -b .legal -# Hack the demos to use installed data files - -sed -i 's,../images,%{_libdir}/mesa,' src/demos/*.c -sed -i 's,geartrain.dat,%{_libdir}/mesa/&,' src/demos/geartrain.c -sed -i 's,isosurf.dat,%{_libdir}/mesa/&,' src/demos/isosurf.c -sed -i 's,terrain.dat,%{_libdir}/mesa/&,' src/demos/terrain.c +# These two files are distributable, but non-free (lack of permission to modify). +rm -rf src/demos/pointblast.c +rm -rf src/demos/spriteblast.c %build autoreconf -i -%configure --bindir=%{demodir} +%configure --bindir=%{demodir} --with-system-data-files make %{?_smp_mflags} pushd ../%{xdriinfo} @@ -55,36 +56,33 @@ make %{?_smp_mflags} popd %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -install -m 0644 src/images/*.rgb $RPM_BUILD_ROOT/%{demodir} -install -m 0644 src/images/*.rgba $RPM_BUILD_ROOT/%{demodir} -install -m 0644 src/demos/*.dat $RPM_BUILD_ROOT/%{demodir} +make install DESTDIR=%{buildroot} pushd ../%{xdriinfo} -make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} install DESTDIR=%{buildroot} popd -install -m 0755 src/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir} -install -m 0755 src/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir} - -%clean -rm -rf $RPM_BUILD_ROOT +install -m 0755 src/xdemos/glxgears %{buildroot}%{_bindir} +install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir} %check %files -%defattr(-,root,root,-) %{demodir} +%{_datadir}/%{name}/ %files -n glx-utils -%defattr(-,root,root,-) %{_bindir}/glxinfo %{_bindir}/glxgears %{_bindir}/xdriinfo %{_datadir}/man/man1/xdriinfo.1* %changelog +* Tue Jan 8 2013 Tom Callaway - 8.0.1-1.20121218git6eef979 +- update to 8.0.1 (git checkout from 20121218) +- update xdriinfo to 1.0.4 +- remove non-free files (bz892925) + * Thu Dec 13 2012 Adam Jackson - 7.10-9.20101028 - Rebuild for glew 1.9.0 diff --git a/sources b/sources index 2e9d534..0d84148 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cb304d1ce562ac48b68eedeba38c662f xdriinfo-1.0.3.tar.bz2 -2d779d620b0799734c9ce5419a82b9fc mesa-demos-20101028.tar.bz2 +3d3cad4d754e10e325438193433d59fd xdriinfo-1.0.4.tar.bz2 +ce598439477dae8d702d30b7f19f2677 mesa-demos-6eef979.tar.bz2