diff options
author | Matteo Bernardini <ponce@slackbuilds.org> | 2021-04-23 09:07:01 +0200 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-23 23:25:24 -0500 |
commit | 6dcae16896ed7c749a963f4bd8aa7aceff815be8 (patch) | |
tree | 26b83afbcdba19cc01c1f2375031cf7329502c68 /games | |
parent | eefc8078bffcb519348128a333e22f92345b017e (diff) |
games/pcsxr: Updated for version 1.9.95.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r-- | games/pcsxr/patches/pcsxr-fix-uncompress2.patch (renamed from games/pcsxr/pcsxr-fix-uncompress2.patch) | 6 | ||||
-rw-r--r-- | games/pcsxr/patches/pcsxr-fix-undefined-operations.patch | 193 | ||||
-rw-r--r-- | games/pcsxr/patches/pcsxr-remove-assertion-64bit.patch | 12 | ||||
-rw-r--r-- | games/pcsxr/pcsxr.SlackBuild | 27 | ||||
-rw-r--r-- | games/pcsxr/pcsxr.info | 6 |
5 files changed, 227 insertions, 17 deletions
diff --git a/games/pcsxr/pcsxr-fix-uncompress2.patch b/games/pcsxr/patches/pcsxr-fix-uncompress2.patch index 88f61da9f52b2..17a69f92492c6 100644 --- a/games/pcsxr/pcsxr-fix-uncompress2.patch +++ b/games/pcsxr/patches/pcsxr-fix-uncompress2.patch @@ -1,6 +1,6 @@ -diff -up pcsxr/libpcsxcore/cdriso.c.orig pcsxr/libpcsxcore/cdriso.c ---- pcsxr/libpcsxcore/cdriso.c.orig 2019-06-30 19:54:58.013320015 -0500 -+++ pcsxr/libpcsxcore/cdriso.c 2019-06-30 19:56:05.351320015 -0500 +diff -up a/pcsxr/libpcsxcore/cdriso.c.orig pcsxr/libpcsxcore/cdriso.c +--- a/pcsxr/libpcsxcore/cdriso.c.orig 2019-06-30 19:54:58.013320015 -0500 ++++ a/pcsxr/libpcsxcore/cdriso.c 2019-06-30 19:56:05.351320015 -0500 @@ -913,7 +913,7 @@ static int cdread_sub_mixed(FILE *f, uns return ret; } diff --git a/games/pcsxr/patches/pcsxr-fix-undefined-operations.patch b/games/pcsxr/patches/pcsxr-fix-undefined-operations.patch new file mode 100644 index 0000000000000..229bf3d91f830 --- /dev/null +++ b/games/pcsxr/patches/pcsxr-fix-undefined-operations.patch @@ -0,0 +1,193 @@ +diff --git a/pcsxr/plugins/peopsxgl/texture.c b/pcsxr/plugins/peopsxgl/texture.c +index 8d8fb41b..0d313b97 100644 +--- a/pcsxr/plugins/peopsxgl/texture.c ++++ b/pcsxr/plugins/peopsxgl/texture.c +@@ -1002,7 +1002,10 @@ void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy) + 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 pageid, int mode, short cx, short cy) + 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 pageid, int mode, short cx, short cy) + 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 pageid, int mode, short cx, short cy) + 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++; ++ } + } + } + } diff --git a/games/pcsxr/patches/pcsxr-remove-assertion-64bit.patch b/games/pcsxr/patches/pcsxr-remove-assertion-64bit.patch new file mode 100644 index 0000000000000..352c8036c2b06 --- /dev/null +++ b/games/pcsxr/patches/pcsxr-remove-assertion-64bit.patch @@ -0,0 +1,12 @@ +diff --git a/pcsxr/libpcsxcore/ix86_64/ix86-64.c b/pcsxr/libpcsxcore/ix86_64/ix86-64.c +index f48b742e..c69192e0 100644 +--- a/pcsxr/libpcsxcore/ix86_64/ix86-64.c ++++ b/pcsxr/libpcsxcore/ix86_64/ix86-64.c +@@ -231,7 +231,6 @@ void x86SetJ8( u8* j8 ) + + if ( jump > 0x7f ) { + SysPrintf( "j8 greater than 0x7f!!\n" ); +- assert(0); + } + *j8 = (u8)jump; + } diff --git a/games/pcsxr/pcsxr.SlackBuild b/games/pcsxr/pcsxr.SlackBuild index 3be0a3a6d58a0..18c6527ea981f 100644 --- a/games/pcsxr/pcsxr.SlackBuild +++ b/games/pcsxr/pcsxr.SlackBuild @@ -23,13 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pcsxr -VERSION=${VERSION:-1.9.93} +SRCNAM=PCSX-Reloaded +VERSION=${VERSION:-1.9.95} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,13 +70,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/pcsxr-fix-uncompress2.patch +patch -p1 < $CWD/patches/pcsxr-fix-undefined-operations.patch +patch -p1 < $CWD/patches/pcsxr-fix-uncompress2.patch +patch -p1 < $CWD/patches/pcsxr-remove-assertion-64bit.patch -CFLAGS="$SLKCFLAGS" \ +cd pcsxr +chmod +x autogen.sh + +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ -./autogen.sh -./configure \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ diff --git a/games/pcsxr/pcsxr.info b/games/pcsxr/pcsxr.info index d66defc2faa6a..3dc011dd0a435 100644 --- a/games/pcsxr/pcsxr.info +++ b/games/pcsxr/pcsxr.info @@ -1,8 +1,8 @@ PRGNAM="pcsxr" -VERSION="1.9.93" +VERSION="1.9.95" HOMEPAGE="https://github.com/mirror/pcsxr" -DOWNLOAD="https://sources.archlinux.org/other/community/pcsxr/pcsxr-1.9.93.tar.bz2" -MD5SUM="d75725b4c3fcb2cb11d39b3ace10dc31" +DOWNLOAD="https://github.com/frealgagu/PCSX-Reloaded/archive/1.9.95/PCSX-Reloaded-1.9.95.tar.gz" +MD5SUM="ee0f9dfd003d9a5350aafc8cca0cdeee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |