Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd6fbbd041ff03b93b5d917dfa2bb54083e9ac67
commit bd6fbbd041ff03b93b5d917dfa2bb54083e9ac67 Author: Marius Cirsta <[email protected]> Date: Tue Dec 15 03:29:35 2015 +0200 pcsx2-1.3.1-1-x86_64 * version bump * i686 only for now diff --git a/source/games-extra/pcsx2/0001-common-fix-gcc-5.0-issue.patch b/source/games-extra/pcsx2/0001-common-fix-gcc-5.0-issue.patch new file mode 100644 index 0000000..706fd72 --- /dev/null +++ b/source/games-extra/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 <[email protected]> +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/source/games-extra/pcsx2/FrugalBuild b/source/games-extra/pcsx2/FrugalBuild index db18150..9b63369 100644 --- a/source/games-extra/pcsx2/FrugalBuild +++ b/source/games-extra/pcsx2/FrugalBuild @@ -1,41 +1,37 @@ # Compiling Time: 0 SBU # Maintainer: James Buren <[email protected]> -options+=('asneeded') pkgname=pcsx2 -pkgver=1.2.2 -pkgrel=4 +pkgver=1.3.1 +pkgrel=1 pkgdesc="A Playstation 2 emulator." url="http://pcsx2.net"; -depends=('wxgtk28' 'soundtouch' 'portaudio' 'nvidia-cg-toolkit' 'glew>=1.13') +depends=('wxwidgets' 'soundtouch' 'portaudio' 'nvidia-cg-toolkit' 'glew>=1.13') makedepends=('7zip' 'google-sparsehash' 'subversion') -_F_github_author="PCSX2" -_F_github_name="pcsx2" -_F_github_tag="yes" -_F_fw32build_desktop_icon="$_F_fw32_dir/usr/share/pixmaps/$pkgname.xpm" -Finclude github cmake fw32build groups=('games-extra') -archs=('i686' 'x86_64') -up2date="$up2date | sed 's/v//'" -source=(https://github.com/PCSX2/pcsx2/archive/v$pkgver.tar.gz) -_F_cmake_confopts='-DFORCE_INTERNAL_SDL=FALSE -DFORCE_INTERNAL_ZLIB=FALSE -DFORCE_INTERNAL_SOUNDTOUCH=FALSE -DPACKAGE_MODE=TRUE -DGAMEINDEX_DIR=/usr/share/pcsx2 -DGLSL_SHADER_DIR=/usr/share/pcsx2 -DGLSL_SHADER_DIR=/usr/share/pcsx2 -DXDG_STD=TRUE \ - -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'' -_F_cmake_type='Release' +archs=('i686') +_F_cmake_confopts=' -DFORCE_INTERNAL_SDL=FALSE \ + -DFORCE_INTERNAL_ZLIB=FALSE \ + -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ + -DPACKAGE_MODE=TRUE \ + -DGAMEINDEX_DIR=/usr/share/pcsx2 \ + -DGLSL_SHADER_DIR=/usr/share/pcsx2 \ + -DGLSL_SHADER_DIR=/usr/share/pcsx2 \ + -DXDG_STD=TRUE ' # Disable our optimizations. This package is sensitive to them and defines its own. unset CFLAGS CXXFLAGS -sha1sums=('755a054c1dc5727d13f7aad9713d0c4219ef4896') +_F_github_author="PCSX2" +_F_github_name="pcsx2" +_F_github_tag="yes" +_F_github_tag_v="yes" +Finclude github cmake +source=(${source[@]} 0001-common-fix-gcc-5.0-issue.patch) +sha1sums=('8723b3a152e89b73889bbef238024c9d87d58757' \ + 'ade67c0a5d2b03c8bfd06377304478a5fee0f207') replaces=('pcsxr') conflicts=("${replaces[@]}") provides=("${provides[@]}") -build() -{ - if [ "$CARCH" == "x86_64" ] ; then - Fw32_build - else - CMake_build - fi -} # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
