diff --git a/.mesa-demos.metadata b/.mesa-demos.metadata new file mode 100644 index 0000000..f19df80 --- /dev/null +++ b/.mesa-demos.metadata @@ -0,0 +1,2 @@ +c970ebd5aaae561b5fb499985bef004e11b72501 SOURCES/mesa-demos-8.1.0.tar.bz2 +723482b3fc627d7cc6124fec43dd1c21d102daaa SOURCES/xdriinfo-1.0.4.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/mesa-demos-8.0.1-legal.patch b/SOURCES/mesa-demos-8.0.1-legal.patch new file mode 100644 index 0000000..9f83193 --- /dev/null +++ b/SOURCES/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/SOURCES/mesa-demos-as-needed.patch b/SOURCES/mesa-demos-as-needed.patch new file mode 100644 index 0000000..f037f84 --- /dev/null +++ b/SOURCES/mesa-demos-as-needed.patch @@ -0,0 +1,13 @@ +diff -up mesa-demos-8.1.0/configure.ac.jx mesa-demos-8.1.0/configure.ac +--- mesa-demos-8.1.0/configure.ac.jx 2013-02-24 05:49:47.000000000 -0500 ++++ mesa-demos-8.1.0/configure.ac 2013-03-27 14:41:42.493936005 -0400 +@@ -267,6 +267,9 @@ cygwin*) + ;; + esac + ++dnl i am somewhat surprised this works ++DEMO_LIBS="-Wl,--as-needed $DEMO_LIBS" ++ + AC_SUBST([DEMO_CFLAGS]) + AC_SUBST([DEMO_LIBS]) + AC_SUBST([EGL_CFLAGS]) diff --git a/SOURCES/mesad-git-snapshot.sh b/SOURCES/mesad-git-snapshot.sh new file mode 100755 index 0000000..8a50e44 --- /dev/null +++ b/SOURCES/mesad-git-snapshot.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Usage: ./make-git-snapshot.sh [COMMIT] +# +# to make a snapshot of the given tag/branch. Defaults to HEAD. +# Point env var REF to a local mesa repo to reduce clone time. + +DIRNAME=mesa-demos-$( date +%Y%m%d ) + +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + +rm -rf $DIRNAME + +git clone ${REF:+--reference $REF} \ + git://git.freedesktop.org/git/mesa/demos $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME diff --git a/SPECS/mesa-demos.spec b/SPECS/mesa-demos.spec new file mode 100644 index 0000000..989024a --- /dev/null +++ b/SPECS/mesa-demos.spec @@ -0,0 +1,136 @@ +%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: 8.1.0 +Release: 3%{?dist} +License: MIT +Group: System Environment/Libraries +URL: http://www.mesa3d.org +# 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 +Source0: ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/%{tarball}-%{version}.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 +Patch1: mesa-demos-as-needed.patch +BuildRequires: pkgconfig autoconf automake libtool +BuildRequires: freeglut-devel +BuildRequires: libGL-devel +BuildRequires: libGLU-devel +BuildRequires: glew-devel +Group: Development/Libraries + +%description +This package provides some demo applications for testing Mesa. + +%package -n glx-utils +Summary: GLX utilities +Group: Development/Libraries +Provides: glxinfo glxinfo%{?__isa_bits} + +%description -n glx-utils +The glx-utils package provides the glxinfo and glxgears utilities. + +%prep +%setup -q -n %{tarball}-%{version} -b1 +%patch0 -p1 -b .legal +%patch1 -p1 -b .asneeded + +# 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} --with-system-data-files +make %{?_smp_mflags} + +pushd ../%{xdriinfo} +%configure +make %{?_smp_mflags} +popd + +%install +make install DESTDIR=%{buildroot} + +pushd ../%{xdriinfo} +make %{?_smp_mflags} install DESTDIR=%{buildroot} +popd + +install -m 0755 src/xdemos/glxgears %{buildroot}%{_bindir} +install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir} +%if 0%{?__isa_bits} != 0 +install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} +%endif + +%check + +%files +%{demodir} +%{_datadir}/%{name}/ + +%files -n glx-utils +%{_bindir}/glxinfo* +%{_bindir}/glxgears +%{_bindir}/xdriinfo +%{_datadir}/man/man1/xdriinfo.1* + +%changelog +* Wed Mar 27 2013 Adam Jackson 8.1.0-3 +- Build with --as-needed so glxinfo doesn't needlessly drag in GLEW + +* Wed Feb 27 2013 Adam Jackson 8.1.0-2 +- Copy glxinfo to glxinfo%%{__isa_bits}, to allow people to check that their + compatibility drivers are working. + +* Sun Feb 24 2013 Dave Airlie 8.1.0-1 +- package upstream demos release 8.1.0 (mainly for new glxinfo) + +* Thu Feb 14 2013 Fedora Release Engineering - 8.0.1-2.20121218git6eef979 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* 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 + +* Fri Jul 27 2012 Kalev Lember - 7.10-8.20101028 +- Rebuilt for GLEW soname bump + +* Fri Jul 20 2012 Fedora Release Engineering - 7.10-7.20101028 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 7.10-6.20101028 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jun 20 2011 ajax@redhat.com - 7.10-5.20101028 +- Rebuild for new glew soname + +* Tue Feb 08 2011 Fedora Release Engineering - 7.10-4.20101028 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 01 2010 Adam Jackson 7.10-3.20101028 +- Install rgba images too (#640688) + +* Sat Oct 30 2010 Dave Airlie 7.10-2.20101028 +- fix install of gears/info (#647947) + +* Thu Oct 28 2010 Adam Jackson 7.10-1.20101028 +- Today's git snapshot +- Arbitrary EVR bump to be newer than when the mesa source package dropped + the demos subpackage. + +* Tue Jun 15 2010 Jerome Glisse 7.7 +- Initial build.