rpms/Frodo/F-9 Frodo-4.1b-SAM.patch, NONE, 1.1 Frodo-4.1b-alpha.patch, NONE, 1.1 Frodo-4.1b-opt.patch, NONE, 1.1 Frodo-4.1b-paths.patch, NONE, 1.1 Frodo.desktop, NONE, 1.1 Frodo.png, NONE, 1.1 Frodo.spec, NONE, 1.1 FrodoPC.desktop, NONE, 1.1 FrodoSC.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sat Jul 26 15:19:28 CEST 2008

Author: musuruan

Update of /cvs/nonfree/rpms/Frodo/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19353/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	Frodo-4.1b-SAM.patch Frodo-4.1b-alpha.patch 
	Frodo-4.1b-opt.patch Frodo-4.1b-paths.patch Frodo.desktop 
	Frodo.png Frodo.spec FrodoPC.desktop FrodoSC.desktop 
Log Message:
First import


Frodo-4.1b-SAM.patch:

--- NEW FILE Frodo-4.1b-SAM.patch ---
--- Src/SAM.cpp.orig	Sun Jan 14 02:20:30 2001
+++ Src/SAM.cpp	Sun Jan 14 02:55:01 2001
@@ -13,6 +13,7 @@
 #include "VIC.h"
 #include "SID.h"
 #include "CIA.h"
+#include <errno.h>
 
 
 // Pointers to chips
@@ -527,7 +533,9 @@ static void read_line(void)
 #ifdef __riscos__
 	OS_ReadLine(in_ptr = input, INPUT_LENGTH, 0, 255, 0);
 #else
-	fgets(in_ptr = input, INPUT_LENGTH, fin);
+	while (fgets(in_ptr = input, INPUT_LENGTH, fin) == NULL && 
+		errno == EINTR)
+		;
 #endif
 }
 

Frodo-4.1b-alpha.patch:

--- NEW FILE Frodo-4.1b-alpha.patch ---
--- Frodo-4.1b/Src/CmdPipe.cpp.orig	2002-01-02 21:19:34.000000000 +0000
+++ Frodo-4.1b/Src/CmdPipe.cpp	2004-08-11 18:59:21.000000000 +0000
@@ -17,7 +17,7 @@
 	#include <string.h>
 	#include <signal.h>
 
-#if defined(__alpha__)
+#if defined(__alpha__) && !defined(__linux__)
 	#include <cma.h>
 #endif
 

Frodo-4.1b-opt.patch:

--- NEW FILE Frodo-4.1b-opt.patch ---
diff -urN Frodo-4.1b.org/Src/configure.in Frodo-4.1b/Src/configure.in
--- Frodo-4.1b.org/Src/configure.in	Sat Feb 22 15:26:14 2003
+++ Frodo-4.1b/Src/configure.in	Sat Feb 22 15:27:46 2003
@@ -10,11 +10,6 @@
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 
-dnl Don't want the default "-O2 -g" that autoconf uses for gcc.
-if [[ x"$GXX" = "xyes" ]]; then
-  CFLAGS="-O2 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format"
-fi
-
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 
@@ -153,7 +148,7 @@
 
 if [[ "$HAVEGCC27" = "y" -a "$HAVEI386" = "y" ]]; then
 # Don't want strength-reduce on the i386, makes the code slower usually.
-  CFLAGS="$CFLAGS -fno-strength-reduce -DREGPARAM=\"__attribute__((regparm(3)))\""
+  CFLAGS="$CFLAGS -DREGPARAM=\"__attribute__((regparm(3)))\""
 elif [[ "$TARGET" = "amigaos" ]]; then
   CFLAGS="$CFLAGS -DREGPARAM=\"__attribute__((regargs(4)))\" "
 else

Frodo-4.1b-paths.patch:

--- NEW FILE Frodo-4.1b-paths.patch ---
diff -urN Frodo-4.1b.org/Src/C64_x.i Frodo-4.1b/Src/C64_x.i
--- Frodo-4.1b.org/Src/C64_x.i	Sat Feb 22 15:26:13 2003
+++ Frodo-4.1b/Src/C64_x.i	Sat Feb 22 15:28:37 2003
@@ -100,7 +100,7 @@
 	gui = 0;
 #else
 	// try to start up Tk gui.
-	gui = new CmdPipe("wish", "TkGui.tcl");
+	gui = new CmdPipe("/usr/bin/wish", FRODO_HOME "TkGui.tcl");
 	if (gui) {
 		if (gui->fail) {
 			delete gui; gui = 0;
diff -urN Frodo-4.1b.org/Src/Makefile.in Frodo-4.1b/Src/Makefile.in
--- Frodo-4.1b.org/Src/Makefile.in	Sat Feb 22 15:26:14 2003
+++ Frodo-4.1b/Src/Makefile.in	Sat Feb 22 15:29:04 2003
@@ -8,7 +8,7 @@
 @SET_MAKE@
 CXX    = @CXX@
 LIBS   = @LIBS@
-CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
+CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@ -DFRODO_HOME=$(FRODOHOME)
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN Frodo-4.1b.org/Src/Prefs.cpp Frodo-4.1b/Src/Prefs.cpp
--- Frodo-4.1b.org/Src/Prefs.cpp	Sat Feb 22 15:26:14 2003
+++ Frodo-4.1b/Src/Prefs.cpp	Sat Feb 22 15:28:37 2003
@@ -39,7 +39,7 @@
 	for (int i=0; i<4; i++)
 		DriveType[i] = DRVTYPE_DIR;
 
-	strcpy(DrivePath[0], "64prgs");
+	strcpy(DrivePath[0], FRODO_HOME "64prgs");
 	strcpy(DrivePath[1], "");
 	strcpy(DrivePath[2], "");
 	strcpy(DrivePath[3], "");
diff -urN Frodo-4.1b.org/Src/main.cpp Frodo-4.1b/Src/main.cpp
--- Frodo-4.1b.org/Src/main.cpp	Sat Feb 22 15:26:14 2003
+++ Frodo-4.1b/Src/main.cpp	Sat Feb 22 15:28:37 2003
@@ -24,10 +24,10 @@
 #define CHAR_ROM_FILE	"FrodoRsrc:Char_ROM"
 #define FLOPPY_ROM_FILE	"FrodoRsrc:1541_ROM"
 #else
-#define BASIC_ROM_FILE	"Basic ROM"
-#define KERNAL_ROM_FILE	"Kernal ROM"
-#define CHAR_ROM_FILE	"Char ROM"
-#define FLOPPY_ROM_FILE	"1541 ROM"
+#define BASIC_ROM_FILE	FRODO_HOME "Basic ROM"
+#define KERNAL_ROM_FILE	FRODO_HOME "Kernal ROM"
+#define CHAR_ROM_FILE	FRODO_HOME "Char ROM"
+#define FLOPPY_ROM_FILE	FRODO_HOME "1541 ROM"
 #endif
 
 


--- NEW FILE Frodo.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Frodo
Comment=Line-based Commodore 64 emulator
Exec=Frodo
Icon=Frodo.png
Terminal=true
Type=Application
Categories=Game;Emulator;



--- NEW FILE Frodo.spec ---
%define pkgversion %(echo %version|sed s/\\\\\./\\_/)

Summary: Commodore 64 emulator
Name: Frodo
Version: 4.1b
Release: 5%{?dist}
License: Distributable
Group: Applications/Emulators
URL: http://frodo.cebix.net/
Source0: http://frodo.cebix.net/downloads/%{name}V%{pkgversion}.Src.tar.gz
Source1: Frodo.png
Source2: Frodo.desktop
Source3: FrodoPC.desktop
Source4: FrodoSC.desktop
Patch0: Frodo-4.1b-paths.patch
Patch1: Frodo-4.1b-opt.patch
Patch2: Frodo-4.1b-alpha.patch
Patch3: Frodo-4.1b-SAM.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: libXt-devel 
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme

%package gui
Summary: Preferences editor for Frodo
Group: Applications/Emulators
Requires: %{name}
Requires: tk

%description
Frodo V4.1 is a free, portable C64 emulator for BeOS, Unix, MacOS,
AmigaOS, RiscOS and WinNT/95 systems.

This emulator focuses on the exact reproduction of special graphical
effects possible on the C64, and has therefore relatively high system
requirements. It should only be run on systems with at least a
PowerPC/Pentium/68060. Frodo is capable of running most games and
demos correctly, even those with FLI, FLD, DYCP, open borders,
multiplexed sprites, timing dependent decoders, fast loaders etc. 6510
emulation: All undocumented opcodes, 100 percent correct decimal mode,
instruction/cycle exact emulation. VIC emulation: Line-/cycle-based
emulation, all display modes, sprites with collisions/priorities, DMA
cycles, open borders, all $d011/$d016 effects. SID emulation:
Real-time digital emulation (16 bit, 44.1kHz), including filters (only
under BeOS, Linux, HP-UX, MacOS and AmigaOS). 1541 emulation: Drive
simulation in directories, .d64/x64 or .t64/LYNX files, or
processor-level 1541 emulation that works with about 95 percent of all
fast loaders and even some copy protection schemes. Other peripherals:
Keyboard and joystick (real joysticks (only under BeOS, Linux and
AmigaOS) or keyboard emulation). The full source code in C++ is
available. Frodo is freeware.

%description gui
An enhanced Tcl/Tk preferences GUI for Frodo written by Gerard Decatrel

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p0

%build
cd Src
autoconf
%configure
make %{?_smp_mflags} all FRODOHOME="\\\"%{_datadir}/Frodo/\\\""

%install
rm -rf %{buildroot}
install -d 755 %{buildroot}%{_bindir}
install -d 755 %{buildroot}%{_datadir}/Frodo/{64prgs,64imgs}
install -m 755 Src/Frodo Src/FrodoPC Src/FrodoSC %{buildroot}%{_bindir}
install -m 755 TkGui.tcl %{buildroot}%{_datadir}/Frodo
install -m 644 "Frodo Logo" "1541 ROM" "Basic ROM" "Char ROM" "Kernal ROM" \
  %{buildroot}%{_datadir}/Frodo
install -m 644 64prgs/* %{buildroot}%{_datadir}/Frodo/64prgs

#install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/

#install desktop files
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor dribble        \
  --dir %{buildroot}%{_datadir}/applications \
  %{SOURCE2}
desktop-file-install --vendor dribble        \
  --dir %{buildroot}%{_datadir}/applications \
  %{SOURCE3}
desktop-file-install --vendor dribble        \
  --dir %{buildroot}%{_datadir}/applications \
  %{SOURCE4}

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_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
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root)
%{_bindir}/Frodo
%{_bindir}/FrodoPC
%{_bindir}/FrodoSC
%{_datadir}/Frodo
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/applications/dribble-%{name}PC.desktop
%{_datadir}/applications/dribble-%{name}SC.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%doc CHANGES Docs/*
%exclude %{_datadir}/Frodo/TkGui.tcl

%files gui
%defattr(-,root,root)
%{_datadir}/Frodo/TkGui.tcl

%changelog
* Fri Nov 02 2007 Andrea Musuruane <musuruan at gmail.com> 4.1b-5
- removed %%{?dist} tag from changelog
- updated icon cache scriptlets to be compliant to new guidelines

* Sun Mar 25 2007 Andrea Musuruane <musuruan at gmail.com> 4.1b-4
- moved preference editor in a subpackage
- changed desktop categories to Game;Emulator

* Tue Feb 27 2007 Andrea Musuruane <musuruan at gmail.com> 4.1b-3
- added libXt-devel to BR to fix building on FC5

* Sat Feb 24 2007 Andrea Musuruane <musuruan at gmail.com> 4.1b-2
- changed desktop files to open terminal otherwise SAM cannot be run

* Sat Feb 10 2007 Andrea Musuruane <musuruan at gmail.com> 4.1b-1
- first release for Dribble based on current PLD package
- fixed License tag
- updated URL tag
- updated Source tag
- fixed patch names to meet Fedora guidelines
- added a patch based on the current OpenBSD port to fix SAM
- updated Build Requires
- fixed BuildRoot to meet Fedora guidelines
- added %%{?_smp_mflags} to make invocation to speed up SMP builds
- fixed %%files
- used Frodo icon made by Christian Rosentreter. 
  Downloaded from http://www.christianrosentreter.com/
- added desktop files
- minor changes



--- NEW FILE FrodoPC.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=FrodoPC
Comment=Improved line-based Commodore 64 emulator
Exec=FrodoPC
Icon=Frodo.png
Terminal=true
Type=Application
Categories=Game;Emulator;



--- NEW FILE FrodoSC.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=FrodoSC
Comment=Single-cycle Commodore 64 emulator
Exec=FrodoSC
Icon=Frodo.png
Terminal=true
Type=Application
Categories=Game;Emulator;



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Frodo/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2008 15:35:08 -0000	1.1
+++ .cvsignore	26 Jul 2008 13:19:28 -0000	1.2
@@ -0,0 +1 @@
+FrodoV4_1b.Src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Frodo/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jun 2008 15:35:08 -0000	1.1
+++ sources	26 Jul 2008 13:19:28 -0000	1.2
@@ -0,0 +1 @@
+095b9f21c03204cc13f7f249e8866cd9  FrodoV4_1b.Src.tar.gz

