Hello community,
here is the log from the commit of package pcsx
checked in at Thu Dec 7 21:20:16 CET 2006.
--------
--- pcsx/pcsx.changes 2006-01-25 21:39:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/pcsx/pcsx.changes 2006-02-22 13:44:12.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 22 13:39:44 CET 2006 - uli@suse.de
+
+- update -> 1.5 (fixes bug #152061)
+
+-------------------------------------------------------------------
Old:
----
PcsxSrc-1.3.zip
PcsxSrc-gcc33.dif
New:
----
PcsxSrc-1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsx.spec ++++++
--- /var/tmp/diff_new_pack.w5bQdl/_old 2006-12-07 21:19:46.000000000 +0100
+++ /var/tmp/diff_new_pack.w5bQdl/_new 2006-12-07 21:19:46.000000000 +0100
@@ -1,31 +1,30 @@
#
-# spec file for package pcsx (Version 1.3)
+# spec file for package pcsx (Version 1.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: pcsx
-BuildRequires: ImageMagick gtk-devel libexif libtiff-devel nasm psx-plugins recode update-desktop-files
+BuildRequires: ImageMagick gtk2-devel libexif libtiff-devel nasm psx-plugins recode update-desktop-files
URL: http://www.pcsx.net/
-License: GPL
+License: GNU General Public License (GPL)
Group: System/Emulators/Other
Requires: psx-plugins
Autoreqprov: on
-Version: 1.3
-Release: 447
+Version: 1.5
+Release: 2
Summary: Open Source Sony PlayStation emulator
-Source: PcsxSrc-1.3.zip
+Source: PcsxSrc-1.5.tar.bz2
Source10: pcsx.sh
Source11: pcsx.desktop
#Source11: Pcsx-1.0-patch.zip
Patch: PcsxSrc.dif
-Patch1: PcsxSrc-gcc33.dif
Patch2: PcsxSrc-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,23 +57,18 @@
Lamer0
%prep
-%setup -n PcsxSrc -c -T
-cd ..
-unzip %{SOURCE0}
-#unzip %{SOURCE11}
-#cp -av Pcsx-1.0-patch/* PcsxSrc
-cd PcsxSrc
+%setup -n PcsxSrc-%version
for i in *.[ch] */*.[ch] Linux/Makefile
do
recode -f ibmpc..lat1 $i
done
%patch
-%patch1
%patch2 -p1
%build
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
cd Linux
+./configure
%ifarch %ix86
make CPU=ix86 STRIP=true
%else
@@ -112,6 +106,8 @@
/usr/share/applications/*.desktop
%changelog -n pcsx
+* Wed Feb 22 2006 - uli@suse.de
+- update -> 1.5 (fixes bug #152061)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Sun Jan 15 2006 - schwab@suse.de
++++++ PcsxSrc-gcc4.patch ++++++
--- /var/tmp/diff_new_pack.w5bQdl/_old 2006-12-07 21:19:46.000000000 +0100
+++ /var/tmp/diff_new_pack.w5bQdl/_new 2006-12-07 21:19:46.000000000 +0100
@@ -1,30 +1,21 @@
-diff -ur PcsxSrc-1.3-444/PsxBios.c PcsxSrc/PsxBios.c
---- PcsxSrc-1.3-444/PsxBios.c 2002-06-13 03:40:40.000000000 +0200
-+++ PcsxSrc/PsxBios.c 2005-04-26 18:06:05.002068612 +0200
-@@ -2137,10 +2137,10 @@
+--- PcsxSrc-1.5/PsxBios.c
++++ PcsxSrc-1.5/PsxBios.c
+@@ -2250,10 +2250,10 @@
#define bfreezepsxMptr(ptr) \
if (Mode == 1) { \
-- if (ptr) psxRu32(base) = (u32)ptr - (u32)psxM; \
-+ if (ptr) base = (u32)ptr - (u32)psxM; \
- else psxRu32(base) = 0; \
+- if (ptr) psxRu32ref(base) = SWAPu32((u32)ptr - (u32)psxM); \
++ if (ptr) base = SWAPu32((u32)ptr - (u32)psxM); \
+ else psxRu32ref(base) = 0; \
} else { \
- if (psxRu32(base)) (u8*)ptr = (u8*)(psxM + psxRu32(base)); \
+ if (psxRu32(base)) ptr = (u8*)(psxM + psxRu32(base)); \
else ptr = NULL; \
} \
base+=4;
-@@ -2161,4 +2161,4 @@
- bfreezes(Thread);
- bfreezel(&CurThread);
- bfreezes(FDesc);
--}
-\ No newline at end of file
-+}
-diff -ur PcsxSrc-1.3-444/PsxInterpreter.c PcsxSrc/PsxInterpreter.c
---- PcsxSrc-1.3-444/PsxInterpreter.c 2002-06-13 03:40:40.000000000 +0200
-+++ PcsxSrc/PsxInterpreter.c 2005-04-26 18:02:05.718880307 +0200
-@@ -97,8 +97,8 @@
+--- PcsxSrc-1.5/PsxInterpreter.c
++++ PcsxSrc-1.5/PsxInterpreter.c
+@@ -403,8 +403,8 @@
*********************************************************/
void psxDIV() {
if (_i32(_rRt_) != 0) {
@@ -35,7 +26,7 @@
}
}
-@@ -142,7 +142,7 @@
+@@ -448,7 +448,7 @@
* Format: OP rd, rt, sa *
*********************************************************/
void psxSLL() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) << _Sa_; } // Rd = Rt << sa
@@ -44,7 +35,7 @@
void psxSRL() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) >> _Sa_; } // Rd = Rt >> sa (logical)
/*********************************************************
-@@ -150,7 +150,7 @@
+@@ -456,7 +456,7 @@
* Format: OP rd, rt, rs *
*********************************************************/
void psxSLLV() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) << _u32(_rRs_); } // Rd = Rt << rs
@@ -53,7 +44,7 @@
void psxSRLV() { if (!_Rd_) return; _u32(_rRd_) = _u32(_rRt_) >> _u32(_rRs_); } // Rd = Rt >> rs (logical)
/*********************************************************
-@@ -223,7 +223,7 @@
+@@ -534,7 +534,7 @@
void psxLB() {
if (_Rt_) {
@@ -62,7 +53,7 @@
} else {
psxMemRead8(_oB_);
}
-@@ -239,7 +239,7 @@
+@@ -550,7 +550,7 @@
void psxLH() {
if (_Rt_) {
@@ -71,7 +62,7 @@
} else {
psxMemRead16(_oB_);
}
-@@ -341,8 +341,8 @@
+@@ -665,8 +665,8 @@
* Moves between GPR and COPx *
* Format: OP rt, fs *
*********************************************************/
@@ -80,5 +71,5 @@
+void psxMFC0() { if (!_Rt_) return; _rRt_ = (int)_rFs_; }
+void psxCFC0() { if (!_Rt_) return; _rRt_ = (int)_rFs_; }
- void psxMTC0() { _rFs_ = _u32(_rRt_); }
- void psxCTC0() { _rFs_ = _u32(_rRt_); }
+ void psxTestSWInts() {
+ // the next code is untested, if u know please
++++++ PcsxSrc.dif ++++++
--- /var/tmp/diff_new_pack.w5bQdl/_old 2006-12-07 21:19:46.000000000 +0100
+++ /var/tmp/diff_new_pack.w5bQdl/_new 2006-12-07 21:19:46.000000000 +0100
@@ -1,17 +1,17 @@
--- Gte.c
+++ Gte.c
-@@ -220,7 +220,7 @@
+@@ -231,7 +231,7 @@
} else {
psxRegs.CP2D.r[31] = 32;
}
--#elif defined(__LINUX__)
-+#elif defined(__LINUX__) && (defined(__i386__)||defined(__x86_64__))
+-#elif defined(__LINUX__) || defined(__MINGW32__)
++#elif (defined(__LINUX__) && (defined(__i386__)||defined(__x86_64__))) || defined(__MINGW32__)
if (a > 0) {
__asm__ ("bsrl %1, %0\n" : "=r"(a) : "r"(a) );
psxRegs.CP2D.r[31] = 31 - a;
--- Linux/GtkGui.c
+++ Linux/GtkGui.c
-@@ -793,9 +793,13 @@
+@@ -1084,9 +1084,13 @@
Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));
if (t != Config.Cpu) {
psxCpu->Shutdown();
@@ -27,83 +27,34 @@
exit(1);
--- Linux/Makefile
+++ Linux/Makefile
-@@ -8,14 +8,14 @@
+@@ -13,9 +13,9 @@
all: pcsx
-CPU = ix86
+#CPU = ix86
- CC = gcc
- NASM = nasm
- RM = rm -f
- STRIP = strip
-
-OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
-+OPTIMIZE = $(RPM_OPT_FLAGS) -fomit-frame-pointer -finline-functions -ffast-math
- FLAGS = -D__LINUX__ -DPCSX_VERSION=\"${VERSION}\"
- # this includes the option -rdynamic and we don't want that
- LIBST = $(shell gtk-config --libs)
-@@ -29,8 +29,8 @@
- OBJS+= GladeGui.o GladeFuncs.o #GladeCalls.o
-
- ifeq (${CPU}, ix86)
-- CC = pgcc
++OPTIMIZE = $(RPM_OPT_FLAGS) -O2 -fomit-frame-pointer -finline-functions -ffast-math
+ FLAGS = -D__LINUX__ -DPCSX_VERSION=\"${VERSION}\" -DPACKAGE=\"pcsx\"
+ FLAGS+= -DENABLE_NLS
+
+@@ -44,7 +44,7 @@
+ ifneq (${PGCC}, )
+ CC = ${PGCC}
+ endif
- OPTIMIZE = -O4 -fomit-frame-pointer -finline-functions -ffast-math -fno-exceptions -march=pentiumpro
-+ CC = gcc
-+ OPTIMIZE = $(RPM_OPT_FLAGS) -O4 -fomit-frame-pointer -finline-functions -ffast-math -fno-exceptions
++ OPTIMIZE = $(RPM_OPT_FLAGS) -O4 -fomit-frame-pointer -finline-functions -ffast-math -fno-exceptions -march=pentiumpro
OBJS+= ../ix86/iR3000A.o ../ix86/ix86.o
FLAGS+= -D__i386__
endif
---- R3000A.c
-+++ R3000A.c
-@@ -24,7 +24,10 @@
-
- int psxInit() {
-
-- if (Config.Cpu) psxCpu = &psxInt;
-+#ifdef __i386__
-+ if (Config.Cpu)
-+#endif
-+ psxCpu = &psxInt;
- #ifdef __i386__
- else psxCpu = &psxRec;
- #endif
---- Sio.c
-+++ Sio.c
-@@ -20,6 +20,7 @@
- #include
- #include
- #include
-+#include
-
- #include "PsxCommon.h"
-
-@@ -348,7 +349,7 @@
- struct stat buf;
- int s = MCD_SIZE;
- int i=0;
-- strlwr(mcd);
-+ g_strdown(mcd);
-
- f = fopen(mcd, "wb");
- if (f == NULL) return;
-@@ -411,7 +412,7 @@
- FILE *f;
- int i=0;
- int s = MCD_SIZE;
-- strlwr(mcd);
-+ g_strdown(mcd);
-
- if (strstr(mcd, ".gme")) {
- f = fopen(mcd, "wb");
--- ix86/ix86.c
+++ ix86/ix86.c
-@@ -5,6 +5,7 @@
-
+@@ -7,6 +7,7 @@
#include
+ #include
+#include "PsxCommon.h"
#include "ix86.h"
- void x86Init(char *ptr) {
+ static s32 iCpuId(s32 cmd, u32 *regs) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
