rpms/trackballs/F-7 trackballs-1.1.4-black-vertices-fix.patch, NONE, 1.1 trackballs.spec, 1.3, 1.4
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu Jan 3 15:21:00 UTC 2008
- Previous message (by thread): rpms/yum-utils/devel .cvsignore, 1.16, 1.17 sources, 1.18, 1.19 yum-utils.spec, 1.26, 1.27
- Next message (by thread): rpms/revisor/F-8 revisor.spec,1.29,1.30 sources,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/trackballs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077
Modified Files:
trackballs.spec
Added Files:
trackballs-1.1.4-black-vertices-fix.patch
Log Message:
* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-4
- Fix black vertices on ATI cards with OSS drivers
trackballs-1.1.4-black-vertices-fix.patch:
--- NEW FILE trackballs-1.1.4-black-vertices-fix.patch ---
diff -up trackballs-1.1.4/src/map.cc~ trackballs-1.1.4/src/map.cc
--- trackballs-1.1.4/src/map.cc~ 2008-01-03 14:31:28.000000000 +0100
+++ trackballs-1.1.4/src/map.cc 2008-01-03 14:31:28.000000000 +0100
@@ -479,7 +479,7 @@ double smoothSemiRand(int x,int y,double
void Map::drawCell(int birdsEye,int stage,int x,int y) {
Coord3d normal,normal1;
Real texScale = 0.25;
- int i,draw;
+ int i;
int gfx_details = Settings::settings->gfx_details;
double txOffset=0.0,tyOffset=0.0;
Cell& c = cell(x,y);
@@ -615,7 +615,7 @@ void Map::drawCell(int birdsEye,int stag
/* Draw south side of cell */
{
- Cell& c2 = cell(x,y-1); draw=0;
+ Cell& c2 = cell(x,y-1);
int southTransparent=c.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 ||
c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95;
if((southTransparent && stage==1) || (!southTransparent && stage==0) || !isTransparent)
@@ -624,11 +624,10 @@ void Map::drawCell(int birdsEye,int stag
if(c2.heights[Cell::NORTH+Cell::WEST] < c.heights[Cell::SOUTH+Cell::WEST] ||
c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::EAST]) {
glNormal3f(0.0,-1.0,0.0);
- draw=1;
} else
glNormal3f(0.0,+1.0,0.0);
- if(birdsEye || draw) {
+ {
glBegin(GL_TRIANGLE_STRIP);
glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::NORTH+Cell::EAST]);
glVertex3f(x+1.01,y,c2.heights[Cell::NORTH+Cell::EAST]);
@@ -645,7 +644,7 @@ void Map::drawCell(int birdsEye,int stag
/* Draw west side of cell */
{
- Cell& c2 = cell(x-1,y); draw=0;
+ Cell& c2 = cell(x-1,y);
int westTransparent=c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 || c.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95 ||
c2.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95;
if((westTransparent && stage==1) || (!westTransparent && stage==0) || !isTransparent)
@@ -654,11 +653,10 @@ void Map::drawCell(int birdsEye,int stag
if(c2.heights[Cell::SOUTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::WEST] ||
c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::NORTH+Cell::WEST]) {
glNormal3f(-1.0,0.0,0.0);
- draw=1;
} else
glNormal3f(+1.0,0.0,0.0);
- if(birdsEye || draw) {
+ {
glColor4f(0.0,0.0,0.0,1.0);
glBegin(GL_TRIANGLE_STRIP);
glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::SOUTH+Cell::EAST]);
Index: trackballs.spec
===================================================================
RCS file: /cvs/extras/rpms/trackballs/F-7/trackballs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trackballs.spec 10 Mar 2007 09:49:36 -0000 1.3
+++ trackballs.spec 3 Jan 2008 15:20:21 -0000 1.4
@@ -1,19 +1,18 @@
Name: trackballs
-Version: 1.1.2
+Version: 1.1.4
Release: 4%{?dist}
Summary: Steer a marble ball through a labyrinth
Group: Amusements/Games
-License: GPL
+License: GPLv2+
URL: http://trackballs.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
-Source2: %{name}-16.png
-Source3: %{name}-32.png
-Source4: %{name}-48.png
+Patch0: trackballs-1.1.4-destdir.patch
+Patch1: trackballs-1.1.4-black-vertices-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: guile-devel libGLU-devel zlib-devel desktop-file-utils
BuildRequires: SDL_ttf-devel SDL_mixer-devel SDL_image-devel
-Requires: hicolor-icon-theme
+Requires: hicolor-icon-theme opengl-games-utils
%description
Trackballs is a game in which you steer a marble ball through tracks of varying
@@ -23,6 +22,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
iconv -f ISO-8859-1 -t UTF8 share/%{name}.6 > share/%{name}.6.tmp
mv share/%{name}.6.tmp share/%{name}.6
# the install script does a chgrp to 'games', this doesn't work while
@@ -40,24 +41,16 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
# we use the ALT (homedir based) highscore location
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/highScores
%find_lang %{name}
-# below is the desktop file and icon stuff.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+# remove the broken upstream provided desktop file and use our own.
+rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 %{SOURCE2} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 %{SOURCE3} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 %{SOURCE4} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%clean
@@ -66,17 +59,21 @@
%post
touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%files -f %{name}.lang
-%doc AUTHORS COPYING ChangeLog FAQ README README.html TODO
+%doc AUTHORS COPYING ChangeLog FAQ README TODO
%defattr(-,root,root,-)
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
@@ -84,6 +81,18 @@
%changelog
+* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-4
+- Fix black vertices on ATI cards with OSS drivers
+
+* Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-3
+- Use opengl-games-utils wrapper to show error dialog when DRI is missing
+
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-2
+- Update License tag for new Licensing Guidelines compliance
+
+* Tue Jun 5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-1
+- New upstream release 1.1.4
+
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.2-4
- Fixup .desktop file categories for games-menus usage
- Previous message (by thread): rpms/yum-utils/devel .cvsignore, 1.16, 1.17 sources, 1.18, 1.19 yum-utils.spec, 1.26, 1.27
- Next message (by thread): rpms/revisor/F-8 revisor.spec,1.29,1.30 sources,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list