Date: Monday, December 7, 2015 @ 21:42:21 Author: fyan Revision: 150116
archrelease: copy trunk to multilib-staging-x86_64 Added: pcsx2/repos/multilib-staging-x86_64/ pcsx2/repos/multilib-staging-x86_64/0001-common-fix-gcc-5.0-issue.patch (from rev 150115, pcsx2/trunk/0001-common-fix-gcc-5.0-issue.patch) pcsx2/repos/multilib-staging-x86_64/PKGBUILD (from rev 150115, pcsx2/trunk/PKGBUILD) -------------------------------------+ 0001-common-fix-gcc-5.0-issue.patch | 89 ++++++++++++++++++++++++++++++++++ PKGBUILD | 83 +++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) Copied: pcsx2/repos/multilib-staging-x86_64/0001-common-fix-gcc-5.0-issue.patch (from rev 150115, pcsx2/trunk/0001-common-fix-gcc-5.0-issue.patch) =================================================================== --- multilib-staging-x86_64/0001-common-fix-gcc-5.0-issue.patch (rev 0) +++ multilib-staging-x86_64/0001-common-fix-gcc-5.0-issue.patch 2015-12-07 20:42:21 UTC (rev 150116) @@ -0,0 +1,89 @@ +From 87bcb465c6c2238137dbf99890e9032930a5f6cd Mon Sep 17 00:00:00 2001 +From: Gregory Hainaut <gregory.hain...@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 + Copied: pcsx2/repos/multilib-staging-x86_64/PKGBUILD (from rev 150115, pcsx2/trunk/PKGBUILD) =================================================================== --- multilib-staging-x86_64/PKGBUILD (rev 0) +++ multilib-staging-x86_64/PKGBUILD 2015-12-07 20:42:21 UTC (rev 150116) @@ -0,0 +1,83 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: josephgbr <rafael.f...@gmail.com> +# Contributor: vEX <v...@niechift.com> + +pkgname=pcsx2 +pkgver=1.3.1 +pkgrel=6 +pkgdesc='A Sony PlayStation 2 emulator' +arch=('i686' 'x86_64') +url='http://www.pcsx2.net' +license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') +depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' + 'portaudio' 'sdl' 'soundtouch' 'wxgtk') +depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' + 'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' + 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk') +makedepends=('cmake') +makedepends_x86_64=('gcc-multilib') +optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' + 'lib32-gtk-engine-murrine: Murrine GTK3 engine support' + 'lib32-gtk-engine-unico: Unico GTK2 engine support') +options=('!emptydirs') +source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz" + '0001-common-fix-gcc-5.0-issue.patch') +sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9' + 'dc3bdfaea2e024da1d16dd6142030b13b3e2a4540ba1685399e3109d026866c4') + +prepare() { + cd pcsx2-${pkgver} + + # 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() { + cd pcsx2-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + if [[ $CARCH == i686 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib' \ + -DPLUGIN_DIR='/usr/lib/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DDISABLE_ADVANCE_SIMD='TRUE' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' + elif [[ $CARCH == x86_64 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib32' \ + -DPLUGIN_DIR='/usr/lib32/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DDISABLE_ADVANCE_SIMD='TRUE' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' + fi + + make +} + +package() { + cd pcsx2-${pkgver}/build + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: