rpms/mesa/devel mesa-6.5.2-fix-glut-demos.patch, NONE, 1.1 mesa.spec, 1.132, 1.133
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Tue Jul 10 17:25:50 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7954
Modified Files:
mesa.spec
Added Files:
mesa-6.5.2-fix-glut-demos.patch
Log Message:
* Tue Jul 10 2007 Adam Jackson <ajax at redhat.com> 6.5.2-14
- Add mesa-demos subpackage. (#247252)
mesa-6.5.2-fix-glut-demos.patch:
--- NEW FILE mesa-6.5.2-fix-glut-demos.patch ---
From: Xavier Bachelot <xavier at bachelot.org>
Date: Fri, 6 Jul 2007 18:56:21 +0000 (-0600)
Subject: call glutInit(), bug 11486
X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=f98bdfca574478837b33c97d131dad4833e3ee12
call glutInit(), bug 11486
---
--- a/progs/demos/geartrain.c
+++ b/progs/demos/geartrain.c
@@ -1053,6 +1053,7 @@ main (int argc, char *argv[])
else
file = argv[1];
+ glutInit(&argc, argv);
glutInitWindowPosition (0, 0);
glutInitWindowSize(640,480);
glutInitDisplayMode (GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
--- a/progs/demos/gltestperf.c
+++ b/progs/demos/gltestperf.c
@@ -569,6 +569,7 @@ main(int ac, char **av)
if (ac == 2)
frontbuffer = 0;
+ glutInit(&ac, av);
glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
glutInitWindowPosition(0, 0);
glutInitWindowSize(640, 480);
--- a/progs/demos/isosurf.c
+++ b/progs/demos/isosurf.c
@@ -1042,6 +1042,7 @@ int main(int argc, char **argv)
read_surface( "isosurf.dat" );
+ glutInit( &argc, argv);
glutInitWindowPosition(0, 0);
glutInitWindowSize(400, 400);
--- a/progs/demos/morph3d.c
+++ b/progs/demos/morph3d.c
@@ -826,7 +826,7 @@ static void pinit(void)
}
-static void INIT(void)
+int main(int argc, char **argv)
{
printf("Morph 3D - Shows morphing platonic polyhedra\n");
printf("Author: Marcelo Fernandes Vianna (vianna at cat.cbpf.br)\n\n");
@@ -841,6 +841,7 @@ static void INIT(void)
object=1;
+ glutInit(&argc, argv);
glutInitWindowPosition(0,0);
glutInitWindowSize(640,480);
@@ -888,9 +889,3 @@ static void INIT(void)
glutMainLoop();
}
-
-int main(int argc, char **argv)
-{
- INIT();
- return(0);
-}
--- a/progs/demos/winpos.c
+++ b/progs/demos/winpos.c
@@ -100,6 +100,7 @@ static void init( void )
int main( int argc, char *argv[] )
{
+ glutInit(&argc, argv);
glutInitWindowPosition(0, 0);
glutInitWindowSize(500, 500);
glutInitDisplayMode( GLUT_RGB );
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- mesa.spec 9 Jul 2007 18:59:27 -0000 1.132
+++ mesa.spec 10 Jul 2007 17:25:15 -0000 1.133
@@ -1,6 +1,7 @@
-# Architechture specific configuration
-# FIXME: Should build with DRI support everywhere, and select target is some
-# other more pleasant fashion
+# When bootstrapping an arch, omit the -demos subpackage.
+
+# Architechture specific configuration. FIXME: Should build with DRI support
+# everywhere, and select target is some other more pleasant fashion.
%ifarch s390 s390x
%define with_dri 0
@@ -31,7 +32,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 6.5.2
-Release: 13%{?dist}
+Release: 14%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -52,6 +53,7 @@
Patch23: mesa-6.5.2-bindcontext-paranoia.patch
Patch24: mesa-6.5.2-radeon-backports-231787.patch
Patch25: mesa-6.5.2-via-respect-my-cliplist.patch
+Patch26: mesa-6.5.2-fix-glut-demos.patch
BuildRequires: pkgconfig
%if %{with_dri}
@@ -63,6 +65,7 @@
BuildRequires: makedepend
BuildRequires: libselinux-devel
BuildRequires: libXext-devel
+BuildRequires: freeglut-devel
%description
Mesa
@@ -157,8 +160,17 @@
The glx-utils package provides the glxinfo and glxgears utilities.
+%package demos
+Summary: Mesa demos
+Group: Development/Libraries
+
+%description demos
+This package provides some demo applications for testing Mesa.
+
+
%prep
%setup -q -n Mesa-%{version} -b1 -b2
+chmod a-x progs/demos/glslnoise.c
%patch0 -p1 -b .build-config
%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
@@ -171,11 +183,17 @@
%patch23 -p1 -b .bindcontext
%patch24 -p1 -b .radeon-231787
%patch25 -p1 -b .via-cliplist
+%patch26 -p1 -b .glutinit
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them.
rm -f include/GL/uglglutshapes.h
+# Hack the demos to use installed data files
+sed -i -e 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
+sed -i -e 's,geartrain.dat,%{_libdir}/mesa-demos-data/geartrain.dat,' progs/demos/geartrain.c
+sed -i -e 's,isosurf.dat,%{_libdir}/mesa-demos-data/isosurf.dat,' progs/demos/isosurf.c
+sed -i -e 's,"terrain.dat","%{_libdir}/mesa-demos-data/terrain.dat",' progs/demos/terrain.c
%build
@@ -197,6 +215,7 @@
echo "Building %{dri_target}"
make %{?_smp_mflags} %{dri_target}
make -C progs/xdemos glxgears glxinfo
+make -C progs/demos
mv preserve/* %{_lib}
ln -s libOSMesa.so.6 %{_lib}/libOSMesa.so
ln -s libOSMesa16.so.6 %{_lib}/libOSMesa16.so
@@ -226,6 +245,12 @@
install -m 0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}
install -m 0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}
+find progs/demos/ -type f -perm /0111 |
+ xargs install -m 0755 -t $RPM_BUILD_ROOT/%{_bindir}
+install -d $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
+install -m 0644 progs/images/*.rgb $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
+install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
+
%if %{with_dri}
install -d $RPM_BUILD_ROOT%{_libdir}/dri
for f in i810 i915 i915tex i965 mach64 mga r128 r200 r300 radeon savage sis tdfx unichrome; do
@@ -329,7 +354,64 @@
%{_bindir}/glxgears
%{_bindir}/glxinfo
+%files demos
+%defattr(-,root,root,-)
+%{_bindir}/arbfplight
+%{_bindir}/arbfslight
+%{_bindir}/arbocclude
+%{_bindir}/bounce
+%{_bindir}/clearspd
+%{_bindir}/cubemap
+%{_bindir}/drawpix
+%{_bindir}/engine
+%{_bindir}/fire
+%{_bindir}/fogcoord
+%{_bindir}/fplight
+%{_bindir}/fslight
+%{_bindir}/gamma
+%{_bindir}/gearbox
+%{_bindir}/gears
+%{_bindir}/geartrain
+%{_bindir}/glinfo
+%{_bindir}/gloss
+%{_bindir}/glslnoise
+%{_bindir}/gltestperf
+%{_bindir}/glutfx
+%{_bindir}/ipers
+%{_bindir}/isosurf
+%{_bindir}/lodbias
+%{_bindir}/morph3d
+%{_bindir}/multiarb
+%{_bindir}/paltex
+%{_bindir}/pointblast
+%{_bindir}/ray
+%{_bindir}/readpix
+%{_bindir}/reflect
+%{_bindir}/renormal
+%{_bindir}/shadowtex
+%{_bindir}/singlebuffer
+%{_bindir}/spectex
+%{_bindir}/spriteblast
+%{_bindir}/stex3d
+%{_bindir}/streaming_rect
+%{_bindir}/teapot
+%{_bindir}/terrain
+%{_bindir}/tessdemo
+%{_bindir}/texcyl
+%{_bindir}/texdown
+%{_bindir}/texenv
+%{_bindir}/texobj
+%{_bindir}/trispd
+%{_bindir}/tunnel
+%{_bindir}/tunnel2
+%{_bindir}/vao_demo
+%{_bindir}/winpos
+%{_libdir}/mesa-demos-data
+
%changelog
+* Tue Jul 10 2007 Adam Jackson <ajax at redhat.com> 6.5.2-14
+- Add mesa-demos subpackage. (#247252)
+
* Mon Jul 09 2007 Adam Jackson <ajax at redhat.com> 6.5.2-13
- mesa-6.5.2-radeon-backports-231787.patch: One more fix for r300. (#231787)
More information about the scm-commits
mailing list