Updated some UNIX/Linux build related items.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1128 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/Makefile

@@ -13,7 +13,7 @@
 ## See the file "license" for information on usage and redistribution of
 ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ##
-## $Id: Makefile,v 1.27 2006-09-08 00:44:19 stephena Exp $
+## $Id: Makefile,v 1.28 2006-09-08 14:35:20 stephena Exp $
 ##
 ##   Based on code from ScummVM - Scumm Interpreter
 ##   Copyright (C) 2002-2004 The ScummVM project
@@ -175,7 +175,11 @@ install: all
 	$(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics"
 	$(INSTALL) -c -m 644 "$(srcdir)/docs/graphics/chucky_cheese.png" "$(srcdir)/docs/graphics/circuit.png" "$(srcdir)/docs/graphics/console.png" "$(srcdir)/docs/graphics/eventmapping.png" "$(srcdir)/docs/graphics/eventmapping_remap.png" "$(srcdir)/docs/graphics/jr_pacman.png" "$(srcdir)/docs/graphics/launcher_options_rom.png" "$(srcdir)/docs/graphics/launcher_options_snap.png" "$(srcdir)/docs/graphics/launcher.png" "$(srcdir)/docs/graphics/options_about.png" "$(srcdir)/docs/graphics/options_audio.png" "$(srcdir)/docs/graphics/options_gameinfo.png" "$(srcdir)/docs/graphics/options_help.png" "$(srcdir)/docs/graphics/options_video.png" "$(srcdir)/docs/graphics/pacman.png" "$(srcdir)/docs/graphics/rom_browser.png" "$(srcdir)/docs/graphics/secret_quest.png" "$(srcdir)/docs/graphics/space_invaders.png" "$(DESTDIR)$(DOCDIR)/graphics"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons"
+	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/mini"
+	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/large"
 	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons/mini"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons/large"
 
 install-strip: install
 	strip stella$(EXEEXT)

stella/src/common/FrameBufferGL.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FrameBufferGL.cxx,v 1.61 2006-04-12 13:32:06 stephena Exp $
+// $Id: FrameBufferGL.cxx,v 1.62 2006-09-08 14:35:20 stephena Exp $
 //============================================================================
 
 #ifdef DISPLAY_OPENGL
@@ -267,6 +267,8 @@ bool FrameBufferGL::createScreen()
   SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE,  myRGB[2] );
   SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, myRGB[3] );
   SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+//  SDL_GL_SetAttribute( SDL_GL_ACCELERATED_VISUAL, 1 );
+//  SDL_GL_SetAttribute( SDL_GL_SWAP_CONTROL, 0 );
 
   // Set the screen coordinates
   GLdouble orthoWidth  = 0.0;

stella/src/unix/stella.spec

@@ -13,10 +13,10 @@
 %define enable_static 0
 
 %if %build_plf
-  %define release %mkrel %{rel}
+  %define release %mkrel %rel
   %define distsuffix plf
 %else
-  %define release %{rel}
+  %define release %rel
 %endif
 
 Summary:        An Atari 2600 Video Computer System emulator
@@ -29,7 +29,7 @@ URL:            http://stella.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %_tmppath/%name-%version-%release-root
 BuildRequires:  SDL-devel
-BuildRequires:	MesaGLU-devel
+BuildRequires:  MesaGLU-devel
 BuildRequires:  zlib-devel
 %if %enable_snapshot
 BuildRequires:  libpng-devel
@@ -50,52 +50,51 @@ This package is in PLF as Mandriva Linux policy forbids emulators in contribs.
 
 %build
 export CXXFLAGS=$RPM_OPT_FLAGS
-./configure \
+%configure \
 %if %enable_gl
-	--enable-gl \
+  --enable-gl \
 %else
-	--disable-gl \
+  --disable-gl \
 %endif
 %if %enable_sound
-	--enable-sound \
+  --enable-sound \
 %else
-	--disable-sound \
+  --disable-sound \
 %endif
 %if %enable_developer
-	--enable-developer \
+  --enable-developer \
 %else
-	--disable-developer \
+  --disable-developer \
 %endif
 %if %enable_snapshot
-	--enable-snapshot \
+  --enable-snapshot \
 %else
-	--disable-snapshot \
+   --disable-snapshot \
 %endif
 %if %enable_joystick
-	--enable-joystick \
+  --enable-joystick \
 %else
-	--disable-joystick \
+  --disable-joystick \
 %endif
 %if %enable_cheats
-	--enable-cheats \
+  --enable-cheats \
 %else
-	--disable-cheats \
+  --disable-cheats \
 %endif
 %if %enable_static
-	--enable-static \
+  --enable-static \
 %else
-	--enable-shared \
+  --enable-shared \
 %endif
-	--prefix=%{_prefix} \
+  --docdir=%{_docdir}/stella \
-	--bindir=%{_bindir} \
+  --x-libraries=%{_prefix}/X11R6/%{_lib}
-	--docdir=%{_docdir}/stella-%{version} \
+
-	--datadir=%{_datadir} \
-	--x-libraries=%{_prefix}/X11R6/%{_lib}
 %make
 
 %install
-make install-strip DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
+make install-strip DESTDIR=%{buildroot}
 # Mandriva menu entries
 install -d -m0755 %{buildroot}%{_menudir}
 cat > %{buildroot}%{_menudir}/%{name} << EOF
@@ -104,8 +103,26 @@ icon="stella.xpm" \
 needs="x11" \
 title="Stella" \
 longtitle="A multi-platform Atari 2600 emulator" \
-section="Applications/Emulators"
+section="More Applications/Emulators" \
+xdg="true"
 EOF
+# Todo - make this part of the main package
+install -d -m0755 %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Stella
+Comment=A multi-platform Atari 2600 emulator
+Exec=%{_bindir}/%{name}
+Icon=stella.xpm
+Terminal=false
+Type=Application
+Categories=Application;Emulator;
+EOF
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 %post
 %update_menus
@@ -113,23 +130,26 @@ EOF
 %postun
 %clean_menus
 
-%clean
-rm -rf %buildroot
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
 %files
 %defattr(-,root,root,-)
 %_bindir/*
 %{_menudir}/%{name}
-%_docdir/stella-%{version}/*
+%{_datadir}/applications/%{name}.desktop
-%_datadir/icons/*
+%_docdir/stella/*
+%_datadir/icons/%{name}.xpm
+%_datadir/icons/mini/%{name}.xpm
+%_datadir/icons/large/%{name}.xpm
 
 %changelog
-* Thu Apr 06 2006 Stephen Anthony <stephena@zarb.org> 2.2-1
+* Fri Sep 08 2006 Stephen Anthony <stephena@zarb.org> 2.2-1plf2007.0
-- Version 2.2 release
+- Packaged 2.2 release for PLF
+- Added XDG menu
 
-* Sat Jan 28 2006 Stephen Anthony <stephena@zarb.org> 2.1-1
+* Sat Oct 29 2005 Stephen Anthony <stephena@zarb.org> 2.0.1-3plf
-- Version 2.1 release
+- Fix for x86_64 compilation
+
+* Wed Oct 26 2005 Stephen Anthony <stephena@zarb.org> 2.0.1-2plf
+- Fix for improper PLF upload
 
 * Sun Oct 24 2005 Stephen Anthony <stephena@zarb.org> 2.0.1-1
 - Version 2.0.1 release, and plaform-agnostic SRPM (hopefully)