rpms/vice/devel cartio.h, NONE, 1.1 .cvsignore, 1.5, 1.6 sources,
1.5, 1.6 vice-tmpnam.patch, 1.3, 1.4 vice.spec, 1.8, 1.9
Hans de Goede
jwrdegoede at rpmfusion.org
Wed Jul 20 19:57:40 CEST 2011
- Previous message: rpms/z-push/F-15 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 z-push.spec,
1.1, 1.2 z-push-1.5.3-license.patch, 1.1, NONE
- Next message: rpms/vice/F-15 cartio.h, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5,
1.6 vice-tmpnam.patch, 1.3, 1.4 vice.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23438
Modified Files:
.cvsignore sources vice-tmpnam.patch vice.spec
Added Files:
cartio.h
Log Message:
* Sun Jul 17 2011 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.9-1
- New upstream release 2.3.9
--- NEW FILE cartio.h ---
/*
* cartio.h -- C64/C128/VIC20 I/O handling.
*
* Written by
* Marco van den Heuvel <blackystardust68 at yahoo.com>
*
* This file is part of VICE, the Versatile Commodore Emulator.
* See README for copyright notice.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA.
*
*/
#ifndef VICE_CARTIO_H
#define VICE_CARTIO_H
#include "types.h"
#define IO_DETACH_CART 0
#define IO_DETACH_RESOURCE 1
#define CPU_LINES_C64_256K 1
#define CPU_LINES_PLUS60K 2
#define CPU_LINES_PLUS256K 3
#define IO_COLLISION_METHOD_DETACH_ALL 0
#define IO_COLLISION_METHOD_DETACH_LAST 1
#define IO_COLLISION_METHOD_AND_WIRES 2
extern BYTE c64io_d000_read(WORD addr);
extern BYTE c64io_d000_peek(WORD addr);
extern void c64io_d000_store(WORD addr, BYTE value);
extern BYTE c64io_d100_read(WORD addr);
extern BYTE c64io_d100_peek(WORD addr);
extern void c64io_d100_store(WORD addr, BYTE value);
extern BYTE c64io_d200_read(WORD addr);
extern BYTE c64io_d200_peek(WORD addr);
extern void c64io_d200_store(WORD addr, BYTE value);
extern BYTE c64io_d300_read(WORD addr);
extern BYTE c64io_d300_peek(WORD addr);
extern void c64io_d300_store(WORD addr, BYTE value);
extern BYTE c64io_d400_read(WORD addr);
extern BYTE c64io_d400_peek(WORD addr);
extern void c64io_d400_store(WORD addr, BYTE value);
extern BYTE c64io_d500_read(WORD addr);
extern BYTE c64io_d500_peek(WORD addr);
extern void c64io_d500_store(WORD addr, BYTE value);
extern BYTE c64io_d600_read(WORD addr);
extern BYTE c64io_d600_peek(WORD addr);
extern void c64io_d600_store(WORD addr, BYTE value);
extern BYTE c64io_d700_read(WORD addr);
extern BYTE c64io_d700_peek(WORD addr);
extern void c64io_d700_store(WORD addr, BYTE value);
extern BYTE c64io_de00_read(WORD addr);
extern BYTE c64io_de00_peek(WORD addr);
extern void c64io_de00_store(WORD addr, BYTE value);
extern BYTE c64io_df00_read(WORD addr);
extern BYTE c64io_df00_peek(WORD addr);
extern void c64io_df00_store(WORD addr, BYTE value);
extern BYTE vic20io2_read(WORD addr);
extern BYTE vic20io2_peek(WORD addr);
extern void vic20io2_store(WORD addr, BYTE value);
extern BYTE vic20io3_read(WORD addr);
extern BYTE vic20io3_peek(WORD addr);
extern void vic20io3_store(WORD addr, BYTE value);
struct mem_ioreg_list_s;
extern void io_source_ioreg_add_list(struct mem_ioreg_list_s **mem_ioreg_list);
extern int get_cpu_lines_lock(void);
extern void set_cpu_lines_lock(int device, char *name);
extern void remove_cpu_lines_lock(void);
extern char *get_cpu_lines_lock_name(void);
typedef struct io_source_s {
char *name; /* literal name of this i/o device */
int detach_id;
char *resource_name;
WORD start_address;
WORD end_address;
WORD address_mask;
int io_source_valid; /* after reading, is 1 if read was valid */
void (*store)(WORD address, BYTE data);
BYTE (*read)(WORD address);
BYTE (*peek)(WORD address); /* read without side effects (used by monitor) */
int (*dump)(void); /* print detailed state for this i/o device (used by monitor) */
int cart_id; /* id of associated cartridge */
int io_source_prio; /* 0: normal, 1: higher priority (no collisions), -1: lower priority (no collisions) */
unsigned int order; /* a tag to indicate the order of insertion */
} io_source_t;
typedef struct io_source_list_s {
struct io_source_list_s *previous;
io_source_t *device;
struct io_source_list_s *next;
} io_source_list_t;
typedef struct io_source_detach_s {
int det_id;
char *det_devname;
char *det_name;
int det_cartid;
unsigned int order;
} io_source_detach_t;
extern io_source_list_t *io_source_register(io_source_t *device);
extern void io_source_unregister(io_source_list_t *device);
extern void cartio_shutdown(void);
extern void c64io_vicii_init(void);
extern void c64io_vicii_deinit(void);
extern int cartio_resources_init(void);
extern int cartio_cmdline_options_init(void);
extern void cartio_set_highest_order(unsigned int nr);
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 22 Jun 2010 10:34:07 -0000 1.5
+++ .cvsignore 20 Jul 2011 17:57:37 -0000 1.6
@@ -1,4 +1,4 @@
vice-largeicons.tar.bz2
vice-miniicons.tar.bz2
vice-normalicons.tar.bz2
-vice-2.2.tar.gz
+vice-2.3.9.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 22 Jun 2010 10:34:07 -0000 1.5
+++ sources 20 Jul 2011 17:57:37 -0000 1.6
@@ -1,4 +1,4 @@
a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2
c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2
1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2
-6737f540806205384e9129026898b0a1 vice-2.2.tar.gz
+a8f9cafb3a054c9a0d7aeb7f8af0c6c6 vice-2.3.9.tar.gz
vice-tmpnam.patch:
archdep.c | 52 +++++++++++++++++++---------------------------------
1 file changed, 19 insertions(+), 33 deletions(-)
Index: vice-tmpnam.patch
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice-tmpnam.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vice-tmpnam.patch 22 Jun 2010 10:34:07 -0000 1.3
+++ vice-tmpnam.patch 20 Jul 2011 17:57:37 -0000 1.4
@@ -1,11 +1,11 @@
-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
+diff -up vice-2.3.9/src/arch/unix/archdep.c.tmpnam vice-2.3.9/src/arch/unix/archdep.c
+--- vice-2.3.9/src/arch/unix/archdep.c.tmpnam 2011-06-17 18:19:22.000000000 +0200
++++ vice-2.3.9/src/arch/unix/archdep.c 2011-07-17 14:00:38.256652134 +0200
+@@ -454,40 +454,26 @@ char *archdep_quote_parameter(const char
char *archdep_tmpnam(void)
{
--#ifdef GP2X
+-#if defined(GP2X) || defined(WIZ)
- static unsigned int tmp_string_counter = 0;
- char tmp_string[32];
-
@@ -13,27 +13,29 @@
- return lib_stralloc(tmp_string);
-#else
-#ifdef HAVE_MKSTEMP
-- char *tmpName;
-- const char mkstempTemplate[] = "/vice.XXXXXX";
+- char *tmp_name;
+- const char mkstemp_template[] = "/vice.XXXXXX";
- int fd;
-- char* tmp;
+- char *tmp;
+- char *final_name;
-
-- tmpName = lib_malloc(ioutil_maxpathlen());
+- tmp_name = lib_malloc(ioutil_maxpathlen());
- if ((tmp = getenv("TMPDIR")) != NULL) {
-- strncpy(tmpName, tmp, ioutil_maxpathlen());
-- tmpName[ioutil_maxpathlen() - sizeof(mkstempTemplate)] = '\0';
+- strncpy(tmp_name, tmp, ioutil_maxpathlen());
+- tmp_name[ioutil_maxpathlen() - sizeof(mkstemp_template)] = '\0';
- } else {
-- strcpy(tmpName, "/tmp" );
+- strcpy(tmp_name, "/tmp");
- }
-- strcat(tmpName, mkstempTemplate);
-- if ((fd = mkstemp(tmpName)) < 0) {
-- tmpName[0] = '\0';
+- strcat(tmp_name, mkstemp_template);
+- if ((fd = mkstemp(tmp_name)) < 0) {
+- tmp_name[0] = '\0';
- } else {
- close(fd);
- }
-
-- lib_free(tmpName);
-- return lib_stralloc(tmpName);
+- final_name = lib_stralloc(tmp_name);
+- lib_free(tmp_name);
+- return final_name;
+ char *tmp, *name;
+
+ name = util_concat(archdep_home_path(), "/.vice", NULL);
Index: vice.spec
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vice.spec 22 Jun 2010 10:34:07 -0000 1.8
+++ vice.spec 20 Jul 2011 17:57:38 -0000 1.9
@@ -1,11 +1,13 @@
Name: vice
-Version: 2.2
+Version: 2.3.9
Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPL
-URL: http://www.viceteam.org/
-Source0: http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-%{version}.tar.gz
+URL: http://vice-emu.sourceforge.net/
+Source0: http://downloads.sourceforge.net/vice-emu/%{name}-%{version}.tar.gz
+# File from upstream missing from tarbal
+Source10: cartio.h
Source1: x128.desktop
Source2: x64.desktop
Source3: xcbm-ii.desktop
@@ -19,12 +21,13 @@
Patch2: vice-htmlview.patch
Patch3: vice-tmpnam.patch
Patch4: vice-1.20-monitor-crash.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
+BuildRequires: libXrandr-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: readline-devel SDL-devel alsa-lib-devel pulseaudio-libs-devel
+BuildRequires: libieee1284-devel libpcap-devel
BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils
Requires: hicolor-icon-theme xdg-utils
@@ -46,10 +49,13 @@
done
# not really needed, make sure these don't get used:
rm -f src/lib/*/*.c src/lib/*/*.h
+# File from upstream missing from tarbal
+cp -a %{SOURCE10} src
%build
-%configure --enable-sdlui --without-esd
+COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch"
+%configure --enable-sdlui $COMMON_FLAGS
make %{?_smp_mflags}
pushd src
for i in x*; do
@@ -58,12 +64,11 @@
popd
make distclean
-%configure --enable-gnomeui --enable-fullscreen --without-esd
+%configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS
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}
@@ -75,7 +80,9 @@
popd
%find_lang %{name}
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-
+# for some reason make install drops a .txt and .pdf in the infodir ... ?
+rm $RPM_BUILD_ROOT%{_infodir}/%{name}.txt*
+rm $RPM_BUILD_ROOT%{_infodir}/%{name}.pdf*
# vice installs its docs under /usr/share/vice/doc, we install them ourselves
# with %doc, so nuke vice's install and create a symlink for the help function
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
@@ -103,14 +110,9 @@
for i in */apps/*icon.png; do mv $i `echo $i|sed s/icon//`; done
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%preun
if [ "$1" = 0 ]; then
@@ -118,13 +120,18 @@
fi
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog FEEDBACK README doc/mon.txt doc/iec-bus.txt
+%doc AUTHORS ChangeLog FEEDBACK README doc/iec-bus.txt
%doc doc/html/*.html doc/html/images/* doc/html/plain/*
%{_bindir}/*
%{_datadir}/%{name}
@@ -135,6 +142,9 @@
%changelog
+* Sun Jul 17 2011 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.9-1
+- New upstream release 2.3.9
+
* Tue Jun 22 2010 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2-1
- New upstream release 2.2
- Also build the new SDL version, the SDL binaries are available with a
- Previous message: rpms/z-push/F-15 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 z-push.spec,
1.1, 1.2 z-push-1.5.3-license.patch, 1.1, NONE
- Next message: rpms/vice/F-15 cartio.h, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5,
1.6 vice-tmpnam.patch, 1.3, 1.4 vice.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list