summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2007-11-17 18:05:10 +0000
committerPeter Volkov <pva@gentoo.org>2007-11-17 18:05:10 +0000
commit7074aa6c1c8c328a24e16e9a23dddc78cb5a2db7 (patch)
treeaef813f80faace4d15633efbe9cb693f84945561 /app-emulation
parentalpha/ia64/sparc stable wrt #199322 (diff)
downloadgentoo-2-7074aa6c1c8c328a24e16e9a23dddc78cb5a2db7.tar.gz
gentoo-2-7074aa6c1c8c328a24e16e9a23dddc78cb5a2db7.tar.bz2
gentoo-2-7074aa6c1c8c328a24e16e9a23dddc78cb5a2db7.zip
Clean unused patch.
(Portage version: 2.1.3.19)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/uae/ChangeLog6
-rw-r--r--app-emulation/uae/files/uae-0.8.25-fix_static_declatarions.diff89
2 files changed, 5 insertions, 90 deletions
diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 4409a1e89787..3fcd5ca54351 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/uae
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.31 2007/08/13 14:00:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.32 2007/11/17 18:05:09 pva Exp $
+
+ 17 Nov 2007; <pva@gentoo.org>
+ -files/uae-0.8.25-fix_static_declatarions.diff:
+ Clean unused patch.
*uae-0.8.26-r1 (13 Aug 2007)
diff --git a/app-emulation/uae/files/uae-0.8.25-fix_static_declatarions.diff b/app-emulation/uae/files/uae-0.8.25-fix_static_declatarions.diff
deleted file mode 100644
index c22a743195b8..000000000000
--- a/app-emulation/uae/files/uae-0.8.25-fix_static_declatarions.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Fix some compilations errors due to external use of static variables.
-
-Antonio Ospite <ospite@studenti.unina.it>
-
-diff -pruN uae-0.8.25.orig/src/autoconf.c uae-0.8.25/src/autoconf.c
---- uae-0.8.25.orig/src/autoconf.c 2006-06-07 15:31:17.000000000 +0200
-+++ uae-0.8.25/src/autoconf.c 2006-06-07 15:38:03.000000000 +0200
-@@ -218,7 +218,7 @@ uaecptr EXPANSION_cddevice;
-
- /* ROM tag area memory access */
-
--static uae_u8 *rtarea;
-+uae_u8 *rtarea;
-
- static uae_u32 rtarea_lget (uaecptr) REGPARAM;
- static uae_u32 rtarea_wget (uaecptr) REGPARAM;
-diff -pruN uae-0.8.25.orig/src/cia.c uae-0.8.25/src/cia.c
---- uae-0.8.25.orig/src/cia.c 2006-06-07 15:31:17.000000000 +0200
-+++ uae-0.8.25/src/cia.c 2006-06-07 15:38:03.000000000 +0200
-@@ -46,18 +46,18 @@ static unsigned int clock_control_d = RT
- static unsigned int clock_control_e = 0;
- static unsigned int clock_control_f = RTC_F_24_12;
-
--static unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
--static unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
-+unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
-+unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
-
- /* Values of the CIA timers. */
--static unsigned long ciaata, ciaatb, ciabta, ciabtb;
-+unsigned long ciaata, ciaatb, ciabta, ciabtb;
- /* Computed by compute_passed_time. */
- static unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;
-
--static unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
--static int ciaatlatch, ciabtlatch;
-+unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
-+int ciaatlatch, ciabtlatch;
-
--static unsigned int ciabpra;
-+unsigned int ciabpra;
-
- unsigned int gui_ledstate;
-
-diff -pruN uae-0.8.25.orig/src/custom.c uae-0.8.25/src/custom.c
---- uae-0.8.25.orig/src/custom.c 2006-06-07 15:31:17.000000000 +0200
-+++ uae-0.8.25/src/custom.c 2006-06-07 15:38:03.000000000 +0200
-@@ -111,7 +111,8 @@ static unsigned int sprctl[MAX_SPRITES],
- static uae_u16 sprdata[MAX_SPRITES][4], sprdatb[MAX_SPRITES][4];
- static int sprite_last_drawn_at[MAX_SPRITES];
- static int last_sprite_point, nr_armed;
--static int sprite_width, sprres, sprite_buffer_res;
-+static int sprres, sprite_buffer_res;
-+int sprite_width;
-
- static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, bpl8dat;
- static uae_s16 bpl1mod, bpl2mod;
-@@ -234,7 +235,7 @@ struct decision line_decisions[2 * (MAXV
- struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1];
- struct color_entry color_tables[2][(MAXVPOS + 1) * 2];
-
--static int next_sprite_entry = 0;
-+int next_sprite_entry = 0;
- static int prev_next_sprite_entry;
- static int next_sprite_forced = 1;
-
-diff -pruN uae-0.8.25.orig/src/inputdevice.c uae-0.8.25/src/inputdevice.c
---- uae-0.8.25.orig/src/inputdevice.c 2006-06-07 15:31:17.000000000 +0200
-+++ uae-0.8.25/src/inputdevice.c 2006-06-07 15:40:17.000000000 +0200
-@@ -511,8 +511,8 @@ void read_inputdevice_config (struct uae
-
- /* Mousehack stuff */
-
--static int ievent_alive = 0;
--static int lastmx, lastmy;
-+int ievent_alive = 0;
-+int lastmx, lastmy;
-
- int mousehack_alive (void)
- {
-@@ -1739,7 +1739,7 @@ int inputdevice_translatekeycode (int ke
- return 0;
- }
-
--static struct inputdevice_functions idev[3];
-+struct inputdevice_functions idev[3];
-
- void inputdevice_init (void)
- {