This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch master in repository dolphin-emu.
commit d12a4c434bf960fd975c605b620723c0adf90b39 Author: James Cowgill <[email protected]> Date: Sun Nov 23 18:29:51 2014 +0000 Refreshed SFML patches and added patch headers --- debian/patches/08_cmake-sfml-fixes.patch | 25 ++++ ...80_sfml-use-2.1.patch => 09_sfml-use-2.1.patch} | 162 +++++++++------------ debian/patches/37_cmake-sfml-fixes.patch | 26 ---- debian/patches/series | 4 +- 4 files changed, 99 insertions(+), 118 deletions(-) diff --git a/debian/patches/08_cmake-sfml-fixes.patch b/debian/patches/08_cmake-sfml-fixes.patch new file mode 100644 index 0000000..804b9e6 --- /dev/null +++ b/debian/patches/08_cmake-sfml-fixes.patch @@ -0,0 +1,25 @@ +Description: Add info so that package links SFML successfully with newer gcc versions. +Author: Brandon Barnes <[email protected]> +Forwarded: no + +--- a/Source/Core/Core/CMakeLists.txt ++++ b/Source/Core/Core/CMakeLists.txt +@@ -220,7 +220,7 @@ if(_M_ARM) + Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp) + endif() + +-set(LIBS bdisasm inputcommon videosoftware sfml-network) ++set(LIBS bdisasm inputcommon videosoftware sfml-network sfml-system) + + if(NOT USE_GLES OR USE_GLES3) + set(LIBS ${LIBS} videoogl) +--- a/Source/Core/DolphinWX/CMakeLists.txt ++++ b/Source/Core/DolphinWX/CMakeLists.txt +@@ -11,6 +11,7 @@ set(LIBS core + audiocommon + z + sfml-network ++ sfml-system + ${GTK2_LIBRARIES}) + + if(NOT ANDROID) diff --git a/debian/patches/80_sfml-use-2.1.patch b/debian/patches/09_sfml-use-2.1.patch similarity index 79% rename from debian/patches/80_sfml-use-2.1.patch rename to debian/patches/09_sfml-use-2.1.patch index 10d2e24..3d24cd6 100644 --- a/debian/patches/80_sfml-use-2.1.patch +++ b/debian/patches/09_sfml-use-2.1.patch @@ -1,9 +1,11 @@ -Use SFML 2.1 instead of SFML 1.6. -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/NetPlayClient.cpp 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp 2013-11-30 22:07:24.051135120 -0800 -@@ -65,19 +65,18 @@ +Description: Use SFML 2.1 instead of SFML 1.6. + A modified version updated to use C++11 was forwarded upstream by James Cowgill. +Author: Brandon Barnes <[email protected]> +Forwarded: https://github.com/dolphin-emu/dolphin/pull/1522 + +--- a/Source/Core/Core/Src/NetPlayClient.cpp ++++ b/Source/Core/Core/Src/NetPlayClient.cpp +@@ -65,19 +65,18 @@ NetPlayClient::NetPlayClient(const std:: is_connected = false; @@ -26,7 +28,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp MessageId error; rpac >> error; -@@ -99,7 +98,7 @@ +@@ -99,7 +98,7 @@ NetPlayClient::NetPlayClient(const std:: PanicAlertT("The server sent an unknown error message!"); break; } @@ -35,7 +37,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp } else { -@@ -119,7 +118,7 @@ +@@ -119,7 +118,7 @@ NetPlayClient::NetPlayClient(const std:: //PanicAlertT("Connection successful: assigned player id: %d", m_pid); is_connected = true; @@ -44,7 +46,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this); } } -@@ -273,7 +272,7 @@ +@@ -273,7 +272,7 @@ unsigned int NetPlayClient::OnData(sf::P spac << ping_key; std::lock_guard<std::recursive_mutex> lks(m_crit.send); @@ -53,7 +55,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp } break; -@@ -306,10 +305,10 @@ +@@ -306,10 +305,10 @@ void NetPlayClient::ThreadFunc() { while (m_do_loop) { @@ -66,7 +68,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp { case sf::Socket::Done : OnData(rpac); -@@ -327,7 +326,7 @@ +@@ -327,7 +326,7 @@ void NetPlayClient::ThreadFunc() } } @@ -75,7 +77,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp return; } -@@ -383,7 +382,7 @@ +@@ -383,7 +382,7 @@ void NetPlayClient::SendChatMessage(cons spac << msg; std::lock_guard<std::recursive_mutex> lks(m_crit.send); @@ -84,7 +86,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp } // called from ---CPU--- thread -@@ -396,7 +395,7 @@ +@@ -396,7 +395,7 @@ void NetPlayClient::SendPadState(const P spac << np.nHi << np.nLo; std::lock_guard<std::recursive_mutex> lks(m_crit.send); @@ -93,7 +95,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp } // called from ---GUI--- thread -@@ -411,7 +410,7 @@ +@@ -411,7 +410,7 @@ bool NetPlayClient::StartGame(const std: spac << (char *)&g_NetPlaySettings; std::lock_guard<std::recursive_mutex> lks(m_crit.send); @@ -102,7 +104,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp if (m_is_running) { -@@ -619,7 +618,7 @@ +@@ -619,7 +618,7 @@ void NetPlayClient::Stop() { sf::Packet spac; spac << (MessageId)NP_MSG_STOP_GAME; @@ -111,11 +113,9 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.cpp } } -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.h -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/NetPlayClient.h 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.h 2013-11-30 22:07:24.055135120 -0800 -@@ -101,9 +101,9 @@ +--- a/Source/Core/Core/Src/NetPlayClient.h ++++ b/Source/Core/Core/Src/NetPlayClient.h +@@ -101,9 +101,9 @@ protected: NetWiimote m_wiimote_input[4]; NetPlayUI* m_dialog; @@ -127,11 +127,9 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayClient.h std::string m_selected_game; volatile bool m_is_running; -Index: dolphin-emu-4.0.2/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp 2013-11-30 22:07:24.055135120 -0800 -@@ -160,20 +160,20 @@ +--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp ++++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +@@ -160,20 +160,20 @@ void CodeConfigPanel::DownloadCodes(wxCo } sf::Http::Request req; @@ -157,11 +155,9 @@ Index: dolphin-emu-4.0.2/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp // debug //PanicAlert("File size is %i bytes.", ss.str().size()); -Index: dolphin-emu-4.0.2/CMakeLists.txt -=================================================================== ---- dolphin-emu-4.0.2.orig/CMakeLists.txt 2013-11-30 22:07:18.599135542 -0800 -+++ dolphin-emu-4.0.2/CMakeLists.txt 2013-11-30 22:07:24.055135120 -0800 -@@ -574,12 +574,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -574,12 +574,12 @@ if(LIBUSB_FOUND) endif(LIBUSB_FOUND) set(SFML_FIND_VERSION TRUE) @@ -177,10 +173,8 @@ Index: dolphin-emu-4.0.2/CMakeLists.txt message("Using shared SFML") else() message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals") -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.h -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/HW/EXI_DeviceGecko.h 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.h 2013-11-30 22:07:24.055135120 -0800 +--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h ++++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h @@ -12,15 +12,15 @@ #include <queue> @@ -200,7 +194,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.h void ClientThread(); std::thread clientThread; std::mutex transfer_lock; -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ private: static u16 server_port; static volatile bool server_running; static std::thread connectionThread; @@ -209,11 +203,9 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.h static std::mutex connection_lock; }; -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/NetPlayServer.cpp 2013-11-30 22:06:55.127136377 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp 2013-11-30 22:07:24.055135120 -0800 -@@ -10,7 +10,7 @@ +--- a/Source/Core/Core/Src/NetPlayServer.cpp ++++ b/Source/Core/Core/Src/NetPlayServer.cpp +@@ -10,7 +10,7 @@ NetPlayServer::~NetPlayServer() { m_do_loop = false; m_thread.join(); @@ -222,7 +214,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp } #ifdef USE_UPNP -@@ -25,11 +25,11 @@ +@@ -25,11 +25,11 @@ NetPlayServer::~NetPlayServer() NetPlayServer::NetPlayServer(const u16 port) : is_connected(false), m_is_running(false) { memset(m_pad_map, -1, sizeof(m_pad_map)); @@ -236,7 +228,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this); } } -@@ -58,16 +58,13 @@ +@@ -58,16 +58,13 @@ void NetPlayServer::ThreadFunc() } // check which sockets need attention @@ -257,7 +249,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp unsigned int error; { -@@ -80,29 +77,46 @@ +@@ -80,29 +77,46 @@ void NetPlayServer::ThreadFunc() sf::Packet spac; spac << (MessageId)error; // don't need to lock, this client isn't in the client map @@ -317,7 +309,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp } } } -@@ -111,22 +125,23 @@ +@@ -111,22 +125,23 @@ void NetPlayServer::ThreadFunc() // close listening socket and client sockets { @@ -345,7 +337,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp std::string npver; rpac >> npver; -@@ -173,36 +188,36 @@ +@@ -173,36 +188,36 @@ unsigned int NetPlayServer::OnConnect(sf SendToClients(spac); // send new client success message with their id @@ -391,7 +383,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp } } // unlock send -@@ -217,13 +232,13 @@ +@@ -217,13 +232,13 @@ unsigned int NetPlayServer::OnConnect(sf // add client to selector/ used for receiving @@ -407,7 +399,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp { if (m_is_running) { -@@ -244,7 +259,7 @@ +@@ -244,7 +259,7 @@ unsigned int NetPlayServer::OnDisconnect spac << (MessageId)NP_MSG_PLAYER_LEAVE; spac << pid; @@ -416,7 +408,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp std::lock_guard<std::recursive_mutex> lkp(m_crit.players); m_players.erase(m_players.find(socket)); -@@ -304,7 +319,7 @@ +@@ -304,7 +319,7 @@ void NetPlayServer::AdjustPadBufferSize( } // called from ---NETPLAY--- thread @@ -425,7 +417,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp { MessageId mid; packet >> mid; -@@ -477,14 +492,15 @@ +@@ -477,14 +492,15 @@ bool NetPlayServer::StartGame(const std: // called from multiple threads void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid) { @@ -443,7 +435,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp #ifdef USE_UPNP #include <miniwget.h> #include <miniupnpc.h> -@@ -545,7 +561,7 @@ +@@ -508,7 +524,7 @@ void NetPlayServer::TryPortmapping(u16 p // UPnP thread: try to map a port void NetPlayServer::mapPortThread(const u16 port) { @@ -452,11 +444,9 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.cpp if (!m_upnp_inited) if (!initUPnP()) -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.h -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/NetPlayServer.h 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.h 2013-11-30 22:07:24.055135120 -0800 -@@ -53,15 +53,15 @@ +--- a/Source/Core/Core/Src/NetPlayServer.h ++++ b/Source/Core/Core/Src/NetPlayServer.h +@@ -53,15 +53,15 @@ private: std::string name; std::string revision; @@ -476,7 +466,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.h void UpdatePadMapping(); NetSettings m_settings; -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ private: unsigned int m_target_buffer_size; PadMapping m_pad_map[4]; @@ -485,7 +475,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.h struct { -@@ -86,9 +86,11 @@ +@@ -86,9 +86,11 @@ private: std::string m_selected_game; @@ -499,10 +489,8 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/NetPlayServer.h #ifdef USE_UPNP static void mapPortThread(const u16 port); -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp 2013-11-30 22:07:24.059135120 -0800 +--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp ++++ b/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp @@ -10,7 +10,7 @@ #include <queue> @@ -512,7 +500,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp static std::mutex cs_gba; namespace { volatile bool server_running; } -@@ -22,24 +22,28 @@ +@@ -22,24 +22,28 @@ void GBAConnectionWaiter() Common::SetCurrentThreadName("GBA Connection Waiter"); @@ -547,7 +535,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp return; } -@@ -50,7 +54,7 @@ +@@ -50,7 +54,7 @@ void GBAConnectionWaiter_Shutdown() connectionThread.join(); } @@ -556,7 +544,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp { bool sock_filled = false; -@@ -66,7 +70,8 @@ +@@ -66,7 +70,8 @@ bool GetAvailableSock(sf::SocketTCP& soc return sock_filled; } @@ -566,7 +554,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp { if (!connectionThread.joinable()) connectionThread = std::thread(GBAConnectionWaiter); -@@ -74,13 +79,16 @@ +@@ -74,13 +79,16 @@ GBASockServer::GBASockServer() GBASockServer::~GBASockServer() { @@ -585,7 +573,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp if (!GetAvailableSock(client)) return; -@@ -90,9 +98,9 @@ +@@ -90,9 +98,9 @@ void GBASockServer::Transfer(char* si_bu u8 cmd = *current_data; if (cmd == CMD_WRITE) @@ -597,7 +585,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp DEBUG_LOG(SERIALINTERFACE, "> command %02x %02x%02x%02x%02x", (u8)current_data[0], (u8)current_data[1], (u8)current_data[2], -@@ -100,8 +108,11 @@ +@@ -100,8 +108,11 @@ void GBASockServer::Transfer(char* si_bu memset(current_data, 0, sizeof(current_data)); size_t num_received = 0; @@ -611,10 +599,8 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp DEBUG_LOG(SERIALINTERFACE, "< %02x%02x%02x%02x%02x", (u8)current_data[0], (u8)current_data[1], (u8)current_data[2], -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.h -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/HW/SI_DeviceGBA.h 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.h 2013-11-30 22:07:24.059135120 -0800 +--- a/Source/Core/Core/Src/HW/SI_DeviceGBA.h ++++ b/Source/Core/Core/Src/HW/SI_DeviceGBA.h @@ -11,7 +11,7 @@ void GBAConnectionWaiter_Shutdown(); @@ -624,7 +610,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.h { public: GBASockServer(); -@@ -28,7 +28,7 @@ +@@ -28,7 +28,7 @@ private: CMD_WRITE = 0x15 }; @@ -633,11 +619,9 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/SI_DeviceGBA.h char current_data[5]; }; -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp 2013-11-30 22:07:24.059135120 -0800 -@@ -203,8 +203,8 @@ +--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp ++++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +@@ -203,8 +203,8 @@ bool Wiimote::Read() { if (Core::g_CoreStartupParameter.iBBDumpPort > 0 && index == WIIMOTE_BALANCE_BOARD) { @@ -648,7 +632,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp } // Add it to queue -@@ -233,8 +233,8 @@ +@@ -233,8 +233,8 @@ bool Wiimote::Write() { if (Core::g_CoreStartupParameter.iBBDumpPort > 0 && index == WIIMOTE_BALANCE_BOARD) { @@ -659,11 +643,9 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp } IOWrite(rpt.data(), rpt.size()); -Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp 2013-11-30 22:07:24.059135120 -0800 -@@ -12,11 +12,11 @@ +--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp ++++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +@@ -12,11 +12,11 @@ u16 GeckoSockServer::server_port; int GeckoSockServer::client_count; std::thread GeckoSockServer::connectionThread; volatile bool GeckoSockServer::server_running; @@ -677,7 +659,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp { if (!connectionThread.joinable()) connectionThread = std::thread(GeckoConnectionWaiter); -@@ -41,11 +41,11 @@ +@@ -41,11 +41,11 @@ void GeckoSockServer::GeckoConnectionWai { Common::SetCurrentThreadName("Gecko Connection Waiter"); @@ -691,7 +673,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp server_port++; } -@@ -56,22 +56,26 @@ +@@ -56,22 +56,26 @@ void GeckoSockServer::GeckoConnectionWai StringFromFormat("USBGecko: Listening on TCP port %u", server_port), 5000); @@ -723,7 +705,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp { bool sock_filled = false; -@@ -103,7 +107,7 @@ +@@ -103,7 +107,7 @@ void GeckoSockServer::ClientThread() Common::SetCurrentThreadName("Gecko Client"); @@ -732,7 +714,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp while (client_running) { -@@ -116,7 +120,7 @@ +@@ -116,7 +120,7 @@ void GeckoSockServer::ClientThread() char data[128]; std::size_t got = 0; @@ -741,7 +723,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp client_running = false; if (got != 0) -@@ -133,7 +137,7 @@ +@@ -133,7 +137,7 @@ void GeckoSockServer::ClientThread() std::vector<char> packet(send_fifo.begin(), send_fifo.end()); send_fifo.clear(); @@ -750,7 +732,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp client_running = false; } } // unlock transfer -@@ -142,7 +146,9 @@ +@@ -142,7 +146,9 @@ void GeckoSockServer::ClientThread() Common::YieldCPU(); } @@ -761,7 +743,7 @@ Index: dolphin-emu-4.0.2/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp } void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize) -@@ -150,7 +156,7 @@ +@@ -150,7 +156,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData // We don't really care about _uSize (void)_uSize; diff --git a/debian/patches/37_cmake-sfml-fixes.patch b/debian/patches/37_cmake-sfml-fixes.patch deleted file mode 100644 index e43dd4a..0000000 --- a/debian/patches/37_cmake-sfml-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -Add info so that package links SFML successfully with newer gcc versions. -Index: dolphin-emu-4.0.2/Source/Core/Core/CMakeLists.txt -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/Core/CMakeLists.txt 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/Core/CMakeLists.txt 2013-11-30 22:06:50.091136588 -0800 -@@ -220,7 +220,7 @@ - Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp) - endif() - --set(LIBS bdisasm inputcommon videosoftware sfml-network) -+set(LIBS bdisasm inputcommon videosoftware sfml-network sfml-system) - - if(NOT USE_GLES OR USE_GLES3) - set(LIBS ${LIBS} videoogl) -Index: dolphin-emu-4.0.2/Source/Core/DolphinWX/CMakeLists.txt -=================================================================== ---- dolphin-emu-4.0.2.orig/Source/Core/DolphinWX/CMakeLists.txt 2013-11-29 13:05:19.000000000 -0800 -+++ dolphin-emu-4.0.2/Source/Core/DolphinWX/CMakeLists.txt 2013-11-30 22:06:50.095136589 -0800 -@@ -11,6 +11,7 @@ - audiocommon - z - sfml-network -+ sfml-system - ${GTK2_LIBRARIES}) - - if(NOT ANDROID) diff --git a/debian/patches/series b/debian/patches/series index 06d13ab..b753643 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,5 @@ 04_use-polarssl-aes.patch 06_remove-powerpcdisasm.patch 07_fix-findminiupnpc-warnings.patch -37_cmake-sfml-fixes.patch -80_sfml-use-2.1.patch +08_cmake-sfml-fixes.patch +09_sfml-use-2.1.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
