Author: jem256 Update of /cvs/nonfree/rpms/dolphin-emu/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2434/F-18 Modified Files: .cvsignore dolphin-emu.spec sources Added Files: dolphin-emu-3.5-clrun.patch dolphin-emu-3.5-wx28.patch Removed Files: dolphin-emu-3.0-clrun.patch dolphin-emu-3.0-gcc-4.7.patch Log Message: Update to latest stable version dolphin-emu-3.5-clrun.patch: CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) --- NEW FILE dolphin-emu-3.5-clrun.patch --- diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt --- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/CMakeLists.txt 2013-02-20 14:04:51.356373309 -0500 @@ -477,10 +477,21 @@ else() check_lib(CGGL CgGL Cg/cgGL.h) endif() -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - find_library(CL OpenCL) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL") -else() +if(UNIX) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") #If OSX + find_library(CL OpenCL) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL") + else() #If Unix-like/Linux + option(USE_EXTERNAL_CLRUN "Enables use of an externel CLRun library (CLRUN_INCLUDE_PATH needs to be defined)" OFF) + if(USE_EXTERNAL_CLRUN) + find_library(CL clrun) + include_directories("${CLRUN_INCLUDE_PATH}") + else(USE_EXTERNAL_CLRUN) + include_directories(Externals/CLRun/include) + add_subdirectory(Externals/CLRun) + endif(USE_EXTERNAL_CLRUN) + endif() +else() #If Windows include_directories(Externals/CLRun/include) add_subdirectory(Externals/CLRun) endif() dolphin-emu-3.5-wx28.patch: CMakeLists.txt | 2 - Source/Core/DolphinWX/Src/Frame.cpp | 2 - Source/Core/DolphinWX/Src/GameListCtrl.cpp | 6 ++--- Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 ----- Source/Core/DolphinWX/Src/Main.cpp | 32 ++++++++++++++-------------- Source/Core/DolphinWX/Src/NetWindow.cpp | 1 Source/Core/DolphinWX/Src/WXInputBase.cpp | 2 - 7 files changed, 24 insertions(+), 27 deletions(-) --- NEW FILE dolphin-emu-3.5-wx28.patch --- diff -rupN dolphin-emu-3.5.orig/CMakeLists.txt dolphin-emu-3.5/CMakeLists.txt --- dolphin-emu-3.5.orig/CMakeLists.txt 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/CMakeLists.txt 2013-02-19 18:58:51.099823833 -0500 @@ -500,7 +500,7 @@ if(NOT DISABLE_WX) ) message("Found wxWidgets version ${wxWidgets_VERSION}") if(UNIX AND NOT APPLE) - set(wxMIN_VERSION "2.9.3") + set(wxMIN_VERSION "2.8.12") else() set(wxMIN_VERSION "2.9.4") endif() diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp --- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Frame.cpp 2013-02-19 19:17:59.323425042 -0500 @@ -753,7 +753,7 @@ void CFrame::OnGameListCtrl_ItemActivate bool IsHotkey(wxKeyEvent &event, int Id) { - return (event.GetKeyCode() != WXK_NONE && + return (event.GetKeyCode() && event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); } diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp --- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/GameListCtrl.cpp 2013-02-19 19:23:14.454606065 -0500 @@ -593,9 +593,9 @@ void CGameListCtrl::ScanForISOs() SplitPath(rFilenames[i], NULL, &FileName, NULL); // Update with the progress (i) and the message - dialog.Update(i, wxString::Format(_("Scanning %s"), - wxString(FileName.c_str(), *wxConvCurrent).c_str())); - if (dialog.WasCancelled()) + bool Cont = dialog.Update(i, + wxString::Format(_("Scanning %s"), wxString(FileName.c_str(), *wxConvCurrent).c_str())); + if (!Cont) break; std::auto_ptr<GameListItem> iso_file(new GameListItem(rFilenames[i])); diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp --- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/ISOProperties.cpp 2013-02-19 19:27:50.417130313 -0500 @@ -740,11 +740,7 @@ void CISOProperties::ExportDir(const cha { dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(), (u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100))); - - dialog.Update(i, wxString::Format(_("Extracting %s"), - wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())); - - if (dialog.WasCancelled()) + if (!dialog.Update(i, wxString::Format(_("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str()))) break; if (fst[i]->IsDirectory()) diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp --- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/Main.cpp 2013-02-19 19:40:17.136618692 -0500 @@ -114,38 +114,38 @@ bool DolphinApp::OnInit() wxCmdLineEntryDesc cmdLineDesc[] = { { - wxCMD_LINE_SWITCH, "h", "help", - "Show this help message", + wxCMD_LINE_SWITCH, wxS("h"), wxS("help"), + wxS("Show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { - wxCMD_LINE_SWITCH, "d", "debugger", - "Opens the debugger", + wxCMD_LINE_SWITCH, wxS("d"), wxS("debugger"), + wxS("Opens the debugger"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_SWITCH, "l", "logger", - "Opens the logger", + wxCMD_LINE_SWITCH, wxS("l"), wxS("logger"), + wxS("Opens the logger"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, "e", "exec", - "Loads the specified file (DOL,ELF,GCM,ISO,WAD)", + wxCMD_LINE_OPTION, wxS("e"), wxS("exec"), + wxS("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_SWITCH, "b", "batch", - "Exit Dolphin with emulator", + wxCMD_LINE_SWITCH, wxS("b"), wxS("batch"), + wxS("Exit Dolphin with emulator"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, "V", "video_backend", - "Specify a video backend", + wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"), + wxS("Specify a video backend"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { - wxCMD_LINE_OPTION, "A", "audio_emulation", - "Low level (LLE) or high level (HLE) audio", + wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"), + wxS("Low level (LLE) or high level (HLE) audio"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { @@ -237,9 +237,9 @@ bool DolphinApp::OnInit() if (selectAudioEmulation) { - if (audioEmulationName == "HLE") + if (audioEmulationName == wxS("HLE")) SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true; - else if (audioEmulationName == "LLE") + else if (audioEmulationName == wxS("LLE")) SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false; } diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp --- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/NetWindow.cpp 2013-02-19 19:43:23.706012655 -0500 @@ -29,6 +29,7 @@ #define NETPLAY_TITLEBAR "Dolphin NetPlay" +DEFINE_EVENT_TYPE(wxEVT_THREAD) BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread) END_EVENT_TABLE() diff -rupN dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp --- dolphin-emu-3.5.orig/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 18:38:35.000000000 -0500 +++ dolphin-emu-3.5/Source/Core/DolphinWX/Src/WXInputBase.cpp 2013-02-19 19:46:24.058458372 -0500 @@ -43,7 +43,7 @@ const wxString WXKeyToString(int keycode case WXK_CLEAR: return _("Clear"); case WXK_SHIFT: return wxT("Shift"); case WXK_ALT: return wxT("Alt"); - case WXK_RAW_CONTROL: return _("Control"); + case WXK_CONTROL: return _("Control"); #ifdef __WXOSX__ case WXK_COMMAND: return _("Command"); #endif Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jul 2012 15:48:10 -0000 1.2 +++ .cvsignore 23 Feb 2013 16:52:41 -0000 1.3 @@ -1,2 +1,2 @@ -dolphin-emu-3.0.tar.xz +dolphin-emu-3.5.tar.xz dolphin-emu-extra.tar.xz Index: dolphin-emu.spec =================================================================== RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/dolphin-emu.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dolphin-emu.spec 16 Feb 2013 16:12:00 -0000 1.3 +++ dolphin-emu.spec 23 Feb 2013 16:52:42 -0000 1.4 @@ -1,6 +1,6 @@ Name: dolphin-emu -Version: 3.0 -Release: 12%{?dist} +Version: 3.5 +Release: 1%{?dist} Summary: Gamecube / Wii / Triforce Emulator Url: http://www.dolphin-emulator.com/ @@ -17,9 +17,8 @@ Source1: %{name}-extra.tar.xz #Kudos to Richard on this one (allows for shared clrun lib): Patch0: %{name}-%{version}-clrun.patch -#Build fix for gcc 4.7.0 (backwards compatible) -#Note this is already fixed in the unstable version -Patch1: %{name}-%{version}-gcc-4.7.patch +#Allows for building with wxwidget 2.8.12, rather than 2.9.3 +Patch1: %{name}-%{version}-wx28.patch # Dolphin only runs on Intel x86 archictures ExclusiveArch: i686 x86_64 @@ -60,7 +59,7 @@ %prep %setup -q -a 1 %patch0 -p1 -b .clrun -%patch1 -p1 -b .gcc470 +%patch1 -p1 -b .wx28 sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt #Remove all Bundled Libraries except Bochs: @@ -98,8 +97,6 @@ %{name}-extra/%{name}.desktop install -p -D -m 0644 %{name}-extra/%{name}.1 \ %{buildroot}/%{_mandir}/man1/%{name}.1 -#This zerolength file has no purpose and removed in the unstable version: -rm -f %{buildroot}/%{_datadir}/%{name}/user/GameConfig/WBEEJV.ini %find_lang %{name} %files -f %{name}.lang @@ -124,6 +121,10 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Feb 19 2013 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 3.5-1 +- Updated to latest stable: removed GCC patch, updated CLRun patch +- Added patch to build on wxwidgets 2.8 (temporary workaround) + * Sat Feb 16 2013 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 3.0-12 - Removed patch for libav and disabled ffmpeg, caused rendering issues - Minor consistency fixes to SPEC file Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jul 2012 15:48:10 -0000 1.2 +++ sources 23 Feb 2013 16:52:42 -0000 1.3 @@ -1,2 +1,2 @@ -6fb4c50ddb22cd6413b24ac76bd2735f dolphin-emu-3.0.tar.xz -9c4335d15000b73a81ee9b00202866e3 dolphin-emu-extra.tar.xz +1e07d6c93da0f7bea95d3910540cf979 dolphin-emu-3.5.tar.xz +f9cddcbc0e00e4d19465fc23542ac2bd dolphin-emu-extra.tar.xz --- dolphin-emu-3.0-clrun.patch DELETED --- --- dolphin-emu-3.0-gcc-4.7.patch DELETED ---