Request 109 (accepted)

Overview

Request 109 (accepted)

add pcsxr

Created by gber over 12 years ago
In state accepted
Package maintainer: gber

Submit pcsxr

Submit package home:gber / pcsxr to package Games / pcsxr

pcsxr.changes Added

pcsxr.spec Added

@@ -0,0 +1,99 @@
+#
+# spec file for package pcsxr
+#
+# Copyright (c) 2011 Guido Berhoerster.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+Name:           pcsxr
+Version:        1.9.92
+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-pointer-to-int-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-undefined-operations.patch
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(libglade-2.0)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xv)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  intltool
+BuildRequires:  update-desktop-files
+BuildRequires:  dos2unix
+BuildRequires:  autoconf
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+PCSX-Reloaded is a free PlayStation Console emulator which has been forked from
+the PCSX emulator and provides a nicer interface as well as several
+improvements to stability and functionality. PCSX-Reloaded uses the PSEMU
+plugin interface for most functionality and already includes a number of
+plugins. Furthemore, it has a very capable Internal HLE BIOS that can run many
+games without problems. However, it is also possible for PlayStation owners to
+use their original BIOS image.
+
+%prep
+%setup -q
+dos2unix ChangeLog ChangeLog.df
+find gui libpcsxcore plugins -name '*.[ch]' -exec dos2unix {} +
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
+DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
+TIME="\"$(date -d "${modified}" "+%%R")\""
+find .  -name '*.[ch]' |\
+    xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g"
+
+%build
+export CFLAGS='%{optflags} -fno-strict-aliasing'
+autoreconf -fi
+%configure --enable-opengl
+make %{?_smp_mflags}
+
+%install
+%make_install
+rm -f %{buildroot}%{_libdir}/psemu/*.la
+%find_lang pcsx
+%suse_update_desktop_file -r pcsx System Emulator
+
+%post
+%desktop_database_post
+
+%postun
+%desktop_database_postun
+
+%files -f pcsx.lang
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog ChangeLog.df NEWS README doc/*.txt
+%{_bindir}/pcsx
+%{_libdir}/psemu
+%{_datadir}/pcsx
+%{_datadir}/psemu
+%{_datadir}/applications/pcsx.desktop
+%{_datadir}/pixmaps/pcsx-icon.png
+%{_mandir}/man1/pcsx.1*
+
+%changelog

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

@@ -0,0 +1,94 @@
+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 Added

@@ -0,0 +1,193 @@
+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 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-1.9.92-fix-missing-headers.patch Added

pcsxr-1.9.92.tar.bz2 Added

Build Results
RPM Lint

Refresh

Comments for request 109 0

Request History

gber created request over 12 years ago

add pcsxr

pbleser accepted request about 14 years ago

reviewed ok