rpms/BasiliskII/devel BasiliskII-SDL-audio.patch, NONE, 1.1 BasiliskII-debuginfo.patch, NONE, 1.1 BasiliskII-disk-scan-crash.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 BasiliskII.spec, 1.9, 1.10 sources, 1.3, 1.4 BasiliskII-1.0-gcc43.patch, 1.1, NONE BasiliskII-1.0-nostrip.patch, 1.2, NONE

Sun Mar 10 20:49:00 CET 2013

Author: jwrdegoede

Update of /cvs/free/rpms/BasiliskII/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26755

Modified Files:
	.cvsignore BasiliskII.spec sources 
Added Files:
	BasiliskII-SDL-audio.patch BasiliskII-debuginfo.patch 
	BasiliskII-disk-scan-crash.patch 
Removed Files:
	BasiliskII-1.0-gcc43.patch BasiliskII-1.0-nostrip.patch 
Log Message:
* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 1.0-0.20130310.4
- New upstream: http://basilisk.cebix.net/
- Uses github, no source tarbals :| Update to todays git master (bbc0af47)
- Modernize spec
- Fix FTBFS (since F-11 !)
- Switch from esound (deprecated / obsolete) to SDL for sound output


BasiliskII-SDL-audio.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE BasiliskII-SDL-audio.patch ---
diff -up macemu-master.foo/BasiliskII/src/Unix/configure.ac~ macemu-master.foo/BasiliskII/src/Unix/configure.ac
--- macemu-master.foo/BasiliskII/src/Unix/configure.ac~	2013-03-04 19:14:20.000000000 +0100
+++ macemu-master.foo/BasiliskII/src/Unix/configure.ac	2013-03-10 16:34:54.553217381 +0100
@@ -250,7 +250,7 @@ else
 fi
 
 dnl We need X11, if not using SDL.
-if [[ "x$WANT_SDL" = "xno" ]]; then
+if [[ "x$WANT_SDL_VIDEO" = "xno" ]]; then
   AC_PATH_XTRA
   if [[ "x$no_x" = "xyes" ]]; then
     AC_MSG_ERROR([You need X11 to run Basilisk II.])

BasiliskII-debuginfo.patch:
 configure.ac |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE BasiliskII-debuginfo.patch ---
diff -up macemu-master/BasiliskII/src/Unix/configure.ac~ macemu-master/BasiliskII/src/Unix/configure.ac
--- macemu-master/BasiliskII/src/Unix/configure.ac~	2013-03-10 17:10:20.000000000 +0100
+++ macemu-master/BasiliskII/src/Unix/configure.ac	2013-03-10 17:15:18.256226685 +0100
@@ -1725,12 +1725,6 @@ if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; t
   CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS $JITSRCS"
 fi
 
-dnl Remove the "-g" option if set for GCC.
-if [[ "x$HAVE_GCC27" = "xyes" ]]; then
-  CFLAGS=`echo $CFLAGS | sed -e 's/-g\b//g'`
-  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-g\b//g'`
-fi
-
 dnl Or if we have -IPA (MIPSPro compilers)
 if [[ "x$HAVE_IPA" = "xyes" ]]; then
   CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"

BasiliskII-disk-scan-crash.patch:
 sys_unix.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE BasiliskII-disk-scan-crash.patch ---
diff -up macemu-master/BasiliskII/src/Unix/sys_unix.cpp~ macemu-master/BasiliskII/src/Unix/sys_unix.cpp
--- macemu-master/BasiliskII/src/Unix/sys_unix.cpp~	2013-03-04 19:14:20.000000000 +0100
+++ macemu-master/BasiliskII/src/Unix/sys_unix.cpp	2013-03-10 17:33:06.005230783 +0100
@@ -324,7 +324,7 @@ void SysAddDiskPrefs(void)
 			line[len-1] = 0;
 
 			// Parse line
-			char *dev, *mnt_point, *fstype;
+			char *dev = NULL, *mnt_point = NULL, *fstype = NULL;
 			if (sscanf(line, "%as %as %as", &dev, &mnt_point, &fstype) == 3) {
 				if (strcmp(fstype, "hfs") == 0)
 					PrefsAddString("disk", dev);


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2008 19:35:32 -0000	1.3
+++ .cvsignore	10 Mar 2013 19:48:59 -0000	1.4
@@ -1,3 +1,3 @@
-BasiliskII_src_01052006.tar.bz2
 BasiliskII.png
 cxmon-3.2.tar.gz
+macemu-master.zip


Index: BasiliskII.spec
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/BasiliskII.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasiliskII.spec	3 Mar 2013 21:35:19 -0000	1.9
+++ BasiliskII.spec	10 Mar 2013 19:48:59 -0000	1.10
@@ -1,26 +1,23 @@
-%define date 20060501
-%define inv_date 01052006
+%define date 20130310
 %define mon_version 3.2
-%define desktop_vendor rpmforge
-%define _with_banks 1
 
-Summary: 68k Macintosh emulator
-Name: BasiliskII
-Version: 1.0
-Release: 0.%{date}.3%{?dist}.4
-License: GPLv2+
-Group: Applications/Emulators
-URL: http://gwenole.beauchesne.info/projects/basilisk2/
-Source0: http://gwenole.beauchesne.info/projects/basilisk2/files/BasiliskII_src_%{inv_date}.tar.bz2
-Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
-Source2: BasiliskII.png
-Patch0: BasiliskII-1.0-nostrip.patch
-Patch1: BasiliskII-1.0-gcc43.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, gtk2-devel, esound-devel >= 0.2.8
-BuildRequires: desktop-file-utils, readline-devel
-BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
-%{?_with_sdl:BuildRequires: SDL-devel}
+Summary:        68k Macintosh emulator
+Name:           BasiliskII
+Version:        1.0
+Release:        0.%{date}.4%{?dist}
+License:        GPLv2+
+URL:            http://basilisk.cebix.net/
+# GRRR github, no url ...
+Source0:        macemu-master.zip
+Source1:        http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
+Source2:        BasiliskII.png
+Patch0:         BasiliskII-debuginfo.patch
+Patch1:         BasiliskII-disk-scan-crash.patch
+Patch2:         BasiliskII-SDL-audio.patch
+BuildRequires:  libtool gcc-c++ gtk2-devel
+BuildRequires:  desktop-file-utils readline-devel
+BuildRequires:  libXt-devel libXxf86vm-devel SDL-devel
+Requires:       hicolor-icon-theme
 
 %description
 Basilisk II is an Open Source 68k Macintosh emulator. That is, it enables
@@ -28,38 +25,33 @@
 different operating system. However, you still need a copy of MacOS and
 a Macintosh ROM image to use Basilisk II.
 
-Available rebuild options :
---with    : sdl banks
---without : mon
-
 
 %prep
-%setup -q -a 1
-%patch0 -p1 -b .nostrip
-%patch1 -p1 -b .gcc43
-iconv -f ISO_8859-1 -t UTF8 README > README.tmp
-touch -r README README.tmp; mv README.tmp README
-iconv -f ISO_8859-1 -t UTF8 ChangeLog > ChangeLog.tmp
-touch -r ChangeLog ChangeLog.tmp; mv ChangeLog.tmp ChangeLog
+%setup -q -a 1 -n macemu-master
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+iconv -f ISO_8859-1 -t UTF8 BasiliskII/README > README
+touch -r BasiliskII/README README
+iconv -f ISO_8859-1 -t UTF8 BasiliskII/ChangeLog > ChangeLog
+touch -r ChangeLog BasiliskII/ChangeLog
 
 
 %build
-pushd src/Unix
-%configure \
-    --datadir=%{_sysconfdir} \
-    %{?_with_banks:--enable-addressing="banks"} \
-    %{!?_with_banks:--enable-jit-compiler} \
-    %{!?_without_mon: --with-mon=../../cxmon-%{mon_version}/src} \
-    %{?_with_sdl: --enable-sdl-video --enable-sdl-audio}
-%{__make} %{?_smp_mflags}
+pushd BasiliskII/src/Unix
+NO_CONFIGURE=1 ./autogen.sh
+%configure --datadir=%{_sysconfdir} \
+    --with-mon=../../../cxmon-%{mon_version}/src \
+    --disable-xf86-dga --enable-sdl-audio --with-bincue
+make %{?_smp_mflags}
 popd
 
 
 %install
-%{__rm} -rf %{buildroot}
-%makeinstall -C src/Unix \
-    datadir="%{buildroot}%{_sysconfdir}"
-chmod +x %{buildroot}%{_sysconfdir}/%{name}/tunconfig
+pushd BasiliskII/src/Unix
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tunconfig
 
 # Create the system menu entry
 %{__cat} > %{name}.desktop << EOF
@@ -67,39 +59,56 @@
 Name=Basilisk II
 Comment=68k Macintosh Emulator
 Exec=BasiliskII
-Icon=BasiliskII.png
+Icon=BasiliskII
 Terminal=false
 Type=Application
 Categories=Game;Emulator;
 EOF
 
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} \
-    --dir %{buildroot}%{_datadir}/applications \
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+%if 0%{?fedora} && 0%{?fedora} < 19
+    --vendor rpmforge \
+%endif
     %{name}.desktop
 
-%{__install} -D -p -m 0644 %{SOURCE2} \
-    %{buildroot}%{_datadir}/pixmaps/BasiliskII.png
+install -D -p -m 0644 %{SOURCE2} \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/BasiliskII.png
+
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-%{__rm} -rf %{buildroot}
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc ChangeLog COPYING README TECH TODO
+%doc ChangeLog README BasiliskII/COPYING BasiliskII/TECH BasiliskII/TODO
 %dir %{_sysconfdir}/BasiliskII/
 %config(noreplace) %{_sysconfdir}/BasiliskII/fbdevices
 %config(noreplace) %{_sysconfdir}/BasiliskII/keycodes
 %{_sysconfdir}/BasiliskII/tunconfig
 %{_bindir}/BasiliskII
-%{_datadir}/pixmaps/BasiliskII.png
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/BasiliskII.png
+%{_datadir}/applications/*%{name}.desktop
 %{_mandir}/man1/BasiliskII.1*
 
 
 %changelog
+* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 1.0-0.20130310.4
+- New upstream: http://basilisk.cebix.net/
+- Uses github, no source tarbals :| Update to todays git master (bbc0af47)
+- Modernize spec
+- Fix FTBFS (since F-11 !)
+- Switch from esound (deprecated / obsolete) to SDL for sound output
+
 * Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.0-0.20060501.3.4
 - Mass rebuilt for Fedora 19 Features
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2008 19:35:32 -0000	1.3
+++ sources	10 Mar 2013 19:48:59 -0000	1.4
@@ -1,3 +1,3 @@
-dfe9e088649133485bae28a713979481  BasiliskII_src_01052006.tar.bz2
 d82f6d88e98f6a200af96643eeef80ab  BasiliskII.png
 8fb95c58f6c04eace6ae84d0c7b79ca1  cxmon-3.2.tar.gz
+1daf9f4ef843d0f3c6fb648c26bf0722  macemu-master.zip


--- BasiliskII-1.0-gcc43.patch DELETED ---


--- BasiliskII-1.0-nostrip.patch DELETED ---
