diff options
| -rw-r--r-- | libre-multilib/pcsx2/0001-common-fix-gcc-5.0-issue.patch | 89 | ||||
| -rw-r--r-- | libre-multilib/pcsx2/PKGBUILD | 16 |
2 files changed, 100 insertions, 5 deletions
diff --git a/libre-multilib/pcsx2/0001-common-fix-gcc-5.0-issue.patch b/libre-multilib/pcsx2/0001-common-fix-gcc-5.0-issue.patch new file mode 100644 index 000000000..706fd722c --- /dev/null +++ b/libre-multilib/pcsx2/0001-common-fix-gcc-5.0-issue.patch @@ -0,0 +1,89 @@ +From 87bcb465c6c2238137dbf99890e9032930a5f6cd Mon Sep 17 00:00:00 2001 +From: Gregory Hainaut <gregory.hainaut@gmail.com> +Date: Wed, 27 May 2015 18:20:06 +0200 +Subject: [PATCH] common: fix gcc 5.0 issue + +Don't use const for variable object + +Close issue #560 +--- + common/include/Utilities/Console.h | 8 ++++---- + common/src/Utilities/Console.cpp | 14 +++++++------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/common/include/Utilities/Console.h b/common/include/Utilities/Console.h +index a4fb75f..3cec159 100644 +--- a/common/include/Utilities/Console.h ++++ b/common/include/Utilities/Console.h +@@ -236,7 +236,7 @@ public: + virtual ~ConsoleAttrScope() throw(); + }; + +-extern const IConsoleWriter Console; ++extern IConsoleWriter Console; + + extern void Console_SetActiveHandler( const IConsoleWriter& writer, FILE* flushfp=NULL ); + extern const wxString& ConsoleBuffer_Get(); +@@ -249,9 +249,9 @@ extern const IConsoleWriter ConsoleWriter_Assert; + extern const IConsoleWriter ConsoleWriter_Buffered; + extern const IConsoleWriter ConsoleWriter_wxError; + +-extern const NullConsoleWriter NullCon; ++extern NullConsoleWriter NullCon; + +-extern const IConsoleWriter DevConWriter; ++extern IConsoleWriter DevConWriter; + extern bool DevConWriterEnabled; + + #ifdef PCSX2_DEVBUILD +@@ -261,7 +261,7 @@ extern bool DevConWriterEnabled; + #endif + + #ifdef PCSX2_DEBUG +-extern const IConsoleWriter DbgConWriter; ++extern IConsoleWriter DbgConWriter; + # define DbgCon DbgConWriter + #else + # define DbgCon 0&&NullCon +diff --git a/common/src/Utilities/Console.cpp b/common/src/Utilities/Console.cpp +index 956a295..3ff0469 100644 +--- a/common/src/Utilities/Console.cpp ++++ b/common/src/Utilities/Console.cpp +@@ -55,11 +55,11 @@ void Console_SetActiveHandler( const IConsoleWriter& writer, FILE* flushfp ) + writer.DoWriteLn( ConsoleBuffer_Get() ); + } + +- const_cast<IConsoleWriter&>(Console) = writer; +- const_cast<IConsoleWriter&>(DevConWriter) = writer; ++ Console = writer; ++ DevConWriter = writer; + + #ifdef PCSX2_DEBUG +- const_cast<IConsoleWriter&>(DbgCon) = writer; ++ DbgCon = writer; + #endif + } + +@@ -597,15 +597,15 @@ ConsoleAttrScope::~ConsoleAttrScope() throw() + // + #define _DefaultWriter_ ConsoleWriter_Stdout + +-const IConsoleWriter Console = _DefaultWriter_; +-const IConsoleWriter DevConWriter = _DefaultWriter_; ++IConsoleWriter Console = _DefaultWriter_; ++IConsoleWriter DevConWriter = _DefaultWriter_; + bool DevConWriterEnabled = false; + + #ifdef PCSX2_DEBUG +-const IConsoleWriter DbgConWriter = _DefaultWriter_; ++IConsoleWriter DbgConWriter = _DefaultWriter_; + #endif + +-const NullConsoleWriter NullCon = {}; ++NullConsoleWriter NullCon = {}; + + // -------------------------------------------------------------------------------------- + // ConsoleLogSource (implementations) +-- +2.5.3 + diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index 6b74c98ff..44e9fe297 100644 --- a/libre-multilib/pcsx2/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142216 2015-09-29 07:58:48Z fyan $ +# $Id: PKGBUILD 143013 2015-10-05 15:27:23Z foutrelis $ # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org> # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com> # Contributor (Arch): vEX <vex@niechift.com> @@ -6,7 +6,7 @@ pkgname=pcsx2 pkgver=1.3.1 -pkgrel=4.parabola1 +pkgrel=5.parabola1 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' arch=('i686' 'x86_64') url='http://www.pcsx2.net' @@ -24,14 +24,20 @@ optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' conflicts=("${pkgname}-libre") replaces=("${pkgname}-libre") options=('!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz") -sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/PCSX2/${pkgname}/archive/v${pkgver}.tar.gz" + '0001-common-fix-gcc-5.0-issue.patch') +sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9' + 'dc3bdfaea2e024da1d16dd6142030b13b3e2a4540ba1685399e3109d026866c4') prepare() { cd ${pkgname}-${pkgver} - # remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit) + # Remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit) rm -vr plugins/{zerogs,zzogl-pg} sed -i '\|zz_res =|,+4 d' linux_various/glsl2h.pl + + # Fix startup crash with GCC 5.1 + # https://github.com/PCSX2/pcsx2/issues/560 + patch -Np1 -i ../0001-common-fix-gcc-5.0-issue.patch } build() { |