forked from pool/rpcs3
Accepting request 504855 from home:xenonpk
Include removed patch in changes OBS-URL: https://build.opensuse.org/request/show/504855 OBS-URL: https://build.opensuse.org/package/show/Emulators/rpcs3?expand=0&rev=2
This commit is contained in:
Klaus Kämpf
Git OBS Bridge
parent
12adcbf93e
commit
2ee547b3d4
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/RPCS3/rpcs3.git</param>
|
||||
<param name="changesrevision">a3d1f7b7b0fc77796a903ca1232c6747ef8d862c</param></service></servicedata>
|
||||
<param name="changesrevision">9cc52c75e30c434863f6bcf89205ff0178a7bb89</param></service></servicedata>
|
||||
48
cmake.patch
48
cmake.patch
@ -1,48 +0,0 @@
|
||||
---
|
||||
rpcs3/cmake_modules/ConfigureCompiler.cmake | 16 +---------------
|
||||
1 file changed, 1 insertion(+), 15 deletions(-)
|
||||
|
||||
diff --git a/rpcs3/cmake_modules/ConfigureCompiler.cmake b/rpcs3/cmake_modules/ConfigureCompiler.cmake
|
||||
index 42606144..d72de60c 100644
|
||||
--- a/rpcs3/cmake_modules/ConfigureCompiler.cmake
|
||||
+++ b/rpcs3/cmake_modules/ConfigureCompiler.cmake
|
||||
@@ -4,9 +4,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
# Get GCC version
|
||||
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
|
||||
OUTPUT_VARIABLE GCC_VERSION)
|
||||
- string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
|
||||
- list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
|
||||
- list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
|
||||
|
||||
# GCC 4.9 and lower are too old
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0)
|
||||
@@ -14,16 +11,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
"GCC ${CMAKE_CXX_COMPILER_VERSION} is too old.")
|
||||
endif()
|
||||
|
||||
- # FIXME: do we really need this?
|
||||
- # GCC 6.1 is insufficient to compile, because of a regression bug
|
||||
- #if(GCC_MAJOR EQUAL "6" AND GCC_MINOR EQUAL "1")
|
||||
- # message(FATAL_ERROR
|
||||
- # "GCC ${CMAKE_C_COMPILER_VERSION} is insufficient to build this project! "
|
||||
- # "If you need to compile with GCC, use GCC 5.4 or lower or GCC 6.2 or higher "
|
||||
- # "to build the project, or use CLANG instead. "
|
||||
- # "See this regression bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70869")
|
||||
- #endif()
|
||||
-
|
||||
# Set compiler options here
|
||||
|
||||
# Warnings
|
||||
@@ -41,8 +28,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
add_compile_options(-ftemplate-depth=1024)
|
||||
if(APPLE)
|
||||
add_compile_options(-stdlib=libc++)
|
||||
- endif()
|
||||
- if(WIN32)
|
||||
+ elseif(WIN32)
|
||||
add_compile_options(-pthread)
|
||||
endif()
|
||||
endif()
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cda61d41ef2cc39196535313526f171e04372481151d4ed409137801ca4bae18
|
||||
size 83904036
|
||||
3
rpcs3-0.0.2~git20170618.tar.xz
Normal file
3
rpcs3-0.0.2~git20170618.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:45c183f72661fd7f26a4a8f850acb73be1a5d78a9f27f8bc6b64b6b8da6fb4a8
|
||||
size 83668360
|
||||
@ -1,3 +1,47 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 19 07:46:17 UTC 2017 - pousaduarte@gmail.com
|
||||
|
||||
- Update to version 0.0.2~git20170618:
|
||||
* GUI: List SPRX modules only
|
||||
* Fix icon and exe name for VS. Rename old rpcs3 project. Restored original name for rpcs3_.rc to rpcs3.rc. Delete old wxWidgets/setup.h & FindwxWidgets.cmake.
|
||||
* Rename project rpcs3qt in rpcs3.
|
||||
* Fix refresh by having the save occur on accept instead of during the destructor.
|
||||
* EmuGameDir --> EmuConfigDir. Give QListWidget a parent to remove a slight memory leak.
|
||||
* Fix message shown when Qt 5 is missing (#2884)
|
||||
* Fix hex_to_bytes
|
||||
* Remove unneeded patch cmake.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 17 10:35:42 UTC 2017 - pousaduarte@gmail.com
|
||||
|
||||
- Update to version 0.0.2~git20170616:
|
||||
* Fix inconsistent selection in gamelist/grid (#2871)
|
||||
* Reimplement debugger resize & disassembly (#2876)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 15 10:35:07 UTC 2017 - pousaduarte@gmail.com
|
||||
|
||||
- Update to version 0.0.2~git20170615:
|
||||
* Include a VFS manipulation dialog (#2863)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 15 10:28:57 UTC 2017 - pousaduarte@gmail.com
|
||||
|
||||
- Update to version 0.0.2~git20170614:
|
||||
* Misc organizing and bug fixing
|
||||
* Disable LLVM option in PPU when RPCS3 is not built with it
|
||||
* Add automated qt5 tech support in CMake
|
||||
* Fix annoying cmake output.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 13 13:28:57 UTC 2017 - pousaduarte@gmail.com
|
||||
|
||||
- Update to version 0.0.2~git20170613:
|
||||
* Add ability to boot elves in command line. (#2859)
|
||||
* Implement strncasecmp and strrchr
|
||||
* Update Icons provided by Discord user rutantan (#2862)
|
||||
* Dx12/Vulk: Fix KernelBase.dll crash (#2870)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 12 09:49:23 UTC 2017 - pousaduarte@gmail.com
|
||||
|
||||
|
||||
10
rpcs3.spec
10
rpcs3.spec
@ -17,13 +17,12 @@
|
||||
|
||||
|
||||
Name: rpcs3
|
||||
Version: 0.0.2~git20170611
|
||||
Version: 0.0.2~git20170618
|
||||
Release: 0
|
||||
Summary: PS3 emulator/debugger
|
||||
License: GPL-2.0
|
||||
Url: https://rpcs3.net/
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Patch0: cmake.patch
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
@ -61,9 +60,8 @@ An open-source PlayStation 3 emulator/debugger written in C++.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
#Exclude -lLLVM from linker flags
|
||||
sed -i 's|set(LLVM_LIBS LLVM)|set(LLVM_LIBS)|g' %{name}/CMakeLists.txt
|
||||
#Exclude -lLLVM from linker flags and fix Qt5 version limitations
|
||||
sed -i -e 's|set(LLVM_LIBS LLVM)|set(LLVM_LIBS)|g' -e 's|Qt5 5.8|Qt5|g' -e 's|VERSION_LESS 5.8.0|VERSION_LESS 5.7.1|g' %{name}/CMakeLists.txt
|
||||
|
||||
%build
|
||||
cmake . \
|
||||
@ -75,7 +73,7 @@ cmake . \
|
||||
-DCMAKE_CXX_FLAGS="%{optflags}" \
|
||||
-DCMAKE_BUILD_TYPE="RelWithDebugInfo" \
|
||||
-DCMAKE_SKIP_RPATH="YES" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="-ldl -lyaml-cpp $(llvm-config --libs mcjit vectorize ipo x86codegen x86disassembler)"
|
||||
-DCMAKE_EXE_LINKER_FLAGS="$(llvm-config --libs mcjit vectorize ipo x86codegen x86disassembler)"
|
||||
|
||||
%make_jobs
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user