Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

pcsxr.changes Changed

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Thu Oct 31 16:22:59 UTC 2013 - gber@opensuse.org
+
+- update to version 1.9.93
+  - This release includes many bugfixes over the three years, as
+    well as many enhancements to the OS X version.
+  - In General:
+    - SIO1 support is enabled by default.
+    - OpenAL can be the back-end to the sound plug-in.
+    - Removal of the GXVideo plug-in code.
+    - Multi-block saves are copied correctly.
+- rename pcsxr-1.9.92-change-plugin-path.patch to
+  pcsxr-change-plugin-path.patch
+- remove obsolete pcsxr-1.9.92-fix-int-to-pointer-warning.patch
+- rename pcsxr-1.9.92-fix-ambiguous-expressions.patch to
+  pcsxr-fix-ambiguous-expressions.patch
+- rename pcsxr-1.9.92-change-plugin-path.patch to
+  pcsxr-change-plugin-path.patch
+- rename pcsxr-1.9.92-fix-missing-headers.patch to
+  pcsxr-fix-missing-headers.patch
+- add pcsxr-fix-array-overflow.patch which fixes an array overflow
+
+-------------------------------------------------------------------
 Wed Sep  5 16:36:20 UTC 2012 - gber@opensuse.org
 
 - add missing dependencies on automake, libtool

pcsxr.spec Changed

@@ -16,33 +16,33 @@
 #
 
 Name:           pcsxr
-Version:        1.9.92
+Version:        1.9.93
 Release:        0
 License:        GPL-2.0+
 Summary:        PlayStation Emulator
 Url:            http://pcsxr.codeplex.com/
 Group:          System/Emulators/Other
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE pcsxr-1.9.92-change-plugin-path.patch gber@opensuse.org -- Installs plugins in libdir/psemu
-Patch0:         pcsxr-1.9.92-change-plugin-path.patch
-# PATCH-FIX-UPSTREAM pcsxr-1.9.92-fix-int-to-pointer-warning.patch gber@opensuse.org -- Fixes implicit integer to pointer conversion warnings by removing a superfluous wrapper function
-Patch1:         pcsxr-1.9.92-fix-int-to-pointer-warning.patch
-# PATCH-FIX-UPSTREAM pcsxr-1.9.92-fix-missing-headers.patch gber@opensuse.org -- Adds missing includes
-Patch2:         pcsxr-1.9.92-fix-missing-headers.patch
-# PATH-FIX-UPSTREAM pcsxr-1.9.92-fix-ambiguous-expressions.patch gber@opensuse.org -- Fixes a number of ambiguous expressions invoking undefined behavior
-Patch3:         pcsxr-1.9.92-fix-ambiguous-expressions.patch
-# PATCH-FIX-UPSTREAM pcsxr-1.9.92-fix-linking.patch http://pcsxr.codeplex.com/workitem/7815 gber@opensuse.org -- Fixes the linking order (backported from upstream SVN)
-Patch4:         pcsxr-1.9.92-fix-linking-order.patch
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(libglade-2.0)
+# PATCH-FIX-OPENSUSE pcsxr-change-plugin-path.patch gber@opensuse.org -- Installs plugins in libdir/psemu
+Patch0:         pcsxr-change-plugin-path.patch
+# PATCH-FIX-UPSTREAM pcsxr-fix-missing-headers.patch gber@opensuse.org -- Adds missing includes
+Patch1:         pcsxr-fix-missing-headers.patch
+# PATH-FIX-UPSTREAM pcsxr-ambiguous-expressions.patch gber@opensuse.org -- Fixes a number of ambiguous expressions invoking undefined behavior
+Patch2:         pcsxr-fix-ambiguous-expressions.patch
+# PATCH-FIX-UPSTREAM pcsxr-fix-array-overflow.patch gber@opensuse.org -- Fixes an array overflow
+Patch3:         pcsxr-fix-array-overflow.patch
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.20
+BuildRequires:  pkgconfig(sdl) >= 1.2.12
+BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xv)
+BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(sdl)
+BuildRequires:  libcdio-devel
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
-BuildRequires:  dos2unix
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -58,14 +58,14 @@
 use their original BIOS image.
 
 %prep
-%setup -q
-dos2unix ChangeLog ChangeLog.df
-find gui libpcsxcore plugins -name '*.[ch]' -exec dos2unix {} +
+%setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+chmod 644 ChangeLog
+
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
@@ -75,17 +75,17 @@
 %build
 export CFLAGS='%{optflags} -fno-strict-aliasing'
 ./autogen.sh
-%configure --enable-opengl
+%configure --enable-opengl --enable-libcdio --enable-sound=sdl
 make %{?_smp_mflags}
 
 %install
 %make_install
 
-rm -f %{buildroot}%{_libdir}/psemu/*.la
+rm %{buildroot}%{_libdir}/psemu/*.la
 
-%find_lang pcsx %{?_no_lang_C}
+%find_lang pcsxr %{?_no_lang_C}
 
-%suse_update_desktop_file -r pcsx System Emulator
+%suse_update_desktop_file -r pcsxr System Emulator
 
 %post
 %desktop_database_post
@@ -93,15 +93,15 @@
 %postun
 %desktop_database_postun
 
-%files -f pcsx.lang
+%files -f pcsxr.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog ChangeLog.df NEWS README doc/*.txt
-%{_bindir}/pcsx
+%doc AUTHORS ChangeLog ChangeLog.df README doc/*.txt
+%{_bindir}/pcsxr
 %{_libdir}/psemu
-%{_datadir}/pcsx
+%{_datadir}/pcsxr
 %{_datadir}/psemu
-%{_datadir}/applications/pcsx.desktop
-%{_datadir}/pixmaps/pcsx-icon.png
-%{_mandir}/man1/pcsx.1*
+%{_datadir}/applications/pcsxr.desktop
+%{_datadir}/pixmaps/pcsxr-icon.png
+%{_mandir}/man1/pcsxr.1*
 
 %changelog

pcsxr-1.9.92-change-plugin-path.patch Deleted

@@ -1,94 +0,0 @@
-Index: pcsxr-1.9.92/gui/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/gui/Makefile.am
-+++ pcsxr-1.9.92/gui/Makefile.am
-@@ -4,7 +4,7 @@ INCLUDES = -DPACKAGE_DATA_DIR=\"${datadi
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
- 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
- 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
--	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
-+	-DDEF_PLUGIN_DIR=\"${libdir}/psemu\"
- 
- bin_PROGRAMS = pcsx
- 
-Index: pcsxr-1.9.92/plugins/dfcdrom/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfcdrom/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfcdrom/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFCdrom.la
- 
-Index: pcsxr-1.9.92/plugins/dfinput/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfinput/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfinput/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFInput.la
- 
-Index: pcsxr-1.9.92/plugins/dfnet/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfnet/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfnet/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFNet.la
- 
-Index: pcsxr-1.9.92/plugins/dfsound/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfsound/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfsound/Makefile.am
-@@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixm
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
- 	-I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFSound.la
- 
-Index: pcsxr-1.9.92/plugins/dfxvideo/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfxvideo/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfxvideo/Makefile.am
-@@ -13,8 +13,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixm
- 	-I../../libpcsxcore \
- 	-I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFXVideo.la
- 
-Index: pcsxr-1.9.92/plugins/peopsxgl/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/peopsxgl/Makefile.am
-+++ pcsxr-1.9.92/plugins/peopsxgl/Makefile.am
-@@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixm
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
- 	-I../../libpcsxcore -I../../include -fPIC
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libpeopsxgl.la
-

pcsxr-1.9.92-fix-ambiguous-expressions.patch Deleted

@@ -1,193 +0,0 @@
-Index: pcsxr-1.9.92/plugins/peopsxgl/texture.c
-===================================================================
---- pcsxr-1.9.92.orig/plugins/peopsxgl/texture.c
-+++ pcsxr-1.9.92/plugins/peopsxgl/texture.c
-@@ -994,7 +994,10 @@ void LoadStretchPackedWndTexturePage(int
-         if(ldy) 
-          {ldy--;
-           for(TXU=g_x1;TXU<=g_x2;TXU++)
--           *ta++=*(ta-(g_x2-g_x1));
-+           {
-+           *ta=*(ta-(g_x2-g_x1));
-+           ta++;
-+           }
-          }
-        }
- 
-@@ -1071,7 +1074,10 @@ void LoadStretchPackedWndTexturePage(int
-         if(ldy) 
-          {ldy--;
-           for(TXU=g_x1;TXU<=g_x2;TXU++)
--           *ta++=*(ta-(g_x2-g_x1));
-+           {
-+           *ta=*(ta-(g_x2-g_x1));
-+           ta++;
-+           }
-          }
- 
-        }
-@@ -1196,7 +1202,10 @@ void LoadStretchWndTexturePage(int pagei
-         if(ldy) 
-          {ldy--;
-           for(TXU=g_x1;TXU<=g_x2;TXU++)
--           *ta++=*(ta-(g_x2-g_x1));
-+           {
-+           *ta=*(ta-(g_x2-g_x1));
-+           ta++;
-+           }
-          }
-        }
- 
-@@ -1280,7 +1289,10 @@ void LoadStretchWndTexturePage(int pagei
-         if(ldy) 
-          {ldy--;
-           for(TXU=g_x1;TXU<=g_x2;TXU++)
--           *ta++=*(ta-(g_x2-g_x1));
-+           {
-+           *ta=*(ta-(g_x2-g_x1));
-+           ta++;
-+           }
-          }
- 
-        }
-@@ -2239,14 +2251,19 @@ GLuint LoadTextureMovie(void)
-            lu=*((uint32_t *)pD);pD+=3;
-            *ta++=XMBLUE(lu)|XMGREEN(lu)|XMRED(lu)|1;
-          }
--         *ta++=*(ta-1);
-+         *ta=*(ta-1);
-+         ta++;
-         }
-        if(b_Y)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
--         *ta++=*(ta-1);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-+         *ta=*(ta-1);
-+         ta++;
-         }
-       }
-      else
-@@ -2265,7 +2282,10 @@ GLuint LoadTextureMovie(void)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-         }
-       }
-     }
-@@ -2288,14 +2308,19 @@ GLuint LoadTextureMovie(void)
-            *ta++=((c&0x1f)<<11)|((c&0x3e0)<<1)|((c&0x7c00)>>9)|1;
-           }
- 
--         *ta++=*(ta-1);
-+         *ta=*(ta-1);
-+         ta++;
-         }
-        if(b_Y)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
--         *ta++=*(ta-1);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-+         *ta=*(ta-1);
-+         ta++;
-         }
-       }
-      else
-@@ -2313,7 +2338,10 @@ GLuint LoadTextureMovie(void)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-         }
-       }
-     }
-@@ -2339,14 +2367,19 @@ GLuint LoadTextureMovie(void)
-            *ta++=*((uint32_t *)pD)|0xff000000;
-            pD+=3;
-           }
--         *ta++=*(ta-1);
-+         *ta=*(ta-1);
-+         ta++;
-         }
-        if(b_Y)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
--         *ta++=*(ta-1);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-+         *ta=*(ta-1);
-+         ta++;
-         }
-       }
-      else
-@@ -2365,7 +2398,10 @@ GLuint LoadTextureMovie(void)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-         }
-       }
-     }
-@@ -2386,15 +2422,20 @@ GLuint LoadTextureMovie(void)
-          startxy=((1024)*column)+xrMovieArea.x0;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-           *ta++=LTCOL(psxVuw[startxy++]|0x8000);
--         *ta++=*(ta-1);
-+         *ta=*(ta-1);
-+         ta++;
-         }
- 
-        if(b_Y)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0+1;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
--         *ta++=*(ta-1);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-+         *ta=*(ta-1);
-+         ta++;
-         }
-       }
-      else
-@@ -2410,7 +2451,10 @@ GLuint LoadTextureMovie(void)
-         {
-          dx=xrMovieArea.x1-xrMovieArea.x0;
-          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
--          *ta++=*(ta-dx);
-+          {
-+          *ta=*(ta-dx);
-+          ta++;
-+          }
-         }
-       }
-     }

pcsxr-1.9.92-fix-int-to-pointer-warning.patch Deleted

@@ -1,48 +0,0 @@
-Index: pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfxvideo/gpucfg-0.1df/main.c
-+++ pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
-@@ -55,11 +55,6 @@ void on_about_clicked(GtkWidget *widget,
- 	exit (0);
- }
- 
--void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
--{
--	gtk_widget_set_sensitive (widget, (int)user_data);
--}
--
- void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
- {
- 	GtkWidget *check, *resCombo2;
-@@ -69,7 +64,7 @@ void on_fullscreen_toggled(GtkWidget *wi
- 	check = glade_xml_get_widget(xml, "checkFullscreen");
- 	resCombo2 = glade_xml_get_widget(xml, "resCombo2");
- 
--	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
-+	gtk_widget_set_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
- }
- 
- void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
-@@ -82,8 +77,8 @@ void on_use_fixes_toggled(GtkWidget *wid
- 	table_fixes = glade_xml_get_widget (xml, "table_fixes");
- 
- 	/* Set the state of each of the fixes to the value of the use fixes toggle */
--	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,
--		(void *)gtk_toggle_button_get_active (check));
-+	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) gtk_widget_set_sensitive,
-+		(gpointer)gtk_toggle_button_get_active (check));
- }
- 
- void on_fps_toggled(GtkWidget *widget, gpointer user_data)
-@@ -96,9 +91,9 @@ void on_fps_toggled(GtkWidget *widget, g
- 	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
- 	entryFPS = glade_xml_get_widget(xml, "entryFPS");
- 
--	set_widget_sensitive(entryFPS,
-+	gtk_widget_set_sensitive(entryFPS,
- 		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
--	set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
-+	gtk_widget_set_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
- }
- 
- void OnConfigClose(GtkWidget *widget, gpointer user_data)

pcsxr-1.9.92-fix-linking-order.patch Deleted

pcsxr-1.9.92-fix-missing-headers.patch Deleted

pcsxr-change-plugin-path.patch Added

@@ -0,0 +1,105 @@
+Index: pcsxr/gui/Makefile.am
+===================================================================
+--- pcsxr.orig/gui/Makefile.am
++++ pcsxr/gui/Makefile.am
+@@ -4,7 +4,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${dat
+ 	$(GTK3_CFLAGS) \
+ 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
+ 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
+-	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
++	-DDEF_PLUGIN_DIR=\"${libdir}/psemu\"
+ 
+ bin_PROGRAMS = pcsxr
+ 
+Index: pcsxr/plugins/dfcdrom/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfcdrom/Makefile.am
++++ pcsxr/plugins/dfcdrom/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFCdrom.la
+ 
+Index: pcsxr/plugins/dfinput/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfinput/Makefile.am
++++ pcsxr/plugins/dfinput/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFInput.la
+ 
+Index: pcsxr/plugins/dfnet/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfnet/Makefile.am
++++ pcsxr/plugins/dfnet/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFNet.la
+ 
+Index: pcsxr/plugins/dfsound/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfsound/Makefile.am
++++ pcsxr/plugins/dfsound/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_CPPFLAGS = -I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFSound.la
+ 
+Index: pcsxr/plugins/dfxvideo/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfxvideo/Makefile.am
++++ pcsxr/plugins/dfxvideo/Makefile.am
+@@ -12,8 +12,8 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/
+ 	-I../../libpcsxcore \
+ 	-I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFXVideo.la
+ 
+Index: pcsxr/plugins/peopsxgl/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/peopsxgl/Makefile.am
++++ pcsxr/plugins/peopsxgl/Makefile.am
+@@ -4,8 +4,8 @@ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/p
+ 	$(GTK3_CFLAGS) \
+ 	-I../../libpcsxcore -I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libpeopsxgl.la
+ 
+Index: pcsxr/plugins/bladesio1/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/bladesio1/Makefile.am
++++ pcsxr/plugins/bladesio1/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libBladeSio1.la
+

pcsxr-fix-ambiguous-expressions.patch Added

@@ -0,0 +1,193 @@
+Index: pcsxr/plugins/peopsxgl/texture.c
+===================================================================
+--- pcsxr.orig/plugins/peopsxgl/texture.c
++++ pcsxr/plugins/peopsxgl/texture.c
+@@ -1002,7 +1002,10 @@ void LoadStretchPackedWndTexturePage(int
+         if(ldy) 
+          {ldy--;
+           for(TXU=g_x1;TXU<=g_x2;TXU++)
+-           *ta++=*(ta-(g_x2-g_x1));
++           {
++           *ta=*(ta-(g_x2-g_x1));
++           ta++;
++           }
+          }
+        }
+ 
+@@ -1079,7 +1082,10 @@ void LoadStretchPackedWndTexturePage(int
+         if(ldy) 
+          {ldy--;
+           for(TXU=g_x1;TXU<=g_x2;TXU++)
+-           *ta++=*(ta-(g_x2-g_x1));
++           {
++           *ta=*(ta-(g_x2-g_x1));
++           ta++;
++           }
+          }
+ 
+        }
+@@ -1204,7 +1210,10 @@ void LoadStretchWndTexturePage(int pagei
+         if(ldy) 
+          {ldy--;
+           for(TXU=g_x1;TXU<=g_x2;TXU++)
+-           *ta++=*(ta-(g_x2-g_x1));
++           {
++           *ta=*(ta-(g_x2-g_x1));
++           ta++;
++           }
+          }
+        }
+ 
+@@ -1288,7 +1297,10 @@ void LoadStretchWndTexturePage(int pagei
+         if(ldy) 
+          {ldy--;
+           for(TXU=g_x1;TXU<=g_x2;TXU++)
+-           *ta++=*(ta-(g_x2-g_x1));
++           {
++           *ta=*(ta-(g_x2-g_x1));
++           ta++;
++           }
+          }
+ 
+        }
+@@ -2247,14 +2259,19 @@ GLuint LoadTextureMovie(void)
+            lu=*((uint32_t *)pD);pD+=3;
+            *ta++=XMBLUE(lu)|XMGREEN(lu)|XMRED(lu)|1;
+          }
+-         *ta++=*(ta-1);
++         *ta=*(ta-1);
++         ta++;
+         }
+        if(b_Y)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0+1;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
+-         *ta++=*(ta-1);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
++         *ta=*(ta-1);
++         ta++;
+         }
+       }
+      else
+@@ -2273,7 +2290,10 @@ GLuint LoadTextureMovie(void)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
+         }
+       }
+     }
+@@ -2296,14 +2316,19 @@ GLuint LoadTextureMovie(void)
+            *ta++=((c&0x1f)<<11)|((c&0x3e0)<<1)|((c&0x7c00)>>9)|1;
+           }
+ 
+-         *ta++=*(ta-1);
++         *ta=*(ta-1);
++         ta++;
+         }
+        if(b_Y)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0+1;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
+-         *ta++=*(ta-1);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
++         *ta=*(ta-1);
++         ta++;
+         }
+       }
+      else
+@@ -2321,7 +2346,10 @@ GLuint LoadTextureMovie(void)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
+         }
+       }
+     }
+@@ -2347,14 +2375,19 @@ GLuint LoadTextureMovie(void)
+            *ta++=*((uint32_t *)pD)|0xff000000;
+            pD+=3;
+           }
+-         *ta++=*(ta-1);
++         *ta=*(ta-1);
++         ta++;
+         }
+        if(b_Y)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0+1;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
+-         *ta++=*(ta-1);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
++         *ta=*(ta-1);
++         ta++;
+         }
+       }
+      else
+@@ -2373,7 +2406,10 @@ GLuint LoadTextureMovie(void)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
+         }
+       }
+     }
+@@ -2394,15 +2430,20 @@ GLuint LoadTextureMovie(void)
+          startxy=((1024)*column)+xrMovieArea.x0;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+           *ta++=LTCOL(psxVuw[startxy++]|0x8000);
+-         *ta++=*(ta-1);
++         *ta=*(ta-1);
++         ta++;
+         }
+ 
+        if(b_Y)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0+1;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
+-         *ta++=*(ta-1);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
++         *ta=*(ta-1);
++         ta++;
+         }
+       }
+      else
+@@ -2418,7 +2459,10 @@ GLuint LoadTextureMovie(void)
+         {
+          dx=xrMovieArea.x1-xrMovieArea.x0;
+          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+-          *ta++=*(ta-dx);
++          {
++          *ta=*(ta-dx);
++          ta++;
++          }
+         }
+       }
+     }

pcsxr-fix-array-overflow.patch Added

pcsxr-fix-int-to-pointer-warning.patch Added

@@ -0,0 +1,48 @@
+Index: pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
+===================================================================
+--- pcsxr-1.9.92.orig/plugins/dfxvideo/gpucfg-0.1df/main.c
++++ pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
+@@ -55,11 +55,6 @@ void on_about_clicked(GtkWidget *widget,
+ 	exit (0);
+ }
+ 
+-void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
+-{
+-	gtk_widget_set_sensitive (widget, (int)user_data);
+-}
+-
+ void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
+ {
+ 	GtkWidget *check, *resCombo2;
+@@ -69,7 +64,7 @@ void on_fullscreen_toggled(GtkWidget *wi
+ 	check = glade_xml_get_widget(xml, "checkFullscreen");
+ 	resCombo2 = glade_xml_get_widget(xml, "resCombo2");
+ 
+-	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
++	gtk_widget_set_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
+ }
+ 
+ void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
+@@ -82,8 +77,8 @@ void on_use_fixes_toggled(GtkWidget *wid
+ 	table_fixes = glade_xml_get_widget (xml, "table_fixes");
+ 
+ 	/* Set the state of each of the fixes to the value of the use fixes toggle */
+-	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,
+-		(void *)gtk_toggle_button_get_active (check));
++	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) gtk_widget_set_sensitive,
++		(gpointer)gtk_toggle_button_get_active (check));
+ }
+ 
+ void on_fps_toggled(GtkWidget *widget, gpointer user_data)
+@@ -96,9 +91,9 @@ void on_fps_toggled(GtkWidget *widget, g
+ 	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
+ 	entryFPS = glade_xml_get_widget(xml, "entryFPS");
+ 
+-	set_widget_sensitive(entryFPS,
++	gtk_widget_set_sensitive(entryFPS,
+ 		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
+-	set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
++	gtk_widget_set_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
+ }
+ 
+ void OnConfigClose(GtkWidget *widget, gpointer user_data)

pcsxr-fix-missing-headers.patch Added

@@ -0,0 +1,77 @@
+Index: pcsxr/plugins/dfcdrom/cdr.c
+===================================================================
+--- pcsxr.orig/plugins/dfcdrom/cdr.c
++++ pcsxr/plugins/dfcdrom/cdr.c
+@@ -21,6 +21,10 @@
+ 
+ #include "cdr.h"
+ 
++#ifndef _MACOSX
++#include <sys/wait.h>
++#endif
++
+ #ifndef USE_NULL
+ static char *LibName = N_("CD-ROM Drive Reader");
+ #else
+Index: pcsxr/plugins/dfsound/cfg.c
+===================================================================
+--- pcsxr.orig/plugins/dfsound/cfg.c
++++ pcsxr/plugins/dfsound/cfg.c
+@@ -26,6 +26,7 @@
+ ////////////////////////////////////////////////////////////////////////
+ 
+ #include <unistd.h>
++#include <sys/wait.h>
+ 
+ ////////////////////////////////////////////////////////////////////////
+ // START EXTERNAL CFG TOOL
+Index: pcsxr/plugins/dfxvideo/cfg.c
+===================================================================
+--- pcsxr.orig/plugins/dfxvideo/cfg.c
++++ pcsxr/plugins/dfxvideo/cfg.c
+@@ -18,6 +18,7 @@
+ #define _IN_CFG
+ 
+ #include <sys/stat.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
+Index: pcsxr/plugins/bladesio1/sio1.c
+===================================================================
+--- pcsxr.orig/plugins/bladesio1/sio1.c
++++ pcsxr/plugins/bladesio1/sio1.c
+@@ -31,6 +31,8 @@ void AboutDlgProc();
+ void ConfDlgProc();
+ #else
+ #include <sys/stat.h>
++#include <sys/wait.h>
++#include <unistd.h>
+ #endif
+ 
+ #include "typedefs.h"
+Index: pcsxr/plugins/dfinput/pad.c
+===================================================================
+--- pcsxr.orig/plugins/dfinput/pad.c
++++ pcsxr/plugins/dfinput/pad.c
+@@ -20,6 +20,7 @@
+ #if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+ #include <linux/input.h>
+ #include <sys/file.h>
++#include <sys/wait.h>
+ #include <time.h>
+ #endif
+ 
+Index: pcsxr/plugins/peopsxgl/gpu.c
+===================================================================
+--- pcsxr.orig/plugins/peopsxgl/gpu.c
++++ pcsxr/plugins/peopsxgl/gpu.c
+@@ -25,6 +25,8 @@
+ #include "drawgl.h"
+ #elif !defined(_MACGL) && !defined(_WINDOWS)
+ 
++#include <sys/wait.h>
++
+ #include "config.h"
+ 
+ #ifndef NOVMODE

pcsxr-1.9.92.tar.bz2 -> pcsxr-1.9.93.tar.bz2 Changed