rpms/dolphin-emu/devel dolphin-emu-4.0-clrun.patch, NONE, 1.1 dolphin-emu-4.0-compat-SFML16.patch, NONE, 1.1 dolphin-emu-4.0-gtk3.patch, NONE, 1.1 dolphin-emu-4.0-polarssl13.patch, NONE, 1.1 dolphin-emu.1, NONE, 1.1 .cvsignore, 1.3, 1.4 dolphin-emu.spec, 1.7, 1.8 sources, 1.3, 1.4 dolphin-emu-3.5-clrun.patch, 1.1, NONE dolphin-emu-3.5-compat-SFML16.patch, 1.1, NONE dolphin-emu-3.5-wx28.patch, 1.1, NONE

Jeremy Newton jem256 at rpmfusion.org
Thu Oct 2 16:33:51 CEST 2014 

Author: jem256

Update of /cvs/nonfree/rpms/dolphin-emu/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25267/devel

Modified Files:
	.cvsignore dolphin-emu.spec sources 
Added Files:
	dolphin-emu-4.0-clrun.patch 
	dolphin-emu-4.0-compat-SFML16.patch dolphin-emu-4.0-gtk3.patch 
	dolphin-emu-4.0-polarssl13.patch dolphin-emu.1 
Removed Files:
	dolphin-emu-3.5-clrun.patch 
	dolphin-emu-3.5-compat-SFML16.patch dolphin-emu-3.5-wx28.patch 
Log Message:
Update to 4.0


dolphin-emu-4.0-clrun.patch:
 CMakeLists.txt |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

--- NEW FILE dolphin-emu-4.0-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
@@ -663,10 +663,21 @@
 	add_subdirectory(Externals/libiconv-1.14)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-	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" AND NOT ANDROID) #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-4.0-compat-SFML16.patch:
 CMakeLists.txt                       |    1 +
 CMakeTests/FindSFML.cmake            |    6 +++---
 Source/Core/Core/CMakeLists.txt      |    2 +-
 Source/Core/DolphinWX/CMakeLists.txt |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE dolphin-emu-4.0-compat-SFML16.patch ---
diff -up dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ dolphin-emu-3.5/CMakeTests/FindSFML.cmake
--- dolphin-emu-3.5/CMakeTests/FindSFML.cmake~	2013-02-20 00:38:34.000000000 +0100
+++ dolphin-emu-3.5/CMakeTests/FindSFML.cmake	2013-11-18 11:57:56.150949832 +0100
@@ -24,7 +24,7 @@ endif()
 
 # find the SFML include directory
 find_path(SFML_INCLUDE_DIR SFML/Config.hpp
-          PATH_SUFFIXES include
+          PATH_SUFFIXES include/sfml1
           PATHS
           ~/Library/Frameworks
           /Library/Frameworks
@@ -87,11 +87,11 @@ set(FIND_SFML_LIB_PATHS ~/Library/Framew
 foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
     string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
     string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX}-1.6)
 
     # no suffix for sfml-main, it is always a static library
     if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
-        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}-1.6)
     endif()
 
     # debug library
diff -up dolphin-emu-3.5/CMakeLists.txt~ dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5/CMakeLists.txt~	2013-11-18 11:58:43.000000000 +0100
+++ dolphin-emu-3.5/CMakeLists.txt	2013-11-18 12:00:41.120408310 +0100
@@ -581,6 +581,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
 endif()
 if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
 	message("Using shared SFML")
+       include_directories( /usr/include/sfml1 )
 else()
 	message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
 	add_subdirectory(Externals/SFML)
diff -up dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~	2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt	2013-11-18 12:14:15.844970552 +0100
@@ -220,7 +220,7 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp)
 endif()
 
-set(LIBS bdisasm inputcommon videosoftware sfml-network)
+set(LIBS bdisasm inputcommon videosoftware sfml-network-1.6)
 
 if(NOT USE_GLES OR USE_GLES3)
 	set(LIBS ${LIBS} videoogl)
diff -up dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~	2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt	2013-11-18 12:14:11.445091807 +0100
@@ -10,7 +10,7 @@ set(LIBS	core
 			common
 			audiocommon
 			z
-			sfml-network
+			sfml-network-1.6
 			${GTK2_LIBRARIES})
 
 if(NOT ANDROID)

dolphin-emu-4.0-gtk3.patch:
 CMakeLists.txt                       |   10 ++++------
 Source/Core/DolphinWX/CMakeLists.txt |    2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE dolphin-emu-4.0-gtk3.patch ---
diff -rupN dolphin-emu-2879cbd2b564-orig/CMakeLists.txt dolphin-emu-2879cbd2b564/CMakeLists.txt
--- dolphin-emu-2879cbd2b564-orig/CMakeLists.txt	2014-03-07 20:10:55.185158971 -0500
+++ dolphin-emu-2879cbd2b564/CMakeLists.txt	2014-03-07 20:16:00.388691555 -0500
@@ -707,13 +707,11 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 			OUTPUT_VARIABLE DIST_NAME
 			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 		if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
-				VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
-			check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
+				VERSION_EQUAL 2.8.12 OR "${DIST_NAME}" STREQUAL "natty")
+			check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED)
 		else()
-			include(FindGTK2)
-			if(GTK2_FOUND)
-				include_directories(${GTK2_INCLUDE_DIRS})
-			endif()
+			include(FindGTK)
+			include_directories(${GTK3_INCLUDE_DIRS})
 		endif()
 	endif()
 
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-2879cbd2b564-orig/Source/Core/DolphinWX/CMakeLists.txt	2014-03-07 20:10:55.186158963 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/DolphinWX/CMakeLists.txt	2014-03-07 20:18:55.977272101 -0500
@@ -11,7 +11,7 @@ set(LIBS	core
 			audiocommon
 			z
 			sfml-network-1.6
-			${GTK2_LIBRARIES})
+			${GTK3_LIBRARIES})
 
 if(NOT ANDROID)
 	if(USE_X11)

dolphin-emu-4.0-polarssl13.patch:
 CMakeTests/FindPolarSSL.cmake                               |   68 ++++++++----
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp |   49 ++++----
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h   |   10 -
 3 files changed, 75 insertions(+), 52 deletions(-)

--- NEW FILE dolphin-emu-4.0-polarssl13.patch ---
diff -rupN dolphin-emu-2879cbd2b564-orig/CMakeTests/FindPolarSSL.cmake dolphin-emu-2879cbd2b564/CMakeTests/FindPolarSSL.cmake
--- dolphin-emu-2879cbd2b564-orig/CMakeTests/FindPolarSSL.cmake	1979-11-29 23:00:00.000000000 -0500
+++ dolphin-emu-2879cbd2b564/CMakeTests/FindPolarSSL.cmake	2014-10-02 10:02:00.688266601 -0400
@@ -6,14 +6,20 @@
 #  POLARSSL_WORKS, this is true if polarssl is found and contains the methods
 #  needed by dolphin-emu
 
-if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
-	# Already in cache, be silent
+# validate cached values (but use them as hints)
+set(POLARSSL_INCLUDE_DIR_HINT POLARSSL_INCLUDE_DIR)
+set(POLARSSL_LIBRARY_HINT POLARSSL_LIBRARY)
+unset(POLARSSL_INCLUDE_DIR CACHE)
+unset(POLARSSL_LIBRARY CACHE)
+find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h HINTS ${POLARSSL_INCLUDE_DIR_HINT})
+find_library(POLARSSL_LIBRARY polarssl HINTS ${POLARSSL_LIBRARY_HINT})
+
+if(POLARSSL_INCLUDE_DIR STREQUAL POLARSSL_INCLUDE_DIR_HINT AND
+   POLARSSL_LIBRARY     STREQUAL POLARSSL_LIBRARY_HINT)
+	# using cached values, be silent
 	set(POLARSSL_FIND_QUIETLY TRUE)
 endif()
 
-find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h)
-find_library(POLARSSL_LIBRARY polarssl)
-
 if (POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
 	set (POLARSSL_FOUND TRUE)
 endif ()
@@ -24,30 +30,48 @@ if (POLARSSL_FOUND)
 		message (STATUS "Found the polarssl headers at ${POLARSSL_INCLUDE_DIR}")
 	endif (NOT POLARSSL_FIND_QUIETLY)
 
-	message(STATUS "Checking to see if system version contains necessary methods")
-
 	set(CMAKE_REQUIRED_INCLUDES ${POLARSSL_INCLUDE_DIR})
 	set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY})
+	unset(POLARSSL_WORKS CACHE)
 	check_cxx_source_compiles("
+	#include <polarssl/ctr_drbg.h>
+	#include <polarssl/entropy.h>
 	#include <polarssl/net.h>
 	#include <polarssl/ssl.h>
-	#include <polarssl/havege.h>
+	#include <polarssl/version.h>
+
+	#if POLARSSL_VERSION_NUMBER < 0x01030000
+	#error \"Shared PolarSSL version is too old\"
+	#endif
+
 	int main()
 	{
-	ssl_context ctx;
-	ssl_session session;
-	havege_state hs;
-
-	ssl_init(&ctx);
-	havege_init(&hs);
-	ssl_set_rng(&ctx, havege_random, &hs);
-	ssl_set_session(&ctx, &session);
-
-	ssl_close_notify(&ctx);
-	ssl_session_free(&session);
-	ssl_free(&ctx);
+		ssl_context ctx;
+		ssl_session session;
+		entropy_context entropy;
+		ctr_drbg_context ctr_drbg;
+		x509_crt cacert;
+		x509_crt clicert;
+		pk_context pk;
+
+		ssl_init(&ctx);
+		entropy_init(&entropy);
+
+		const char* pers = \"dolphin-emu\";
+		ctr_drbg_init(&ctr_drbg, entropy_func,
+		                    &entropy,
+		                    (const unsigned char*)pers,
+		                    strlen(pers));
+	
+		ssl_set_rng(&ctx, ctr_drbg_random, &ctr_drbg);
+		ssl_set_session(&ctx, &session);
+
+		ssl_close_notify(&ctx);
+		ssl_session_free(&session);
+		ssl_free(&ctx);
+		entropy_free(&entropy);
 
-	return 0;
+		return 0;
 	}"
 	POLARSSL_WORKS)
 
@@ -55,5 +79,5 @@ else ()
 	message (STATUS "Could not find polarssl")
 endif ()
 
-MARK_AS_ADVANCED(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
+mark_as_advanced(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
 
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
--- dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp	1979-11-29 23:00:00.000000000 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp	2014-10-02 09:54:33.831914493 -0400
@@ -28,12 +28,12 @@ CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_H
 			ssl_session_free(&_SSL[i].session);
 			ssl_free(&_SSL[i].ctx);
 
-			x509_free(&_SSL[i].cacert);
-			x509_free(&_SSL[i].clicert);
+			x509_crt_free(&_SSL[i].cacert);
+			x509_crt_free(&_SSL[i].clicert);
 
 			memset(&_SSL[i].ctx, 0, sizeof(ssl_context));
 			memset(&_SSL[i].session, 0, sizeof(ssl_session));
-			memset(&_SSL[i].hs, 0, sizeof(havege_state));
+			memset(&_SSL[i].entropy, 0, sizeof(entropy_context));
 			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
 				goto _SSL_NEW_ERROR;
 			}
 
-			havege_init(&_SSL[sslID].hs);
-			ssl_set_rng(&_SSL[sslID].ctx, havege_random, &_SSL[sslID].hs);
+			entropy_init(&_SSL[sslID].entropy);
+			ssl_set_rng(&_SSL[sslID].ctx, entropy_func, &_SSL[sslID].hs);
 
 			// For some reason we can't use TLSv1.2, v1.1 and below are fine!
 			ssl_set_max_version(&_SSL[sslID].ctx, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_2);
 
-			ssl_set_ciphersuites(&_SSL[sslID].ctx, ssl_default_ciphersuites);
 			ssl_set_session(&_SSL[sslID].ctx, &_SSL[sslID].session);
 
 			ssl_set_endpoint(&_SSL[sslID].ctx, SSL_IS_CLIENT);
@@ -192,12 +191,12 @@ _SSL_NEW_ERROR:
 			ssl_session_free(&_SSL[sslID].session);
 			ssl_free(&_SSL[sslID].ctx);
 
-			x509_free(&_SSL[sslID].cacert);
-			x509_free(&_SSL[sslID].clicert);
+			x509_crt_free(&_SSL[sslID].cacert);
+			x509_crt_free(&_SSL[sslID].clicert);
 
 			memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
 			memset(&_SSL[sslID].session, 0, sizeof(ssl_session));
-			memset(&_SSL[sslID].hs, 0, sizeof(havege_state));
+			memset(&_SSL[sslID].entropy, 0, sizeof(entropy_context));
 			memset(_SSL[sslID].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
 
 			_SSL[sslID].active = false;
@@ -231,7 +230,7 @@ _SSL_NEW_ERROR:
 		int sslID = Memory::Read_U32(BufferOut) - 1;
 		if (SSLID_VALID(sslID))
 		{
-			int ret = x509parse_crt_der(
+			int ret = x509_crt_parse_der(
 				&_SSL[sslID].cacert,
 				Memory::GetPointer(BufferOut2),
 				BufferOutSize2);
@@ -268,23 +267,23 @@ _SSL_NEW_ERROR:
 		if (SSLID_VALID(sslID))
 		{
 			std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
-			int ret = x509parse_crtfile(&_SSL[sslID].clicert, (cert_base_path + "clientca.pem").c_str());
-			int rsa_ret = x509parse_keyfile(&_SSL[sslID].rsa, (cert_base_path + "clientcakey.pem").c_str(), NULL);
-			if (ret || rsa_ret)
+			int ret = x509_crt_parse_file(&_SSL[sslID].clicert, (cert_base_path + "clientca.pem").c_str());
+			int pk_ret = pk_parse_keyfile(&_SSL[sslID].pk, (cert_base_path + "clientcakey.pem").c_str(), NULL);
+			if (ret || pk_ret)
 			{
-				x509_free(&_SSL[sslID].clicert);
-				rsa_free(&_SSL[sslID].rsa);
-				memset(&_SSL[sslID].clicert, 0, sizeof(x509_cert));
-				memset(&_SSL[sslID].rsa, 0, sizeof(rsa_context));
+				x509_crt_free(&_SSL[sslID].clicert);
+				pk_free(&_SSL[sslID].pk);
+				memset(&_SSL[sslID].clicert, 0, sizeof(x509_crt));
+				memset(&_SSL[sslID].pk, 0, sizeof(pk_context));
 				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
 			}
 			else
 			{
-				ssl_set_own_cert(&_SSL[sslID].ctx, &_SSL[sslID].clicert, &_SSL[sslID].rsa);
+				ssl_set_own_cert(&_SSL[sslID].ctx, &_SSL[sslID].clicert, &_SSL[sslID].pk);
 				Memory::Write_U32(SSL_OK, _BufferIn);
 			}
 
-			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT = (%d, %d)", ret, rsa_ret);
+			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINCLIENTCERT = (%d, %d)", ret, pk_ret);
 		}
 		else
 		{
@@ -306,10 +305,10 @@ _SSL_NEW_ERROR:
 		int sslID = Memory::Read_U32(BufferOut) - 1;
 		if (SSLID_VALID(sslID))
 		{
-			x509_free(&_SSL[sslID].clicert);
-			rsa_free(&_SSL[sslID].rsa);
-			memset(&_SSL[sslID].clicert, 0, sizeof(x509_cert));
-			memset(&_SSL[sslID].rsa, 0, sizeof(rsa_context));
+			x509_crt_free(&_SSL[sslID].clicert);
+			pk_free(&_SSL[sslID].pk);
+			memset(&_SSL[sslID].clicert, 0, sizeof(x509_crt));
+			memset(&_SSL[sslID].pk, 0, sizeof(pk_context));
 
 			ssl_set_own_cert(&_SSL[sslID].ctx, NULL, NULL);
 			Memory::Write_U32(SSL_OK, _BufferIn);
@@ -328,10 +327,10 @@ _SSL_NEW_ERROR:
 		{
 			std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
 
-			int ret = x509parse_crtfile(&_SSL[sslID].cacert, (cert_base_path + "rootca.pem").c_str());
+			int ret = x509_crt_parse_file(&_SSL[sslID].cacert, (cert_base_path + "rootca.pem").c_str());
 			if (ret)
 			{
-				x509_free(&_SSL[sslID].clicert);
+				x509_crt_free(&_SSL[sslID].clicert);
 				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
 			}
 			else
diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
--- dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h	1979-11-29 23:00:00.000000000 -0500
+++ dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h	2014-10-02 09:55:32.057502719 -0400
@@ -9,7 +9,7 @@
 
 #include <polarssl/net.h>
 #include <polarssl/ssl.h>
-#include <polarssl/havege.h>
+#include <polarssl/entropy.h>
 
 #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;
-	x509_cert cacert;
-	x509_cert clicert;
-	rsa_context rsa;
+	entropy_context entropy;
+	x509_crt cacert;
+	x509_crt clicert;
+	pk_context pk;
 	int sockfd;
 	char hostname[NET_SSL_MAX_HOSTNAME_LEN];
 	bool active;


--- NEW FILE dolphin-emu.1 ---
.TH DOLPHIN-EMU 1 "December 10, 2010"
.SH NAME
dolphin-emu \- A Gamecube, Wii and Triforce (the arcade machine based on the
Gamecube) emulator.
.SH SYNOPSIS
.B dolphin-emu
.RI [ options ]
.SH DESCRIPTION
.B dolphin-emu
is a Gamecube, Wii and Triforce (the arcade machine based on the
Gamecube) emulator.
.P
Gamecube compatibility is okay - lots of games work, many games don't work.
.P
Wii compatibility is also good - a lot of games do work. Wii emulation
generally requires a bit more computing power than Gamecube emulation, though.
.P
Triforce compatibility is not really known yet, but at least one game runs,
with minor glitches. 
.SH OPTIONS
.TP
.BI "\-A, \-\-audio-plugin="plugin
Specify an audio plugin
.TP
.B \-b, \-\-batch
Exit application when emulator closes
.TP
.B \-d, \-\-debugger
Open the debugger
.TP
.BI "\-e, \-\-exec="file
Loads the specified file (DOL, ELF, WAD, GCM, ISO)
.TP
.B \-l, \-\-logger
Open the logger
.TP
.BI "\-V, \-\-video-plugin="plugin
Specify a video plugin
.SH AUTHOR
This manual page was written by Glenn Rice <glennricster at gmail.com>,
for the Debian system (but may be used by others).


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Feb 2013 16:53:32 -0000	1.3
+++ .cvsignore	2 Oct 2014 14:33:50 -0000	1.4
@@ -1,2 +1 @@
-dolphin-emu-3.5.tar.xz
-dolphin-emu-extra.tar.xz
+dolphin-emu-2879cbd2b564.zip


Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dolphin-emu.spec	1 Sep 2014 11:26:18 -0000	1.7
+++ dolphin-emu.spec	2 Oct 2014 14:33:51 -0000	1.8
@@ -1,29 +1,25 @@
 Name:           dolphin-emu
-Version:        3.5
-Release:        6%{?dist}
+Version:        4.0
+Release:        3%{?dist}
 Summary:        Gamecube / Wii / Triforce Emulator
 
-Url:            http://www.dolphin-emulator.com/
-#A license breakdown is included in copyright from Source1
-License:        GPLv2 and BSD and OpenSSL and Public Domain
-##Source can be grabbed using the script in Source1:
-#get-source-from-git.sh
-Source0:        %{name}-%{version}.tar.xz
-#Source1 just contains various missing files from the source
-#Most of it can be grabbed here:
-#https://github.com/chenxiaolong/Fedora-SRPMS/tree/master/dolphin-emu
-#The copyright file is from here:
-#http://ppa.launchpad.net/glennric/dolphin-emu/ubuntu/pool/main/d/dolphin-emu/dolphin-emu_3.0-0ubuntu2~lucid.debian.tar.gz
-Source1:        %{name}-extra.tar.xz
+Url:            http://dolphin-emu.org/
+License:        GPLv2 and BSD and Public Domain
+#Download here: https://dolphin-emu.googlecode.com/archive/4.0.2.zip
+Source0:        %{name}-2879cbd2b564.zip
+#Manpage from Ubuntu package
+Source1:        %{name}.1
 #Kudos to Richard on this one (allows for shared clrun lib):
 Patch0:         %{name}-%{version}-clrun.patch
-#Allows for building with wxwidget 2.8.12, rather than 2.9.3
-Patch1:         %{name}-%{version}-wx28.patch
 #Kudos to Hans de Goede (updates paths for compat-SFML16-devel):
-Patch2:         %{name}-%{version}-compat-SFML16.patch
-
-# Dolphin only runs on Intel x86 archictures
-ExclusiveArch:  i686 x86_64
+Patch1:         %{name}-%{version}-compat-SFML16.patch
+#GTK3 patch, bug: https://code.google.com/p/dolphin-emu/issues/detail?id=7069
+Patch2:         %{name}-%{version}-gtk3.patch
+#Use polarssl 1.3, workaround for fedora bug:
+#https://bugzilla.redhat.com/show_bug.cgi?id=1069394
+#Also see rpmfusion bug for details:
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2995
+Patch3:         %{name}-%{version}-polarssl13.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  bluez-libs-devel
@@ -39,8 +35,9 @@
 BuildRequires:  openal-soft-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  portaudio-devel
-BuildRequires:  SDL-devel
-BuildRequires:  wxGTK-devel
+BuildRequires:  SDL2-devel
+BuildRequires:  wxGTK3-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  zlib-devel
 BuildRequires:  Cg
 BuildRequires:  scons
@@ -50,6 +47,11 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  bochs-devel
 BuildRequires:  opencl-utils-devel
+BuildRequires:  soundtouch-devel
+BuildRequires:  polarssl-devel >= 1.3.0
+BuildRequires:  miniupnpc-devel
+BuildRequires:  libusb-devel
+
 Requires:       hicolor-icon-theme
 
 %description
@@ -59,18 +61,19 @@
 present on the original consoles.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{name}-2879cbd2b564
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
-#Patch for GCC 4.8
-sed -i 's/_rot/__rot/g' Externals/Bochs_disasm/PowerPCDisasm.cpp Externals/wxWidgets3/include/wx/image.h Externals/wxWidgets3/src/generic/graphicc.cpp Externals/wxWidgets3/src/common/cairo.cpp Externals/wxWidgets3/src/common/image.cpp Externals/wxWidgets3/src/gtk/gnome/gprint.cpp Externals/wxWidgets3/src/gtk/dcclient.cpp Externals/wxWidgets3/src/gtk/print.cpp Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp Source/Core/Core/Src/ARDecrypt.cpp Source/Core/Common/Src/CommonFuncs.h Source/Core/Common/Src/Hash.cpp
-#Various CMAKE fixes
+###CMAKE fixes
+#Allow building with cmake macro
 sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
-sed -i 's/ AND NOT SFML_VERSION_MAJOR//g' CMakeLists.txt
+#This is a typo: https://code.google.com/p/dolphin-emu/issues/detail?id=7074
+sed -i 's/soundtouch.h/SoundTouch.h/g' CMakeLists.txt
 
-#Remove all Bundled Libraries except Bochs:
+###Remove all Bundled Libraries except Bochs:
 cd Externals
 rm -f -r `ls | grep -v 'Bochs_disasm'`
 #Remove Bundled Bochs source and replace with links:
@@ -84,37 +87,37 @@
 ln -s /usr/include/bochs/disasm/*.h ./
 
 %build
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%cmake \
+       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DBUILD_SHARED_LIBS=FALSE \
        -DENCODE_FRAMEDUMPS=FALSE \
        -DUSE_EXTERNAL_CLRUN=TRUE \
        -DCLRUN_INCLUDE_PATH=%{_includedir}/opencl-utils/include \
+       -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-config-3.0 \
        .
+
 make %{?_smp_mflags}
 
 %install
 make %{?_smp_mflags} install DESTDIR=%{buildroot}
 
-#Install extras from source1:
-for size in 16 32 48 128 256; do
-    dim="${size}x${size}"
-    install -p -D -m 0644 %{name}-extra/%{name}$size.png \
-    %{buildroot}%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
-done
-desktop-file-install --dir %{buildroot}%{_datadir}/applications \
-    %{name}-extra/%{name}.desktop
-install -p -D -m 0644  %{name}-extra/%{name}.1 \
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
+#Install manpage:
+install -p -D -m 0644 %{SOURCE1} \
     %{buildroot}/%{_mandir}/man1/%{name}.1
+
 %find_lang %{name}
 
 %files -f %{name}.lang
-%doc license.txt Readme.txt docs/ActionReplay/CodeTypesGuide.txt
-%doc docs/ActionReplay/GCNCodeTypes.txt %{name}-extra/copyright
+%doc license.txt Readme.txt docs/*
+%doc docs/ActionReplay/GCNCodeTypes.txt
 %{_datadir}/%{name}
 %{_bindir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.*
+%{_datadir}/pixmaps/%{name}.xpm
+%{_libdir}/*.a
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -129,17 +132,30 @@
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
-* Mon Sep 01 2014 Sérgio Basto <sergio at serjux.com> - 3.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Thu Oct 2 2014 Jeremy Newton <alexjnewt at hotmail.com> - 4.0-3
+- Use polarssl 1.3 (fedora 21+) to avoid bundling
+- patch to use entropy functionality in SSL instead of havege
+
+* Thu Oct 2 2014 Jeremy Newton <alexjnewt at hotmail.com> - 4.0-2
+- Bundle polarssl (temporary fix, only for F19/20)
+
+* Mon Mar 3 2014 Jeremy Newton <alexjnewt at hotmail.com> - 4.0-1
+- Update to dolphin 4.0.2
+- Removed any unnecessary patches
+- Added new and updated some old patches
+- Removed exclusive arch, now builds on arm
+
+* Wed Jan 1 2014 Jeremy Newton <alexjnewt at hotmail.com> - 3.5-6
+- Build for SDL2 (Adds vibration support)
 
 * Mon Nov 18 2013 Jeremy Newton <alexjnewt at hotmail.com> - 3.5-5
 - Added patch for SFML, thanks to Hans de Goede
 
 * Sat Jul 27 2013 Jeremy Newton <alexjnewt at hotmail.com> - 3.5-4
-- Updated for SFML 2.0 update
+- Updated for SFML compat
 
 * Fri Jul 26 2013 Jeremy Newton <alexjnewt at hotmail.com> - 3.5-3
-- GCC 4.8 Fix (Fedora 19 and onwards)
+-3 GCC 4.8 Fix (Fedora 19 and onwards)
 
 * Tue Feb 19 2013 Jeremy Newton <alexjnewt at hotmail.com> - 3.5-2
 - Fixed date typos in SPEC


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2013 16:53:34 -0000	1.3
+++ sources	2 Oct 2014 14:33:51 -0000	1.4
@@ -1,2 +1 @@
-1e07d6c93da0f7bea95d3910540cf979  dolphin-emu-3.5.tar.xz
-f9cddcbc0e00e4d19465fc23542ac2bd  dolphin-emu-extra.tar.xz
+8ba4a24cfa135a33400dd908e467b7c6  dolphin-emu-2879cbd2b564.zip


--- dolphin-emu-3.5-clrun.patch DELETED ---


--- dolphin-emu-3.5-compat-SFML16.patch DELETED ---


--- dolphin-emu-3.5-wx28.patch DELETED ---

More information about the rpmfusion-commits mailing list