From aa01cb677f596fdcc7a4a9aca3c4e392e42c85e5 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 4 Jan 2018 11:33:40 +0100 Subject: [PATCH] pcsxr: rebuild against libcdio-2.0.0 also adds cdriso uncompress2 fix from upstream git --- .../cdriso-uncompress2-fix-mgorny.patch | 34 +++++++++++++++++++ srcpkgs/pcsxr/template | 4 +-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/pcsxr/patches/cdriso-uncompress2-fix-mgorny.patch diff --git a/srcpkgs/pcsxr/patches/cdriso-uncompress2-fix-mgorny.patch b/srcpkgs/pcsxr/patches/cdriso-uncompress2-fix-mgorny.patch new file mode 100644 index 00000000000..e799673f1ca --- /dev/null +++ b/srcpkgs/pcsxr/patches/cdriso-uncompress2-fix-mgorny.patch @@ -0,0 +1,34 @@ +From 6484236cb0281e8040ff6c8078c87899a3407534 Mon Sep 17 00:00:00 2001 +From: edgbla +Date: Sun, 19 Feb 2017 00:40:07 +0300 +Subject: [PATCH] cdriso uncompress2 fix (mgorny); + +--- + pcsxr/libpcsxcore/cdriso.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c +index 318f5ea7..4d6c3370 100644 +--- libpcsxcore/cdriso.c ++++ libpcsxcore/cdriso.c +@@ -1219,7 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) + return ret; + } + +-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) ++static int uncompress2_internal(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; + int ret = 0; +@@ -1298,7 +1298,7 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) + if (is_compressed) { + cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; + cdbuffer_size = cdbuffer_size_expect; +- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); ++ ret = uncompress2_internal(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); + if (ret != 0) { + SysPrintf("uncompress failed with %d for block %d, sector %d\n", + ret, block, sector); +-- +2.15.1 + diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template index 58bea4a0a21..d8537978345 100644 --- a/srcpkgs/pcsxr/template +++ b/srcpkgs/pcsxr/template @@ -1,7 +1,7 @@ # Template file for 'pcsxr' pkgname=pcsxr version=1.9.93 -revision=4 +revision=5 lib32disabled=yes wrksrc="${pkgname}" build_style=gnu-configure @@ -11,7 +11,7 @@ makedepends="libXv-devel libcdio-devel SDL-devel gtk+3-devel" depends="desktop-file-utils" short_desc="A Sony PlayStation (PSX) emulator based on the PCSX-df project" maintainer="Juan RP " -license="GPL" +license="GPL-3" homepage="http://pcsxr.codeplex.com/" distfiles="https://sources.archlinux.org/other/community/pcsxr/pcsxr-${version}.tar.bz2" checksum=4d114bb8cd6a278d28c35020d62b928be4be7d6a1d45d7da3c808e4a4681fd9d