Author: jwrdegoede Update of /cvs/nonfree/rpms/vice/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18500 Modified Files: .cvsignore sources vice-1.19-datadir.patch vice-1.20-monitor-crash.patch vice-tmpnam.patch vice.spec Log Message: * Tue Jun 22 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-1 - New upstream release 2.2 - Also build the new SDL version, the SDL binaries are available with a .sdl extension, for example x64.sdl Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/vice/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2008 20:38:25 -0000 1.4 +++ .cvsignore 22 Jun 2010 10:34:07 -0000 1.5 @@ -1,4 +1,4 @@ vice-largeicons.tar.bz2 vice-miniicons.tar.bz2 vice-normalicons.tar.bz2 -vice-2.1.tar.gz +vice-2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/vice/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2008 20:38:25 -0000 1.4 +++ sources 22 Jun 2010 10:34:07 -0000 1.5 @@ -1,4 +1,4 @@ a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2 c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2 1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2 -a4cca1aad12e12ac7f37d6c85310ade8 vice-2.1.tar.gz +6737f540806205384e9129026898b0a1 vice-2.2.tar.gz vice-1.19-datadir.patch: sdl/archdep_unix.h | 2 +- unix/archdep.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: vice-1.19-datadir.patch =================================================================== RCS file: /cvs/nonfree/rpms/vice/devel/vice-1.19-datadir.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vice-1.19-datadir.patch 1 Aug 2008 10:23:03 -0000 1.3 +++ vice-1.19-datadir.patch 22 Jun 2010 10:34:07 -0000 1.4 @@ -1,11 +1,24 @@ ---- vice-2.0/src/arch/unix/archdep.h.foo 2008-07-07 20:23:10.000000000 +0200 -+++ vice-2.0/src/arch/unix/archdep.h 2008-08-01 10:19:47.000000000 +0200 -@@ -109,7 +109,7 @@ extern const char *archdep_home_path(voi +diff -up vice-2.2/src/arch/unix/archdep.h.datadir vice-2.2/src/arch/unix/archdep.h +--- vice-2.2/src/arch/unix/archdep.h.datadir 2009-10-21 18:46:46.000000000 +0200 ++++ vice-2.2/src/arch/unix/archdep.h 2010-06-22 10:06:21.353162984 +0200 +@@ -120,7 +120,7 @@ extern const char *archdep_home_path(voi extern const char *archdep_pref_path; /* Define the default system directory (where the ROMs are). */ -#ifdef __NetBSD__ +#if 1 - #define LIBDIR PREFIX "/share/vice" + #define LIBDIR PREFIX "/share/vice" #else - #define LIBDIR PREFIX "/lib/vice" + #define LIBDIR PREFIX "/lib/vice" +diff -up vice-2.2/src/arch/sdl/archdep_unix.h~ vice-2.2/src/arch/sdl/archdep_unix.h +--- vice-2.2/src/arch/sdl/archdep_unix.h~ 2009-09-21 19:36:09.000000000 +0200 ++++ vice-2.2/src/arch/sdl/archdep_unix.h 2010-06-22 11:24:46.205880453 +0200 +@@ -85,7 +85,7 @@ extern const char *archdep_home_path(voi + extern const char *archdep_pref_path; + + /* Define the default system directory (where the ROMs are). */ +-#ifdef __NetBSD__ ++#if 1 + #define LIBDIR PREFIX "/share/vice" + #else + #define LIBDIR PREFIX "/lib/vice" vice-1.20-monitor-crash.patch: arch/unix/console.c | 2 ++ monitor/mon_util.c | 6 ++++-- monitor/monitor.c | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) Index: vice-1.20-monitor-crash.patch =================================================================== RCS file: /cvs/nonfree/rpms/vice/devel/vice-1.20-monitor-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vice-1.20-monitor-crash.patch 25 Jul 2008 19:37:37 -0000 1.1 +++ vice-1.20-monitor-crash.patch 22 Jun 2010 10:34:07 -0000 1.2 @@ -1,7 +1,7 @@ -diff -ur vice-1.20.orig/src/arch/unix/console.c vice-1.20/src/arch/unix/console.c ---- vice-1.20.orig/src/arch/unix/console.c 2006-07-10 18:09:33.000000000 +0200 -+++ vice-1.20/src/arch/unix/console.c 2007-03-01 16:43:13.000000000 +0100 -@@ -115,6 +115,8 @@ +diff -up vice-2.2/src/arch/unix/console.c.mon vice-2.2/src/arch/unix/console.c +--- vice-2.2/src/arch/unix/console.c.mon 2009-10-21 18:46:46.000000000 +0200 ++++ vice-2.2/src/arch/unix/console.c 2010-06-22 10:12:55.164882183 +0200 +@@ -114,6 +114,8 @@ char *console_in(console_t *log, const c char *p, *ret_sting; p = readline(prompt); @@ -10,10 +10,10 @@ ret_sting = lib_stralloc(p); free(p); -diff -ur vice-1.20.orig/src/monitor/mon_util.c vice-1.20/src/monitor/mon_util.c ---- vice-1.20.orig/src/monitor/mon_util.c 2006-08-06 17:54:56.000000000 +0200 -+++ vice-1.20/src/monitor/mon_util.c 2007-03-01 16:48:42.000000000 +0100 -@@ -178,8 +178,8 @@ +diff -up vice-2.2/src/monitor/mon_util.c.mon vice-2.2/src/monitor/mon_util.c +--- vice-2.2/src/monitor/mon_util.c.mon 2009-10-21 18:46:55.000000000 +0200 ++++ vice-2.2/src/monitor/mon_util.c 2010-06-22 10:20:08.306259451 +0200 +@@ -210,8 +210,8 @@ char *uimon_in(const char *prompt) { char *p = NULL; @@ -22,21 +22,21 @@ + while (!p && !pchCommandLine && p != (char*)-1) { + /* as long as we don't have any return value and not EOF */ - /* make sure to flush the output buffer */ - mon_buffer_flush(); -@@ -187,6 +187,8 @@ - /* get input from the user */ - p = uimon_get_in(&pchCommandLine, prompt); + #ifdef HAVE_NETWORK + if (monitor_is_remote()) { +@@ -233,6 +233,8 @@ char *uimon_in(const char *prompt) + } + #endif } + if (p == (char *)-1) + p = NULL; if (pchCommandLine) { /* we have an "artificially" generated command line */ -diff -ur vice-1.20.orig/src/monitor/monitor.c vice-1.20/src/monitor/monitor.c ---- vice-1.20.orig/src/monitor/monitor.c 2005-04-21 01:45:23.000000000 +0200 -+++ vice-1.20/src/monitor/monitor.c 2007-03-01 17:05:00.000000000 +0100 -@@ -1473,7 +1473,7 @@ +diff -up vice-2.2/src/monitor/monitor.c.mon vice-2.2/src/monitor/monitor.c +--- vice-2.2/src/monitor/monitor.c.mon 2009-11-09 20:05:30.000000000 +0100 ++++ vice-2.2/src/monitor/monitor.c 2010-06-22 10:12:55.175883371 +0200 +@@ -2111,7 +2111,7 @@ static int monitor_process(char *cmd) { mon_stop_output = 0; if (cmd == NULL) { @@ -45,7 +45,7 @@ } else { if (!cmd[0]) { if (!asm_mode) { -@@ -1547,12 +1547,22 @@ +@@ -2187,12 +2187,22 @@ static void monitor_close(int check) void monitor_startup(void) { vice-tmpnam.patch: archdep.c | 50 +++++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) Index: vice-tmpnam.patch =================================================================== RCS file: /cvs/nonfree/rpms/vice/devel/vice-tmpnam.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vice-tmpnam.patch 1 Aug 2008 10:23:03 -0000 1.2 +++ vice-tmpnam.patch 22 Jun 2010 10:34:07 -0000 1.3 @@ -1,15 +1,15 @@ -diff -up vice-2.0/src/arch/unix/archdep.c.foobar vice-2.0/src/arch/unix/archdep.c ---- vice-2.0/src/arch/unix/archdep.c.foobar 2008-07-07 20:23:10.000000000 +0200 -+++ vice-2.0/src/arch/unix/archdep.c 2008-08-01 10:27:52.000000000 +0200 -@@ -416,37 +416,27 @@ char *archdep_quote_parameter(const char +diff -up vice-2.2/src/arch/unix/archdep.c.tmpnam vice-2.2/src/arch/unix/archdep.c +--- vice-2.2/src/arch/unix/archdep.c.tmpnam 2009-10-21 18:46:46.000000000 +0200 ++++ vice-2.2/src/arch/unix/archdep.c 2010-06-22 10:09:49.650289516 +0200 +@@ -411,38 +411,26 @@ char *archdep_quote_parameter(const char char *archdep_tmpnam(void) { -#ifdef GP2X -- static unsigned int tmp_string_counter=0; +- static unsigned int tmp_string_counter = 0; - char tmp_string[32]; - -- sprintf(tmp_string,"vice%d.tmp",tmp_string_counter++); +- sprintf(tmp_string, "vice%d.tmp", tmp_string_counter++); - return lib_stralloc(tmp_string); -#else -#ifdef HAVE_MKSTEMP @@ -18,10 +18,22 @@ - int fd; - char* tmp; - -- tmpName = (char *)lib_malloc(ioutil_maxpathlen()); -- if ((tmp = getenv("TMPDIR")) != NULL ) { +- tmpName = lib_malloc(ioutil_maxpathlen()); +- if ((tmp = getenv("TMPDIR")) != NULL) { - strncpy(tmpName, tmp, ioutil_maxpathlen()); - tmpName[ioutil_maxpathlen() - sizeof(mkstempTemplate)] = '\0'; +- } else { +- strcpy(tmpName, "/tmp" ); +- } +- strcat(tmpName, mkstempTemplate); +- if ((fd = mkstemp(tmpName)) < 0) { +- tmpName[0] = '\0'; +- } else { +- close(fd); +- } +- +- lib_free(tmpName); +- return lib_stralloc(tmpName); + char *tmp, *name; + + name = util_concat(archdep_home_path(), "/.vice", NULL); @@ -33,17 +45,7 @@ + name = util_concat(archdep_home_path(), "/.vice/tmp", NULL); + if (access(name, F_OK)) { + mkdir(name, 0700); - } -- else -- strcpy(tmpName, "/tmp" ); -- strcat(tmpName, mkstempTemplate ); -- if ((fd = mkstemp(tmpName)) < 0 ) -- tmpName[0] = '\0'; -- else -- close(fd); - -- lib_free(tmpName); -- return lib_stralloc(tmpName); ++ } + tmp = tempnam(name, "vice"); + lib_free(name); +#ifndef LIB_DEBUG Index: vice.spec =================================================================== RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vice.spec 1 Apr 2009 09:00:25 -0000 1.7 +++ vice.spec 22 Jun 2010 10:34:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: vice -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: Emulator for a variety of Commodore 8bit machines Group: Applications/Emulators License: GPL @@ -19,11 +19,12 @@ Patch2: vice-htmlview.patch Patch3: vice-tmpnam.patch Patch4: vice-1.20-monitor-crash.patch -Patch5: vice-2.1-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel -BuildRequires: giflib-devel libjpeg-devel libgnomeui-devel ffmpeg-devel -BuildRequires: ncurses-devel readline-devel SDL-devel alsa-lib-devel +BuildRequires: giflib-devel libjpeg-devel libpng-devel +BuildRequires: libgnomeui-devel gtkglext-devel +BuildRequires: ffmpeg-devel lame-devel +BuildRequires: readline-devel SDL-devel alsa-lib-devel BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils Requires: hicolor-icon-theme xdg-utils @@ -39,7 +40,6 @@ %patch2 -p1 -z .htmlview %patch3 -p1 -z .tmpnam %patch4 -p1 -z .mon -%patch5 -p1 for i in man/*.1 doc/*.info*; do iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp mv $i.tmp $i @@ -49,13 +49,30 @@ %build -%configure --enable-gnomeui --enable-fullscreen --with-sdl +%configure --enable-sdlui --without-esd make %{?_smp_mflags} +pushd src + for i in x*; do + mv $i ../$i.sdl + done +popd + +make distclean +%configure --enable-gnomeui --enable-fullscreen --without-esd +make %{?_smp_mflags} LD_FLAGS=-lX11 %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name} +for i in x*.sdl; do + install -p -m 755 $i $RPM_BUILD_ROOT%{_bindir} +done +pushd data + for i in */sdl_sym.vkm; do + cp -a --parents $i $RPM_BUILD_ROOT%{_datadir}/%{name} + done +popd %find_lang %{name} rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -118,6 +135,11 @@ %changelog +* Tue Jun 22 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-1 +- New upstream release 2.2 +- Also build the new SDL version, the SDL binaries are available with a + .sdl extension, for example x64.sdl + * Wed Apr 1 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.1-3 - Fix building with gcc 4.4