Hello community,
here is the log from the commit of package libretro-pcsx_rearmed for
openSUSE:Factory checked in at 2017-06-01 16:34:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libretro-pcsx_rearmed (Old)
and /work/SRC/openSUSE:Factory/.libretro-pcsx_rearmed.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libretro-pcsx_rearmed"
Thu Jun 1 16:34:18 2017 rev:4 rq:500161 version:0~20160921.9766e77
Changes:
--------
---
/work/SRC/openSUSE:Factory/libretro-pcsx_rearmed/libretro-pcsx_rearmed.changes
2017-02-18 03:19:08.280021774 +0100
+++
/work/SRC/openSUSE:Factory/.libretro-pcsx_rearmed.new/libretro-pcsx_rearmed.changes
2017-06-01 16:34:21.045441079 +0200
@@ -1,0 +2,5 @@
+Wed May 31 13:20:12 UTC 2017 - [email protected]
+
+- add uncompress2-rename-to-static.patch (bsc#1041294)
+
+-------------------------------------------------------------------
New:
----
uncompress2-rename-to-static.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libretro-pcsx_rearmed.spec ++++++
--- /var/tmp/diff_new_pack.gLlVod/_old 2017-06-01 16:34:22.005305678 +0200
+++ /var/tmp/diff_new_pack.gLlVod/_new 2017-06-01 16:34:22.009305114 +0200
@@ -26,6 +26,8 @@
Source: pcsx_rearmed-%{version}.tar.xz
Source1: pcsx_rearmed.libretro
Source2: pcsx_rearmed-Makefile.install
+# PATCH-FIX-OPENSUSE uncompress2-rename-to-static.patch rename static
uncompress2 to prevent conflict with zlib.h declaration
+Patch1: uncompress2-rename-to-static.patch
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -36,6 +38,7 @@
%prep
%setup -q -n pcsx_rearmed-%{version}
cp %{S:2} Makefile.install
+%patch1 -p1
%build
make %{?_smp_mflags} --makefile=Makefile.install prefix=%{_prefix}
core_installdir=%{_libdir}/libretro/
++++++ uncompress2-rename-to-static.patch ++++++
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
-x .deps -x .libs ../orig-pcsx_rearmed-0~20160921.9766e77/libpcsxcore/cdriso.c
./libpcsxcore/cdriso.c
--- ../orig-pcsx_rearmed-0~20160921.9766e77/libpcsxcore/cdriso.c
2016-09-21 01:24:37.000000000 +0200
+++ ./libpcsxcore/cdriso.c 2017-05-31 14:24:00.120846983 +0200
@@ -1093,7 +1093,7 @@
return ret;
}
-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned
long in_size)
+static int uncompress2_static(void *out, unsigned long *out_size, void *in,
unsigned long in_size)
{
static z_stream z;
int ret = 0;
@@ -1173,7 +1173,7 @@
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_static(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);
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
-x .deps -x .libs
../orig-pcsx_rearmed-0~20160921.9766e77/plugins/cdrcimg/cdrcimg.c
./plugins/cdrcimg/cdrcimg.c
--- ../orig-pcsx_rearmed-0~20160921.9766e77/plugins/cdrcimg/cdrcimg.c
2016-09-21 01:24:37.000000000 +0200
+++ ./plugins/cdrcimg/cdrcimg.c 2017-05-31 15:19:18.584107439 +0200
@@ -100,7 +100,7 @@
return 0;
}
-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long
in_size)
+static int uncompress2_static(void *out, unsigned long *out_size, void *in,
unsigned long in_size)
{
static z_stream z;
int ret = 0;
@@ -201,7 +201,7 @@
ret = uncompress(cdbuffer->raw[0], &cdbuffer_size,
cdbuffer->compressed, size);
break;
case CDRC_ZLIB2:
- ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size,
cdbuffer->compressed, size);
+ ret = uncompress2_static(cdbuffer->raw[0], &cdbuffer_size,
cdbuffer->compressed, size);
break;
case CDRC_BZ:
ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw,
(unsigned int *)&cdbuffer_size,
