r7898 - in packages/trunk/yabause/debian: . patches
Evgeni Golov
sargentd-guest at alioth.debian.org
Fri Aug 8 20:08:45 UTC 2008
Author: sargentd-guest
Date: 2008-08-08 20:08:45 +0000 (Fri, 08 Aug 2008)
New Revision: 7898
Added:
packages/trunk/yabause/debian/README.source
packages/trunk/yabause/debian/patches/
packages/trunk/yabause/debian/patches/series
packages/trunk/yabause/debian/patches/updates_from_cvs_since_0.9.6.patch
Modified:
packages/trunk/yabause/debian/changelog
packages/trunk/yabause/debian/control
packages/trunk/yabause/debian/rules
Log:
import some changes from upstream CVS
Added: packages/trunk/yabause/debian/README.source
===================================================================
--- packages/trunk/yabause/debian/README.source (rev 0)
+++ packages/trunk/yabause/debian/README.source 2008-08-08 20:08:45 UTC (rev 7898)
@@ -0,0 +1,2 @@
+This package uses quilt for patch management, for more information see
+the file /usr/share/doc/quilt/README.source in the quilt package.
Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog 2008-08-06 18:31:09 UTC (rev 7897)
+++ packages/trunk/yabause/debian/changelog 2008-08-08 20:08:45 UTC (rev 7898)
@@ -1,5 +1,13 @@
-yabause (0.9.6-1) UNRELEASED; urgency=low
+yabause (0.9.6-2) unstable; urgency=low
+ * Import some changes from upstream CVS to improve stability and the GUI.
+ + Use quilt for handling this patch.
+ + Add README.Debian about quilt-usage.
+
+ -- Evgeni Golov <sargentd at die-welt.net> Fri, 08 Aug 2008 21:45:46 +0200
+
+yabause (0.9.6-1) unstable; urgency=low
+
* Initial release (Closes: #483124)
-- Evgeni Golov <sargentd at die-welt.net> Wed, 09 Jul 2008 09:37:54 +0200
Modified: packages/trunk/yabause/debian/control
===================================================================
--- packages/trunk/yabause/debian/control 2008-08-06 18:31:09 UTC (rev 7897)
+++ packages/trunk/yabause/debian/control 2008-08-08 20:08:45 UTC (rev 7898)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Evgeni Golov <sargentd at die-welt.net>
-Build-Depends: debhelper (>= 6), autotools-dev, pkg-config
+Build-Depends: debhelper (>= 6), autotools-dev, pkg-config, quilt (>= 0.40)
freeglut3-dev, libgl1-mesa-dev, libglu1-mesa-dev, libsdl1.2-dev,
libglib2.0-dev, libgtk2.0-dev, libgtkglext1-dev,
libqt4-dev, libqt4-opengl-dev
Added: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series (rev 0)
+++ packages/trunk/yabause/debian/patches/series 2008-08-08 20:08:45 UTC (rev 7898)
@@ -0,0 +1 @@
+updates_from_cvs_since_0.9.6.patch
Added: packages/trunk/yabause/debian/patches/updates_from_cvs_since_0.9.6.patch
===================================================================
--- packages/trunk/yabause/debian/patches/updates_from_cvs_since_0.9.6.patch (rev 0)
+++ packages/trunk/yabause/debian/patches/updates_from_cvs_since_0.9.6.patch 2008-08-08 20:08:45 UTC (rev 7898)
@@ -0,0 +1,879 @@
+Index: src/core.h
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/core.h,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- a/src/core.h 17 Mar 2008 20:53:07 -0000 1.13
++++ b/src/core.h 12 Jul 2008 22:21:34 -0000 1.14
+@@ -147,4 +147,12 @@
+ #endif
+ #endif
+
++//////////////////////////////////////////////////////////////////////////////
++
++#ifdef __GNUC__
++#define UNUSED __attribute ((unused))
++#else
++#define UNUSED
++#endif
++
+ #endif
+Index: src/memory.h
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/memory.h,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
+--- a/src/memory.h 30 Jan 2008 22:45:55 -0000 1.14
++++ b/src/memory.h 12 Jul 2008 22:21:34 -0000 1.15
+@@ -321,13 +321,13 @@
+ Dummy * DummyInit(u32);
+ void DummyDeInit(Dummy *);
+
+-static INLINE u8 DummyReadByte(Dummy * d, u32 a) { return 0; }
+-static INLINE u16 DummyReadWord(Dummy * d, u32 a) { return 0; }
+-static INLINE u32 DummyReadLong(Dummy * d, u32 a) { return 0; }
+-
+-static INLINE void DummyWriteByte(Dummy * d, u32 a, u8 v) {}
+-static INLINE void DummyWriteWord(Dummy * d, u32 a, u16 v) {}
+-static INLINE void DummyWriteLong(Dummy * d, u32 a, u32 v) {}
++static INLINE u8 DummyReadByte(Dummy UNUSED * d, u32 UNUSED a) { return 0; }
++static INLINE u16 DummyReadWord(Dummy UNUSED * d, u32 UNUSED a) { return 0; }
++static INLINE u32 DummyReadLong(Dummy UNUSED * d, u32 UNUSED a) { return 0; }
++
++static INLINE void DummyWriteByte(Dummy UNUSED * d, u32 UNUSED a, u8 UNUSED v) {}
++static INLINE void DummyWriteWord(Dummy UNUSED * d, u32 UNUSED a, u16 UNUSED v) {}
++static INLINE void DummyWriteLong(Dummy UNUSED * d, u32 UNUSED a, u32 UNUSED v) {}
+
+ void MappedMemoryInit();
+ u8 FASTCALL MappedMemoryReadByte(u32 addr);
+Index: src/smpc.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/smpc.c,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -r1.22 -r1.23
+--- a/src/smpc.c 9 May 2008 11:04:03 -0000 1.22
++++ b/src/smpc.c 7 Jul 2008 05:51:46 -0000 1.23
+@@ -686,7 +686,7 @@
+ {
+ int offset;
+
+- offset = StateWriteHeader(fp, "SMPC", 1);
++ offset = StateWriteHeader(fp, "SMPC", 2);
+
+ // Write registers
+ fwrite((void *)SmpcRegs->IREG, sizeof(u8), 7, fp);
+@@ -723,7 +723,19 @@
+ fread((void *)&SmpcRegs->EXLE, sizeof(u8), 1, fp);
+
+ // Read internal variables
+- fread((void *)SmpcInternalVars, sizeof(SmpcInternal), 1, fp);
++ if (version == 1)
++ {
++ // This handles the problem caused by the version not being incremented
++ // when SmpcInternal was changed
++ if ((size - 48) == sizeof(SmpcInternal))
++ fread((void *)SmpcInternalVars, sizeof(SmpcInternal), 1, fp);
++ else if ((size - 48) == 24)
++ fread((void *)SmpcInternalVars, 24, 1, fp);
++ else
++ fseek(fp, size - 48, SEEK_CUR);
++ }
++ else
++ fread((void *)SmpcInternalVars, sizeof(SmpcInternal), 1, fp);
+
+ // Read ID's of currently emulated peripherals(fix me)
+
+Index: src/vdp1.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vdp1.c,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- a/src/vdp1.c 7 May 2008 04:19:26 -0000 1.30
++++ b/src/vdp1.c 8 Jul 2008 21:48:30 -0000 1.31
+@@ -1286,11 +1286,6 @@
+ void FASTCALL VIDDummyVdp2SetPriorityNBG2(int priority);
+ void FASTCALL VIDDummyVdp2SetPriorityNBG3(int priority);
+ void FASTCALL VIDDummyVdp2SetPriorityRBG0(int priority);
+-void VIDDummyVdp2ToggleDisplayNBG0(void);
+-void VIDDummyVdp2ToggleDisplayNBG1(void);
+-void VIDDummyVdp2ToggleDisplayNBG2(void);
+-void VIDDummyVdp2ToggleDisplayNBG3(void);
+-void VIDDummyVdp2ToggleDisplayRBG0(void);
+
+
+ VideoInterface_struct VIDDummy = {
+@@ -1321,12 +1316,7 @@
+ VIDDummyVdp2SetPriorityNBG1,
+ VIDDummyVdp2SetPriorityNBG2,
+ VIDDummyVdp2SetPriorityNBG3,
+-VIDDummyVdp2SetPriorityRBG0,
+-VIDDummyVdp2ToggleDisplayNBG0,
+-VIDDummyVdp2ToggleDisplayNBG1,
+-VIDDummyVdp2ToggleDisplayNBG2,
+-VIDDummyVdp2ToggleDisplayNBG3,
+-VIDDummyVdp2ToggleDisplayRBG0
++VIDDummyVdp2SetPriorityRBG0
+ };
+
+ //////////////////////////////////////////////////////////////////////////////
+@@ -1490,34 +1480,3 @@
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+-
+-void VIDDummyVdp2ToggleDisplayNBG0(void)
+-{
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDDummyVdp2ToggleDisplayNBG1(void)
+-{
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDDummyVdp2ToggleDisplayNBG2(void)
+-{
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDDummyVdp2ToggleDisplayNBG3(void)
+-{
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDDummyVdp2ToggleDisplayRBG0(void)
+-{
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+Index: src/vdp1.h
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vdp1.h,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- a/src/vdp1.h 19 Oct 2007 20:02:17 -0000 1.11
++++ b/src/vdp1.h 8 Jul 2008 21:48:30 -0000 1.12
+@@ -58,11 +58,6 @@
+ void FASTCALL (*Vdp2SetPriorityNBG2)(int);
+ void FASTCALL (*Vdp2SetPriorityNBG3)(int);
+ void FASTCALL (*Vdp2SetPriorityRBG0)(int);
+- void (*Vdp2ToggleDisplayNBG0)(void);
+- void (*Vdp2ToggleDisplayNBG1)(void);
+- void (*Vdp2ToggleDisplayNBG2)(void);
+- void (*Vdp2ToggleDisplayNBG3)(void);
+- void (*Vdp2ToggleDisplayRBG0)(void);
+ void (*OnScreenDebugMessage)(char *string, ...);
+ } VideoInterface_struct;
+
+Index: src/vdp2.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vdp2.c,v
+retrieving revision 1.37
+retrieving revision 1.38
+diff -u -r1.37 -r1.38
+--- a/src/vdp2.c 25 May 2008 16:05:18 -0000 1.37
++++ b/src/vdp2.c 8 Jul 2008 21:48:30 -0000 1.38
+@@ -30,6 +30,7 @@
+ u8 * Vdp2ColorRam;
+ Vdp2 * Vdp2Regs;
+ Vdp2Internal_struct Vdp2Internal;
++Vdp2External_struct Vdp2External;
+
+ static int autoframeskipenab=0;
+ static int framestoskip=0;
+@@ -246,6 +247,8 @@
+
+ yabsys.VBlankLineCount = 224;
+ Vdp2Internal.ColorMode = 0;
++
++ Vdp2External.disptoggle = 0xFF;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+@@ -1278,35 +1281,35 @@
+
+ void ToggleNBG0(void)
+ {
+- VIDCore->Vdp2ToggleDisplayNBG0();
++ Vdp2External.disptoggle ^= 0x1;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+
+ void ToggleNBG1(void)
+ {
+- VIDCore->Vdp2ToggleDisplayNBG1();
++ Vdp2External.disptoggle ^= 0x2;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+
+ void ToggleNBG2(void)
+ {
+- VIDCore->Vdp2ToggleDisplayNBG2();
++ Vdp2External.disptoggle ^= 0x4;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+
+ void ToggleNBG3(void)
+ {
+- VIDCore->Vdp2ToggleDisplayNBG3();
++ Vdp2External.disptoggle ^= 0x8;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+
+ void ToggleRBG0(void)
+ {
+- VIDCore->Vdp2ToggleDisplayRBG0();
++ Vdp2External.disptoggle ^= 0x10;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+Index: src/vdp2.h
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vdp2.h,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- a/src/vdp2.h 13 May 2008 03:53:03 -0000 1.11
++++ b/src/vdp2.h 8 Jul 2008 21:48:30 -0000 1.12
+@@ -360,6 +360,13 @@
+ extern Vdp2Internal_struct Vdp2Internal;
+ extern u64 lastticks;
+
++// struct for Vdp2 part that shouldn't be saved
++typedef struct {
++ int disptoggle;
++} Vdp2External_struct;
++
++extern Vdp2External_struct Vdp2External;
++
+ int Vdp2Init(void);
+ void Vdp2DeInit(void);
+ void Vdp2Reset(void);
+Index: src/vdp2debug.h
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vdp2debug.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- a/src/vdp2debug.h 13 May 2008 03:53:03 -0000 1.1
++++ b/src/vdp2debug.h 29 Jul 2008 13:50:47 -0000 1.2
+@@ -20,6 +20,8 @@
+ #ifndef VDP2DEBUG_H
+ #define VDP2DEBUG_H
+
++#define VDP2_DEBUG_STRING_SIZE 2048
++
+ void Vdp2DebugStatsRBG0(char *outstring, int *isenabled);
+ void Vdp2DebugStatsNBG0(char *outstring, int *isenabled);
+ void Vdp2DebugStatsNBG1(char *outstring, int *isenabled);
+Index: src/vidogl.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vidogl.c,v
+retrieving revision 1.26
+retrieving revision 1.27
+diff -u -r1.26 -r1.27
+--- a/src/vidogl.c 29 Dec 2007 19:32:59 -0000 1.26
++++ b/src/vidogl.c 8 Jul 2008 21:48:30 -0000 1.27
+@@ -81,11 +81,6 @@
+ void FASTCALL VIDOGLVdp2SetPriorityNBG2(int priority);
+ void FASTCALL VIDOGLVdp2SetPriorityNBG3(int priority);
+ void FASTCALL VIDOGLVdp2SetPriorityRBG0(int priority);
+-void VIDOGLVdp2ToggleDisplayNBG0(void);
+-void VIDOGLVdp2ToggleDisplayNBG1(void);
+-void VIDOGLVdp2ToggleDisplayNBG2(void);
+-void VIDOGLVdp2ToggleDisplayNBG3(void);
+-void VIDOGLVdp2ToggleDisplayRBG0(void);
+
+ VideoInterface_struct VIDOGL = {
+ VIDCORE_OGL,
+@@ -116,11 +111,6 @@
+ VIDOGLVdp2SetPriorityNBG2,
+ VIDOGLVdp2SetPriorityNBG3,
+ VIDOGLVdp2SetPriorityRBG0,
+-VIDOGLVdp2ToggleDisplayNBG0,
+-VIDOGLVdp2ToggleDisplayNBG1,
+-VIDOGLVdp2ToggleDisplayNBG2,
+-VIDOGLVdp2ToggleDisplayNBG3,
+-VIDOGLVdp2ToggleDisplayRBG0,
+ YglOnScreenDebugMessage
+ };
+
+@@ -132,7 +122,6 @@
+
+ static int vdp2width;
+ static int vdp2height;
+-static int vdp2disptoggle=0xFF;
+ static int nbg0priority=0;
+ static int nbg1priority=0;
+ static int nbg2priority=0;
+@@ -1975,7 +1964,7 @@
+ ReadVdp2ColorOffset(&info, 0x1);
+ info.priority = nbg0priority;
+
+- if (!(info.enable & vdp2disptoggle) || (info.priority == 0))
++ if (!(info.enable & Vdp2External.disptoggle) || (info.priority == 0))
+ return;
+
+ if (info.enable == 1)
+@@ -2120,7 +2109,7 @@
+ info.priority = nbg1priority;
+ info.PlaneAddr = (void FASTCALL (*)(void *, int))&Vdp2NBG1PlaneAddr;
+
+- if (!(info.enable & vdp2disptoggle) || (info.priority == 0))
++ if (!(info.enable & Vdp2External.disptoggle) || (info.priority == 0))
+ return;
+
+ if (info.isbitmap)
+@@ -2203,7 +2192,7 @@
+ info.priority = nbg2priority;
+ info.PlaneAddr = (void FASTCALL (*)(void *, int))&Vdp2NBG2PlaneAddr;
+
+- if (!(info.enable & vdp2disptoggle) || (info.priority == 0))
++ if (!(info.enable & Vdp2External.disptoggle) || (info.priority == 0))
+ return;
+
+ Vdp2DrawMap(&info, &texture);
+@@ -2241,7 +2230,7 @@
+ info.priority = nbg3priority;
+ info.PlaneAddr = (void FASTCALL (*)(void *, int))&Vdp2NBG3PlaneAddr;
+
+- if (!(info.enable & vdp2disptoggle) || (info.priority == 0))
++ if (!(info.enable & Vdp2External.disptoggle) || (info.priority == 0))
+ return;
+
+ Vdp2DrawMap(&info, &texture);
+@@ -2257,7 +2246,7 @@
+
+ info.enable = Vdp2Regs->BGON & 0x10;
+ info.priority = rbg0priority;
+- if (!(info.enable & vdp2disptoggle) || (info.priority == 0))
++ if (!(info.enable & Vdp2External.disptoggle) || (info.priority == 0))
+ return;
+ info.transparencyenable = !(Vdp2Regs->BGON & 0x1000);
+ info.specialprimode = (Vdp2Regs->SFPRMD >> 8) & 0x3;
+@@ -2460,39 +2449,4 @@
+
+ //////////////////////////////////////////////////////////////////////////////
+
+-void VIDOGLVdp2ToggleDisplayNBG0(void)
+-{
+- vdp2disptoggle ^= 0x21;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDOGLVdp2ToggleDisplayNBG1(void)
+-{
+- vdp2disptoggle ^= 0x2;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDOGLVdp2ToggleDisplayNBG2(void)
+-{
+- vdp2disptoggle ^= 0x4;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDOGLVdp2ToggleDisplayNBG3(void)
+-{
+- vdp2disptoggle ^= 0x8;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDOGLVdp2ToggleDisplayRBG0(void)
+-{
+- vdp2disptoggle ^= 0x10;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+ #endif
+Index: src/vidsoft.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/vidsoft.c,v
+retrieving revision 1.62
+retrieving revision 1.66
+diff -u -r1.62 -r1.66
+--- a/src/vidsoft.c 28 Jun 2008 18:30:23 -0000 1.62
++++ b/src/vidsoft.c 19 Jul 2008 13:42:17 -0000 1.66
+@@ -88,11 +88,6 @@
+ void FASTCALL VIDSoftVdp2SetPriorityNBG2(int priority);
+ void FASTCALL VIDSoftVdp2SetPriorityNBG3(int priority);
+ void FASTCALL VIDSoftVdp2SetPriorityRBG0(int priority);
+-void VIDSoftVdp2ToggleDisplayNBG0(void);
+-void VIDSoftVdp2ToggleDisplayNBG1(void);
+-void VIDSoftVdp2ToggleDisplayNBG2(void);
+-void VIDSoftVdp2ToggleDisplayNBG3(void);
+-void VIDSoftVdp2ToggleDisplayRBG0(void);
+ void VIDSoftOnScreenDebugMessage(char *string, ...);
+ void VIDSoftVdp1SwapFrameBuffer(void);
+ void VIDSoftVdp1EraseFrameBuffer(void);
+@@ -126,11 +121,6 @@
+ VIDSoftVdp2SetPriorityNBG2,
+ VIDSoftVdp2SetPriorityNBG3,
+ VIDSoftVdp2SetPriorityRBG0,
+-VIDSoftVdp2ToggleDisplayNBG0,
+-VIDSoftVdp2ToggleDisplayNBG1,
+-VIDSoftVdp2ToggleDisplayNBG2,
+-VIDSoftVdp2ToggleDisplayNBG3,
+-VIDSoftVdp2ToggleDisplayRBG0,
+ VIDSoftOnScreenDebugMessage,
+ };
+
+@@ -151,7 +141,6 @@
+ static int vdp1spritetype;
+ int vdp2width;
+ int vdp2height;
+-static int vdp2disptoggle=0xFF;
+ static int nbg0priority=0;
+ static int nbg1priority=0;
+ static int nbg2priority=0;
+@@ -311,6 +300,9 @@
+ info->charaddr &= 0x3FFF;
+
+ info->charaddr *= 0x20; // selon Runik
++ if (info->specialprimode == 1) {
++ info->priority = (info->priority & 0xE) | (info->specialfunction & 1);
++ }
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
+@@ -714,14 +706,6 @@
+ {
+ u32 color;
+
+- // If priority of screen is less than current top pixel and per
+- // pixel priority isn't used, skip it
+- if (Vdp2GetPixelPriority(textdata[0]) > info->priority)
+- {
+- textdata++;
+- continue;
+- }
+-
+ // See if screen position is clipped, if it isn't, continue
+ // Window 0
+ if (!TestWindow(info->wctl, 0x2, 0x1, &clip[0], i, j))
+@@ -748,6 +732,14 @@
+ Vdp2MapCalcXY(info, &x, &y, &sinfo);
+ }
+
++ // If priority of screen is less than current top pixel and per
++ // pixel priority isn't used, skip it
++ if (Vdp2GetPixelPriority(textdata[0]) > info->priority)
++ {
++ textdata++;
++ continue;
++ }
++
+ if (!Vdp2FetchPixel(info, x, y, &color))
+ {
+ textdata++;
+@@ -823,14 +815,6 @@
+ for (i = 0; i < vdp2width; i++)
+ {
+ u32 color;
+-
+- // If priority of screen is less than current top pixel and per
+- // pixel priority isn't used, skip it
+- if (Vdp2GetPixelPriority(textdata[0]) > info->priority)
+- {
+- textdata++;
+- continue;
+- }
+
+ x = GenerateRotatedXPosFP(p, i, xmul, ymul, C) & sinfo.xmask;
+ y = GenerateRotatedYPosFP(p, i, xmul, ymul, F) & sinfo.ymask;
+@@ -842,6 +826,14 @@
+ // Tile
+ Vdp2MapCalcXY(info, &x, &y, &sinfo);
+ }
++
++ // If priority of screen is less than current top pixel and per
++ // pixel priority isn't used, skip it
++ if (Vdp2GetPixelPriority(textdata[0]) > info->priority)
++ {
++ textdata++;
++ continue;
++ }
+
+ // Fetch pixel
+ if (!Vdp2FetchPixel(info, x, y, &color))
+@@ -888,14 +880,6 @@
+ {
+ u32 color;
+
+- // If priority of screen is less than current top pixel and per
+- // pixel priority isn't used, skip it
+- if (Vdp2GetPixelPriority(textdata[0]) > info->priority)
+- {
+- textdata++;
+- continue;
+- }
+-
+ if (p->deltaKAx != 0)
+ {
+ Vdp2ReadCoefficientFP(p,
+@@ -922,6 +906,14 @@
+ Vdp2MapCalcXY(info, &x, &y, &sinfo);
+ }
+
++ // If priority of screen is less than current top pixel and per
++ // pixel priority isn't used, skip it
++ if (Vdp2GetPixelPriority(textdata[0]) > info->priority)
++ {
++ textdata++;
++ continue;
++ }
++
+ // Fetch pixel
+ if (!Vdp2FetchPixel(info, x, y, &color))
+ {
+@@ -1075,7 +1067,7 @@
+ ReadVdp2ColorOffset(&info, 0x1, 0x1);
+ info.priority = nbg0priority;
+
+- if (!(info.enable & vdp2disptoggle))
++ if (!(info.enable & Vdp2External.disptoggle))
+ return;
+
+ ReadMosaicData(&info, 0x1);
+@@ -1141,7 +1133,7 @@
+ info.priority = nbg1priority;
+ info.PlaneAddr = (void FASTCALL (*)(void *, int))&Vdp2NBG1PlaneAddr;
+
+- if (!(info.enable & vdp2disptoggle))
++ if (!(info.enable & Vdp2External.disptoggle))
+ return;
+
+ ReadMosaicData(&info, 0x2);
+@@ -1179,7 +1171,7 @@
+ info.priority = nbg2priority;
+ info.PlaneAddr = (void FASTCALL (*)(void *, int))&Vdp2NBG2PlaneAddr;
+
+- if (!(info.enable & vdp2disptoggle))
++ if (!(info.enable & Vdp2External.disptoggle))
+ return;
+
+ ReadMosaicData(&info, 0x4);
+@@ -1219,7 +1211,7 @@
+ info.priority = nbg3priority;
+ info.PlaneAddr = (void FASTCALL (*)(void *, int))&Vdp2NBG3PlaneAddr;
+
+- if (!(info.enable & vdp2disptoggle))
++ if (!(info.enable & Vdp2External.disptoggle))
+ return;
+
+ ReadMosaicData(&info, 0x8);
+@@ -1239,7 +1231,7 @@
+
+ info.enable = Vdp2Regs->BGON & 0x10;
+ info.priority = rbg0priority;
+- if (!(info.enable & vdp2disptoggle))
++ if (!(info.enable & Vdp2External.disptoggle))
+ return;
+ info.transparencyenable = !(Vdp2Regs->BGON & 0x1000);
+ info.specialprimode = (Vdp2Regs->SFPRMD >> 8) & 0x3;
+@@ -2397,7 +2389,6 @@
+
+ int INLINE ClipLine(int *x1, int *y1, int *x2, int *y2)
+ {
+- // rewrite me
+ int point1vis=0;
+ int point2vis=0;
+
+@@ -2423,7 +2414,28 @@
+ if (point1vis == 0 && point2vis == 0)
+ return 0;
+
+- // Should be doing some clipping or something here
++ if (point1vis == 0)
++ {
++ if (*x1 < vdp1clipxstart)
++ *x1 = vdp1clipxstart;
++ else if (*x1 > vdp1clipxend)
++ *x1 = vdp1clipxend;
++ if (*y1 < vdp1clipystart)
++ *y1 = vdp1clipystart;
++ else if (*y1 > vdp1clipyend)
++ *y1 = vdp1clipyend;
++ }
++ else
++ {
++ if (*x2 < vdp1clipxstart)
++ *x2 = vdp1clipxstart;
++ else if (*x2 > vdp1clipxend)
++ *x2 = vdp1clipxend;
++ if (*y2 < vdp1clipystart)
++ *y2 = vdp1clipystart;
++ else if (*y2 > vdp1clipyend)
++ *y2 = vdp1clipyend;
++ }
+
+ return 1;
+ }
+@@ -2951,41 +2963,6 @@
+
+ //////////////////////////////////////////////////////////////////////////////
+
+-void VIDSoftVdp2ToggleDisplayNBG0(void)
+-{
+- vdp2disptoggle ^= 0x1;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDSoftVdp2ToggleDisplayNBG1(void)
+-{
+- vdp2disptoggle ^= 0x2;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDSoftVdp2ToggleDisplayNBG2(void)
+-{
+- vdp2disptoggle ^= 0x4;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDSoftVdp2ToggleDisplayNBG3(void)
+-{
+- vdp2disptoggle ^= 0x8;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+-void VIDSoftVdp2ToggleDisplayRBG0(void)
+-{
+- vdp2disptoggle ^= 0x10;
+-}
+-
+-//////////////////////////////////////////////////////////////////////////////
+-
+ void VIDSoftOnScreenDebugMessage(char *string, ...)
+ {
+ va_list arglist;
+Index: src/gtk/main.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/gtk/main.c,v
+retrieving revision 1.48
+retrieving revision 1.50
+diff -u -r1.48 -r1.50
+--- a/src/gtk/main.c 15 Jun 2008 16:19:56 -0000 1.48
++++ b/src/gtk/main.c 12 Jul 2008 21:30:50 -0000 1.50
+@@ -471,8 +471,20 @@
+ }
+
+ void yui_resize(guint width, guint height, gboolean fullscreen) {
+- if (width <= 0) width = 1;
+- if (height <= 0) height = 1;
++ if (width <= 0) width = 320;
++ if (height <= 0) height = 224;
++
++ if (g_key_file_get_integer(keyfile, "General", "KeepRatio", 0))
++ {
++ GdkGeometry geometry;
++ geometry.min_aspect = (float) width / height;
++ geometry.max_aspect = (float) width / height;
++ gtk_window_set_geometry_hints(GTK_WINDOW(yui), YUI_WINDOW(yui)->area, &geometry, GDK_HINT_ASPECT);
++ }
++ else
++ {
++ gtk_window_set_geometry_hints(GTK_WINDOW(yui), YUI_WINDOW(yui)->area, NULL, 0);
++ }
+
+ gtk_window_resize(GTK_WINDOW(yui), width, height + YUI_WINDOW(yui)->menu->allocation.height);
+
+Index: src/gtk/settings.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/gtk/settings.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- a/src/gtk/settings.c 15 Jun 2008 16:19:56 -0000 1.20
++++ b/src/gtk/settings.c 12 Jul 2008 21:30:50 -0000 1.21
+@@ -246,7 +246,7 @@
+ GtkWidget * box_percore = gtk_vbox_new(FALSE, 10);
+ GtkWidget * select_percore = yui_range_new(keyfile, "General", "PerCore", percores);
+
+- g_signal_connect(GTK_COMBO_BOX(YUI_RANGE(select_percore)->combo), "changed", percore_changed, NULL);
++ g_signal_connect(GTK_COMBO_BOX(YUI_RANGE(select_percore)->combo), "changed", G_CALLBACK(percore_changed), NULL);
+
+ gtk_container_set_border_width(GTK_CONTAINER(select_percore), 0);
+
+Index: src/gtk/yuiresolution.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/gtk/yuiresolution.c,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- a/src/gtk/yuiresolution.c 18 Oct 2006 20:53:22 -0000 1.5
++++ b/src/gtk/yuiresolution.c 1 Jul 2008 20:50:54 -0000 1.6
+@@ -29,6 +29,7 @@
+ static void yui_resolution_init (YuiResolution *yie);
+ static void yui_resolution_width_changed (GtkWidget * w, YuiResolution * yr);
+ static void yui_resolution_height_changed (GtkWidget * w, YuiResolution * yr);
++static void yui_resolution_fullscreen_toggled (GtkWidget * w, YuiResolution * yr);
+ static void yui_resolution_keep_ratio_toggled (GtkWidget * w, YuiResolution * yr);
+
+ GType yui_resolution_get_type (void) {
+@@ -116,13 +117,17 @@
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ gtk_entry_set_invisible_char (GTK_ENTRY (yr->entry_h), 9679);
+
+- yr->keep_ratio = gtk_check_button_new_with_mnemonic ("Fullscreen");
++ yr->fullscreen = gtk_check_button_new_with_mnemonic ("Fullscreen");
++ yr->keep_ratio = gtk_check_button_new_with_mnemonic ("Keep ratio");
+
+- gtk_table_attach (GTK_TABLE (yr), yr->keep_ratio, 2, 3, 0, 1,
++ gtk_table_attach (GTK_TABLE (yr), yr->fullscreen, 2, 3, 0, 1,
++ (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
++ gtk_table_attach (GTK_TABLE (yr), yr->keep_ratio, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+
+ g_signal_connect(yr->entry_w, "changed", G_CALLBACK(yui_resolution_width_changed), yr);
+ g_signal_connect(yr->entry_h, "changed", G_CALLBACK(yui_resolution_height_changed), yr);
++ g_signal_connect(yr->fullscreen, "toggled", G_CALLBACK(yui_resolution_fullscreen_toggled), yr);
+ g_signal_connect(yr->keep_ratio, "toggled", G_CALLBACK(yui_resolution_keep_ratio_toggled), yr);
+
+ }
+@@ -141,7 +146,8 @@
+ if ( !heightText ) heightText = "";
+ gtk_entry_set_text(GTK_ENTRY(yr->entry_w), widthText );
+ gtk_entry_set_text(GTK_ENTRY(yr->entry_h), heightText );
+- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(yr->keep_ratio), g_key_file_get_integer(yr->keyfile, yr->group, "Fullscreen", 0));
++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(yr->fullscreen), g_key_file_get_integer(yr->keyfile, yr->group, "Fullscreen", 0));
++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(yr->keep_ratio), g_key_file_get_integer(yr->keyfile, yr->group, "KeepRatio", 0));
+
+ return widget;
+ }
+@@ -154,6 +160,10 @@
+ g_key_file_set_value(yr->keyfile, yr->group, "Height", gtk_entry_get_text(GTK_ENTRY(w)));
+ }
+
+-static void yui_resolution_keep_ratio_toggled(GtkWidget * w, YuiResolution * yr) {
++static void yui_resolution_fullscreen_toggled(GtkWidget * w, YuiResolution * yr) {
+ g_key_file_set_integer(yr->keyfile, yr->group, "Fullscreen", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)));
+ }
++
++static void yui_resolution_keep_ratio_toggled(GtkWidget * w, YuiResolution * yr) {
++ g_key_file_set_integer(yr->keyfile, yr->group, "KeepRatio", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)));
++}
+Index: src/gtk/yuiresolution.h
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/gtk/yuiresolution.h,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- a/src/gtk/yuiresolution.h 8 Aug 2006 20:27:00 -0000 1.2
++++ b/src/gtk/yuiresolution.h 1 Jul 2008 20:50:54 -0000 1.3
+@@ -43,6 +43,7 @@
+
+ GtkWidget * entry_w;
+ GtkWidget * entry_h;
++ GtkWidget * fullscreen;
+ GtkWidget * keep_ratio;
+
+ GKeyFile * keyfile;
+Index: src/gtk/yuivdp2.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/gtk/yuivdp2.c,v
+retrieving revision 1.5
+retrieving revision 1.7
+diff -u -r1.5 -r1.7
+--- a/src/gtk/yuivdp2.c 14 May 2008 21:17:25 -0000 1.5
++++ b/src/gtk/yuivdp2.c 2 Aug 2008 08:35:41 -0000 1.7
+@@ -24,6 +24,7 @@
+ #include "../vdp2.h"
+ #include "../yabause.h"
+ #include "settings.h"
++#include "../vdp2debug.h"
+
+ static void yui_vdp2_class_init (YuiVdp2Class * klass);
+ static void yui_vdp2_init (YuiVdp2 * yfe);
+@@ -121,6 +122,8 @@
+ gtk_window_set_default_size(GTK_WINDOW(yv), 500, 450);
+
+ gtk_paned_set_position(GTK_PANED(hpane), 120);
++
++ g_signal_connect(G_OBJECT(yv), "delete-event", GTK_SIGNAL_FUNC(yui_vdp2_destroy), NULL);
+ }
+
+ GtkWidget * yui_vdp2_new(YuiWindow * y) {
+@@ -160,7 +163,7 @@
+ }
+
+ void yui_vdp2_update(YuiVdp2 * vdp2) {
+- gchar nameTemp[1024];
++ gchar nameTemp[VDP2_DEBUG_STRING_SIZE];
+ gboolean isscrenabled;
+
+ switch(vdp2->cursor) {
+Index: src/gtk/yuiwindow.c
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/gtk/yuiwindow.c,v
+retrieving revision 1.26
+retrieving revision 1.28
+diff -u -r1.26 -r1.28
+--- a/src/gtk/yuiwindow.c 27 May 2008 21:09:39 -0000 1.26
++++ b/src/gtk/yuiwindow.c 12 Jul 2008 21:30:50 -0000 1.28
+@@ -201,13 +201,19 @@
+ }
+
+ void yui_window_toggle_fullscreen(GtkWidget * w, YuiWindow * yui) {
++ static unsigned int beforefswidth = 1;
++ static unsigned int beforefsheight = 1;
++
+ yui->fullscreen = 1 - yui->fullscreen;
+ if (yui->fullscreen) {
++ beforefswidth = GTK_WIDGET(yui)->allocation.width;
++ beforefsheight = GTK_WIDGET(yui)->allocation.height;
+ gtk_widget_hide(yui->menu);
+ gtk_window_fullscreen(GTK_WINDOW(yui));
+ } else {
+ gtk_window_unfullscreen(GTK_WINDOW(yui));
+ gtk_widget_show(yui->menu);
++ gtk_window_resize(GTK_WINDOW(yui), beforefswidth, beforefsheight);
+ }
+ }
+
+Index: src/qt/yabause.pro.in
+===================================================================
+RCS file: /cvsroot/yabause/yabause/src/qt/yabause.pro.in,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff -u -r1.16 -r1.17
+--- a/src/qt/yabause.pro.in 25 May 2008 15:51:08 -0000 1.16
++++ b/src/qt/yabause.pro.in 30 Jun 2008 18:44:01 -0000 1.17
+@@ -20,10 +20,11 @@
+ mac:TARGET = Yabause
+ CONFIG += debug_and_release x86 ppc
+ QT += opengl
+-LIBS += -L../ -lyabause @LIBS@
++LIBS += -L../ -lyabause @LIBS@ @LDFLAGS@
+ AC_DEFS = @DEFS@
+-QMAKE_CXXFLAGS += $$replace( AC_DEFS, "\", "\\\"" )
+-QMAKE_CFLAGS += $$replace( AC_DEFS, "\", "\\\"" )
++CPPFLAGS = @CPPFLAGS@
++QMAKE_CXXFLAGS += $$replace( AC_DEFS, "\", "\\\"" ) $$replace( CPPFLAGS, "\", "\\\"" )
++QMAKE_CFLAGS += $$replace( AC_DEFS, "\", "\\\"" ) $$replace( CPPFLAGS, "\", "\\\"" )
+ mac:QMAKE_CXXFLAGS += -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_MAX_ALLOWED
+ mac:QMAKE_CFLAGS += -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_MAX_ALLOWED
+ RESOURCES += resources/resources.qrc
Modified: packages/trunk/yabause/debian/rules
===================================================================
--- packages/trunk/yabause/debian/rules 2008-08-06 18:31:09 UTC (rev 7897)
+++ packages/trunk/yabause/debian/rules 2008-08-08 20:08:45 UTC (rev 7898)
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -14,7 +16,7 @@
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
-config-common:
+config-common: patch
dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -53,7 +55,7 @@
build: build-gtk build-qt
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp-gtk build-stamp-qt config-stamp-gtk config-stamp-qt
More information about the Pkg-games-commits
mailing list