[dolphin-emu] 22/33: Refresh patches and add some patch headers
James Cowgill
jcowgill-guest at moszumanska.debian.org
Sun Jan 11 22:39:42 UTC 2015
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 a3fbc188d534df2faa6b2fbd0d3d15303872c303
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Mon Nov 10 22:25:16 2014 +0000
Refresh patches and add some patch headers
---
debian/patches/01_fixes-for-gcc-4.9.patch | 25 ++--
debian/patches/03_fixes-for-polarssl-1.3.patch | 94 +++------------
debian/patches/04_use-polarssl-aes.patch | 132 +++------------------
...cdisasm.patch => 06_remove-powerpcdisasm.patch} | 27 ++---
debian/patches/series | 2 +-
5 files changed, 58 insertions(+), 222 deletions(-)
diff --git a/debian/patches/01_fixes-for-gcc-4.9.patch b/debian/patches/01_fixes-for-gcc-4.9.patch
index 3a75eee..0726ee4 100644
--- a/debian/patches/01_fixes-for-gcc-4.9.patch
+++ b/debian/patches/01_fixes-for-gcc-4.9.patch
@@ -1,24 +1,18 @@
-From 7c1ac441f633220365d0feef3871f891e7ed7a43 Mon Sep 17 00:00:00 2001
-From: Ryan Houdek <Sonicadvance1 at gmail.com>
-Date: Tue, 12 Nov 2013 16:34:32 -0600
-Subject: [PATCH] Redo 'Fixes GCC 4.9 compilation. It now supplies its own
- _mm_shuffle_epi8 intrinsic.' This time with support for Windows.
+Description: Fix redeclaration of _mm_shuffle_epi8 in GCC 4.9
+ Backported from upstream commit.
+Author: James Cowgill <james410 at cowgill.org.uk>
+Author: Ryan Houdek <Sonicadvance1 at gmail.com>
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/7c1ac441f633220365d0feef3871f891e7ed7a43
----
- Source/Core/Common/Src/CommonFuncs.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
-index bf50a17..63bdc04 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
-@@ -31,7 +31,12 @@ struct ArraySizeImpl : public std::extent<T>
+@@ -30,7 +30,12 @@ struct ArraySizeImpl : public std::exten
#define b32(x) (b16(x) | (b16(x) >>16) )
#define ROUND_UP_POW2(x) (b32(x - 1) + 1)
-#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC
-+#ifndef __GNUC_PREREQ
-+ #define __GNUC_PREREQ(a, b) 0
++#ifndef __GNUC_PREREQ
++ #define __GNUC_PREREQ(a, b) 0
+#endif
+
+#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) \
@@ -26,6 +20,3 @@ index bf50a17..63bdc04 100644
#include <emmintrin.h>
static __inline __m128i __attribute__((__always_inline__))
_mm_shuffle_epi8(__m128i a, __m128i mask)
---
-2.1.3
-
diff --git a/debian/patches/03_fixes-for-polarssl-1.3.patch b/debian/patches/03_fixes-for-polarssl-1.3.patch
index d76c12a..76f440c 100644
--- a/debian/patches/03_fixes-for-polarssl-1.3.patch
+++ b/debian/patches/03_fixes-for-polarssl-1.3.patch
@@ -1,26 +1,8 @@
-From 33beaf20f3c511bf2c6b751366b38b3eb023aad7 Mon Sep 17 00:00:00 2001
-From: Tillmann Karras <tilkax at gmail.com>
-Date: Mon, 24 Feb 2014 16:08:43 +0100
-Subject: [PATCH] PolarSSL: adapt Dolphin to new version
+Description: Update to PolarSSL 1.3 API
+Author: James Cowgill <james410 at cowgill.org.uk>
+Author: Tillmann Karras <tilkax at gmail.com>
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/33beaf20f3c511bf2c6b751366b38b3eb023aad7
-- strip down PolarSSL's CMakeLists.txt
-- switch to the PolarSSL 1.3 API
-- use entropy interface instead of havege (PolarSSL 1.3 has disabled
- havege by default because it is "considered unsafe for primary usage")
-
- James Cowgill: Don't bother with vcxproj file
-
----
- CMakeTests/FindPolarSSL.cmake | 24 ++---
- Externals/polarssl/CMakeLists.txt | 22 ----
- Externals/polarssl/visualc/PolarSSL.vcxproj | 117 +++++++++++++++++++++
- .../Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp | 49 +++++----
- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 10 +-
- 5 files changed, 158 insertions(+), 64 deletions(-)
- create mode 100644 Externals/polarssl/visualc/PolarSSL.vcxproj
-
-diff --git a/CMakeTests/FindPolarSSL.cmake b/CMakeTests/FindPolarSSL.cmake
-index be67c56..c55b2bb 100644
--- a/CMakeTests/FindPolarSSL.cmake
+++ b/CMakeTests/FindPolarSSL.cmake
@@ -31,23 +31,23 @@ if (POLARSSL_FOUND)
@@ -59,48 +41,9 @@ index be67c56..c55b2bb 100644
}"
POLARSSL_WORKS)
-diff --git a/Externals/polarssl/CMakeLists.txt b/Externals/polarssl/CMakeLists.txt
-index 558aedf..198db72 100644
---- a/Externals/polarssl/CMakeLists.txt
-+++ b/Externals/polarssl/CMakeLists.txt
-@@ -1,8 +1,6 @@
- cmake_minimum_required(VERSION 2.6)
- project(POLARSSL C)
-
--enable_testing()
--
- string(REGEX MATCH "clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER}")
-
- if(CMAKE_COMPILER_IS_GNUCC)
-@@ -48,23 +46,3 @@ if(ENABLE_ZLIB_SUPPORT)
- endif(ENABLE_ZLIB_SUPPORT)
-
- add_subdirectory(library)
--add_subdirectory(include)
--
--if(CMAKE_COMPILER_IS_GNUCC)
-- add_subdirectory(tests)
--endif(CMAKE_COMPILER_IS_GNUCC)
--if(CMAKE_COMPILER_IS_CLANG)
-- add_subdirectory(tests)
--endif(CMAKE_COMPILER_IS_CLANG)
--
--add_subdirectory(programs)
--
--ADD_CUSTOM_TARGET(apidoc
-- COMMAND doxygen doxygen/polarssl.doxyfile
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--
--ADD_CUSTOM_TARGET(memcheck
-- COMMAND ctest -O memcheck.log -D ExperimentalMemCheck
-- COMMAND tail -n1 memcheck.log | grep 'Memory checking results:' > /dev/null
-- COMMAND rm -f memcheck.log
-- )
-diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
-index ba92259..f25972b 100644
---- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
-+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
-@@ -28,12 +28,12 @@ CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_HLE_Device_net_ssl()
+--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
++++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
+@@ -28,12 +28,12 @@ CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_H
ssl_session_free(&_SSL[i].session);
ssl_free(&_SSL[i].ctx);
@@ -116,7 +59,7 @@ index ba92259..f25972b 100644
memset(_SSL[i].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
_SSL[i].active = false;
-@@ -147,13 +147,12 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
+@@ -147,13 +147,12 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV
goto _SSL_NEW_ERROR;
}
@@ -218,21 +161,21 @@ index ba92259..f25972b 100644
Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
}
else
-diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
-index 80e87ea..145a49e 100644
---- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
-+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
-@@ -4,7 +4,7 @@
+--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
++++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
+@@ -7,9 +7,9 @@
- #pragma once
+ #include "WII_IPC_HLE_Device.h"
--#include <polarssl/havege.h>
+#include <polarssl/entropy.h>
#include <polarssl/net.h>
#include <polarssl/ssl.h>
+-#include <polarssl/havege.h>
-@@ -57,10 +57,10 @@ typedef struct
- {
+ #define NET_SSL_MAX_HOSTNAME_LEN 256
+ #define NET_SSL_MAXINSTANCES 4
+@@ -57,10 +57,10 @@ enum SSL_IOCTL
+ typedef struct {
ssl_context ctx;
ssl_session session;
- havege_state hs;
@@ -246,6 +189,3 @@ index 80e87ea..145a49e 100644
int sockfd;
char hostname[NET_SSL_MAX_HOSTNAME_LEN];
bool active;
---
-2.1.3
-
diff --git a/debian/patches/04_use-polarssl-aes.patch b/debian/patches/04_use-polarssl-aes.patch
index b6dfc0d..c305b1c 100644
--- a/debian/patches/04_use-polarssl-aes.patch
+++ b/debian/patches/04_use-polarssl-aes.patch
@@ -1,34 +1,9 @@
-From 8e73e8ae5fad7f1f893832fcaf14b04e5e052795 Mon Sep 17 00:00:00 2001
-From: Ryan Houdek <Sonicadvance1 at Gmail.com>
-Date: Sun, 27 Oct 2013 18:27:07 +0000
-Subject: [PATCH] Wipe all traces of OpenSSL's AES implementation. Use polarssl
- instead.
+Description: Use PolarSSL's AES implementation instead of OpenSSL
+ Backported from upstream commit.
+Author: James Cowgill <james410 at cowgill.org.uk>
+Author: Ryan Houdek <Sonicadvance1 at gmail.com>
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/8e73e8ae5fad7f1f893832fcaf14b04e5e052795
- James Cowgill: Crypto/aes_* files already removed
-
----
- Source/Core/Common/CMakeLists.txt | 2 -
- Source/Core/Common/Common.vcxproj | 4 -
- Source/Core/Common/Common.vcxproj.filters | 12 -
- Source/Core/Common/Src/Crypto/aes.h | 143 ---
- Source/Core/Common/Src/Crypto/aes_cbc.cpp | 131 ---
- Source/Core/Common/Src/Crypto/aes_core.cpp | 1159 --------------------
- Source/Core/Common/Src/Crypto/aes_locl.h | 88 --
- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 14 +-
- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 8 +-
- Source/Core/DiscIO/Src/VolumeCreator.cpp | 8 +-
- Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp | 10 +-
- Source/Core/DiscIO/Src/VolumeWiiCrypted.h | 4 +-
- .../DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp | 12 +-
- .../DolphinWX/Src/MemoryCards/WiiSaveCrypted.h | 5 +-
- 14 files changed, 32 insertions(+), 1568 deletions(-)
- delete mode 100644 Source/Core/Common/Src/Crypto/aes.h
- delete mode 100644 Source/Core/Common/Src/Crypto/aes_cbc.cpp
- delete mode 100644 Source/Core/Common/Src/Crypto/aes_core.cpp
- delete mode 100644 Source/Core/Common/Src/Crypto/aes_locl.h
-
-diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
-index ce76f00..e670106 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -24,8 +24,6 @@ set(SRCS Src/BreakPoints.cpp
@@ -40,60 +15,6 @@ index ce76f00..e670106 100644
Src/Crypto/bn.cpp
Src/Crypto/ec.cpp)
-diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
-index 20cf92d..aa91ad9 100644
---- a/Source/Core/Common/Common.vcxproj
-+++ b/Source/Core/Common/Common.vcxproj
-@@ -180,8 +180,6 @@
- <ClCompile Include="Src\CDUtils.cpp" />
- <ClCompile Include="Src\ColorUtil.cpp" />
- <ClCompile Include="Src\ConsoleListener.cpp" />
-- <ClCompile Include="Src\Crypto\aes_cbc.cpp" />
-- <ClCompile Include="Src\Crypto\aes_core.cpp" />
- <ClCompile Include="Src\Crypto\bn.cpp" />
- <ClCompile Include="Src\Crypto\ec.cpp" />
- <ClCompile Include="Src\ExtendedTrace.cpp" />
-@@ -232,8 +230,6 @@
- <ClInclude Include="Src\CommonTypes.h" />
- <ClInclude Include="Src\ConsoleListener.h" />
- <ClInclude Include="Src\CPUDetect.h" />
-- <ClInclude Include="Src\Crypto\aes.h" />
-- <ClInclude Include="Src\Crypto\aes_locl.h" />
- <ClInclude Include="Src\Crypto\tools.h" />
- <ClInclude Include="Src\DebugInterface.h" />
- <ClInclude Include="Src\ExtendedTrace.h" />
-diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
-index 05b9edc..fabd8f1 100644
---- a/Source/Core/Common/Common.vcxproj.filters
-+++ b/Source/Core/Common/Common.vcxproj.filters
-@@ -31,12 +31,6 @@
- <ClCompile Include="Src\ConsoleListener.cpp">
- <Filter>Logging</Filter>
- </ClCompile>
-- <ClCompile Include="Src\Crypto\aes_cbc.cpp">
-- <Filter>Crypto</Filter>
-- </ClCompile>
-- <ClCompile Include="Src\Crypto\aes_core.cpp">
-- <Filter>Crypto</Filter>
-- </ClCompile>
- <ClCompile Include="Src\Crypto\bn.cpp">
- <Filter>Crypto</Filter>
- </ClCompile>
-@@ -95,12 +89,6 @@
- <ClInclude Include="Src\ConsoleListener.h">
- <Filter>Logging</Filter>
- </ClInclude>
-- <ClInclude Include="Src\Crypto\aes.h">
-- <Filter>Crypto</Filter>
-- </ClInclude>
-- <ClInclude Include="Src\Crypto\aes_locl.h">
-- <Filter>Crypto</Filter>
-- </ClInclude>
- <ClInclude Include="Src\Crypto\tools.h">
- <Filter>Crypto</Filter>
- </ClInclude>
-diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
-index f0ea0d5..8c214a3 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
@@ -38,7 +38,7 @@
@@ -105,7 +26,7 @@ index f0ea0d5..8c214a3 100644
#include "ConfigManager.h"
#include "../Boot/Boot_DOL.h"
-@@ -860,10 +860,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
+@@ -859,10 +859,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32
u8* newIV = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address);
@@ -119,7 +40,7 @@ index f0ea0d5..8c214a3 100644
_dbg_assert_msg_(WII_IPC_ES, keyIndex == 6, "IOCTL_ES_ENCRYPT: Key type is not SD, data will be crap");
}
-@@ -878,10 +878,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
+@@ -877,10 +877,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32
u8* newIV = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address);
u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address);
@@ -133,8 +54,6 @@ index f0ea0d5..8c214a3 100644
_dbg_assert_msg_(WII_IPC_ES, keyIndex == 6, "IOCTL_ES_DECRYPT: Key type is not SD, data will be crap");
}
-diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
-index 974f8a9..4e722d1 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -6,7 +6,7 @@
@@ -146,7 +65,7 @@ index 974f8a9..4e722d1 100644
#include "MathUtil.h"
#include "FileUtil.h"
#include "Log.h"
-@@ -286,10 +286,10 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
+@@ -286,10 +286,10 @@ bool CNANDContentLoader::Initialize(cons
}
void CNANDContentLoader::AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest)
{
@@ -160,8 +79,6 @@ index 974f8a9..4e722d1 100644
}
void CNANDContentLoader::GetKeyFromTicket(u8* pTicket, u8* pTicketKey)
-diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
-index 6cf5ea8..20cf868 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp
@@ -4,7 +4,7 @@
@@ -173,7 +90,7 @@ index 6cf5ea8..20cf868 100644
#include "VolumeCreator.h"
-@@ -183,11 +183,11 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
+@@ -183,11 +183,11 @@ static IVolume* CreateVolumeFromCryptedW
memset(IV, 0, 16);
_rReader.Read(rPartition.Offset + 0x44c, 8, IV);
@@ -184,15 +101,13 @@ index 6cf5ea8..20cf868 100644
u8 VolumeKey[16];
- AES_cbc_encrypt(SubKey, VolumeKey, 16, &AES_KEY, IV, AES_DECRYPT);
-+ aes_crypt_cbc(&AES_ctx, AES_DECRYPT, 16, IV, SubKey, VolumeKey);
++ aes_crypt_cbc(&AES_ctx, AES_DECRYPT, 16, IV, SubKey, VolumeKey);
// -1 means the caller just wanted the partition with matching type
if ((int)_VolumeNum == -1 || i == _VolumeNum)
-diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
-index 51ee3d5..c20ccf4 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
-@@ -18,7 +18,8 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset,
+@@ -18,7 +18,8 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(IBl
dataOffset(0x20000),
m_LastDecryptedBlockOffset(-1)
{
@@ -211,7 +126,7 @@ index 51ee3d5..c20ccf4 100644
}
bool CVolumeWiiCrypted::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
-@@ -67,7 +70,7 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const
+@@ -67,7 +70,7 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOf
if (m_LastDecryptedBlockOffset != Block)
{
memcpy(IV, m_pBuffer + 0x3d0, 16);
@@ -220,18 +135,16 @@ index 51ee3d5..c20ccf4 100644
m_LastDecryptedBlockOffset = Block;
}
-@@ -250,7 +253,8 @@ bool CVolumeWiiCrypted::CheckIntegrity() const
+@@ -250,7 +253,8 @@ bool CVolumeWiiCrypted::CheckIntegrity()
NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read metadata", clusterID);
return false;
}
- AES_cbc_encrypt(clusterMDCrypted, clusterMD, 0x400, &m_AES_KEY, IV, AES_DECRYPT);
-+ aes_crypt_cbc(m_AES_ctx, AES_DECRYPT, 0x400, IV, clusterMDCrypted, clusterMD);
++ aes_crypt_cbc(m_AES_ctx, AES_DECRYPT, 0x400, IV, clusterMDCrypted, clusterMD);
+
// Some clusters have invalid data and metadata because they aren't
// meant to be read by the game (for example, holes between files). To
-diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.h b/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
-index 4577746..4756a88 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.h
@@ -7,7 +7,7 @@
@@ -252,11 +165,9 @@ index 4577746..4756a88 100644
u64 m_VolumeOffset;
u64 dataOffset;
-diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
-index 091804e..99cea98 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
-@@ -78,7 +78,7 @@ CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 TitleID)
+@@ -78,7 +78,7 @@ CWiiSaveCrypted::CWiiSaveCrypted(const c
if (!TitleID) // Import
{
@@ -265,7 +176,7 @@ index 091804e..99cea98 100644
b_valid = true;
ReadHDR();
ReadBKHDR();
-@@ -95,7 +95,7 @@ CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 TitleID)
+@@ -95,7 +95,7 @@ CWiiSaveCrypted::CWiiSaveCrypted(const c
}
else
{
@@ -279,7 +190,7 @@ index 091804e..99cea98 100644
fpData_bin.Close();
- AES_cbc_encrypt((const u8*)&_encryptedHeader, (u8*)&_header, HEADER_SZ, &m_AES_KEY, SD_IV, AES_DECRYPT);
-+ aes_crypt_cbc(&m_AES_ctx, AES_DECRYPT, HEADER_SZ, SD_IV, (const u8*)&_encryptedHeader, (u8*)&_header);
++ aes_crypt_cbc(&m_AES_ctx, AES_DECRYPT, HEADER_SZ, SD_IV, (const u8*)&_encryptedHeader, (u8*)&_header);
u32 bannerSize = Common::swap32(_header.hdr.BannerSize);
if ((bannerSize < FULL_BNR_MIN) || (bannerSize > FULL_BNR_MAX) ||
(((bannerSize - BNR_SZ) % ICON_SZ) != 0))
@@ -292,7 +203,7 @@ index 091804e..99cea98 100644
File::IOFile fpData_bin(encryptedSavePath, "wb");
if (!fpData_bin.WriteBytes(&_encryptedHeader, HEADER_SZ))
-@@ -332,7 +332,7 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
+@@ -332,7 +332,7 @@ void CWiiSaveCrypted::ImportWiiSaveFiles
memcpy(IV, _tmpFileHDR.IV, 0x10);
@@ -301,7 +212,7 @@ index 091804e..99cea98 100644
if (!File::Exists(fullFilePath) || AskYesNoT("%s already exists, overwrite?", fullFilePath.c_str()))
{
-@@ -421,7 +421,7 @@ void CWiiSaveCrypted::ExportWiiSaveFiles()
+@@ -421,7 +421,7 @@ void CWiiSaveCrypted::ExportWiiSaveFiles
b_valid = false;
}
@@ -310,8 +221,6 @@ index 091804e..99cea98 100644
File::IOFile fpData_bin(encryptedSavePath, "ab");
if (!fpData_bin.WriteBytes(&_encryptedData[0], _roundedfileSize))
-diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
-index 29a3e1f..6ec4194 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
+++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
@@ -6,8 +6,8 @@
@@ -334,6 +243,3 @@ index 29a3e1f..6ec4194 100644
u8 SD_IV[0x10];
std::vector<std::string> FilesList;
---
-2.1.3
-
diff --git a/debian/patches/20_remove-powerpcdisasm.patch b/debian/patches/06_remove-powerpcdisasm.patch
similarity index 58%
rename from debian/patches/20_remove-powerpcdisasm.patch
rename to debian/patches/06_remove-powerpcdisasm.patch
index ac91d6a..5659335 100644
--- a/debian/patches/20_remove-powerpcdisasm.patch
+++ b/debian/patches/06_remove-powerpcdisasm.patch
@@ -1,8 +1,11 @@
-Replace Frank Willie's non-free PowerPC Disassembler code with a free do-nothing stub
-Index: dolphin-emu-4.0.2/Externals/Bochs_disasm/PowerPCDisasm.cpp
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dolphin-emu-4.0.2/Externals/Bochs_disasm/PowerPCDisasm.cpp 2013-11-30 22:06:38.411137099 -0800
+Description: Disable non-free PowerPC disassembler
+ Replace disassembler code with an empty stub.
+ Upstream have a new version which is free, but it's too big to backport.
+Author: Brandon Barnes <winterknight at nerdshack.com>
+Forwarded: not-needed
+
+--- /dev/null
++++ b/Externals/Bochs_disasm/PowerPCDisasm.cpp
@@ -0,0 +1,13 @@
+/**
+* This is a do-nothing stub to replace the PowerPC Disassembler module written
@@ -17,10 +20,8 @@ Index: dolphin-emu-4.0.2/Externals/Bochs_disasm/PowerPCDisasm.cpp
+{
+ snprintf(dest, max_size, "(not supported)\t(not supported)");
+}
-Index: dolphin-emu-4.0.2/Externals/Bochs_disasm/PowerPCDisasm.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dolphin-emu-4.0.2/Externals/Bochs_disasm/PowerPCDisasm.h 2013-11-30 22:06:38.411137099 -0800
+--- /dev/null
++++ b/Externals/Bochs_disasm/PowerPCDisasm.h
@@ -0,0 +1,13 @@
+/**
+* This is a do-nothing stub to replace the PowerPC Disassembler module written
@@ -35,10 +36,8 @@ Index: dolphin-emu-4.0.2/Externals/Bochs_disasm/PowerPCDisasm.h
+void DisassembleGekko(unsigned int, unsigned int, char * dest, int max_size);
+
+#endif
-Index: dolphin-emu-4.0.2/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
-===================================================================
---- dolphin-emu-4.0.2.orig/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp 2013-11-29 13:05:19.000000000 -0800
-+++ dolphin-emu-4.0.2/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp 2013-11-30 22:06:38.427137094 -0800
+--- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
++++ b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
@@ -11,9 +11,6 @@
// F-zero 80005e60 wtf??
@@ -49,7 +48,7 @@ Index: dolphin-emu-4.0.2/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp
static const char *special_reg_names[] = {
"PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause",
};
-@@ -43,9 +40,9 @@
+@@ -43,9 +40,9 @@ wxString CRegTable::GetValue(int row, in
{
switch (col)
{
diff --git a/debian/patches/series b/debian/patches/series
index 79108e3..f901b6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
02_fixes-for-libav-10.patch
03_fixes-for-polarssl-1.3.patch
04_use-polarssl-aes.patch
-20_remove-powerpcdisasm.patch
+06_remove-powerpcdisasm.patch
30_play-pause-keyboard-shortcut.patch
35_cmake-miniupnpc-fixes.patch
37_cmake-sfml-fixes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git
More information about the Pkg-games-commits
mailing list