Author: jem256 Update of /cvs/nonfree/rpms/dolphin-emu/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7474 Modified Files: dolphin-emu-4.0-gtk3.patch dolphin-emu-4.0-polarssl13.patch dolphin-emu.spec Added Files: dolphin-emu-4.0-gcc49.patch Log Message: More patching dolphin-emu-4.0-gcc49.patch: Common/Src/CommonFuncs.h | 7 ++++++- VideoCommon/Src/x64TextureDecoder.cpp | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) --- NEW FILE dolphin-emu-4.0-gcc49.patch --- diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/Common/Src/CommonFuncs.h dolphin-emu-2879cbd2b564/Source/Core/Common/Src/CommonFuncs.h --- dolphin-emu-2879cbd2b564-orig/Source/Core/Common/Src/CommonFuncs.h 1979-11-30 00:00:00.000000000 -0500 +++ dolphin-emu-2879cbd2b564/Source/Core/Common/Src/CommonFuncs.h 2014-12-09 13:18:36.165423334 -0500 @@ -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 +#endif + +#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \ + !defined __SSSE3__ && defined _M_X86 #include <emmintrin.h> static __inline __m128i __attribute__((__always_inline__)) _mm_shuffle_epi8(__m128i a, __m128i mask) diff -rupN dolphin-emu-2879cbd2b564-orig/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp dolphin-emu-2879cbd2b564/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp --- dolphin-emu-2879cbd2b564-orig/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp 1979-11-30 00:00:00.000000000 -0500 +++ dolphin-emu-2879cbd2b564/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp 2014-12-09 13:33:25.042255692 -0500 @@ -23,11 +23,14 @@ #if _M_SSE >= 0x401 #include <smmintrin.h> -#include <emmintrin.h> #elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) #include <tmmintrin.h> #endif +#ifdef __SSE2__ +#include <emmintrin.h> +#endif + // This avoids a harmless warning from a system header in Clang; // see http://llvm.org/bugs/show_bug.cgi?id=16093 #ifdef __clang__ dolphin-emu-4.0-gtk3.patch: CMakeLists.txt | 18 +++--------------- Source/Core/DolphinWX/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) Index: dolphin-emu-4.0-gtk3.patch =================================================================== RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu-4.0-gtk3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dolphin-emu-4.0-gtk3.patch 2 Oct 2014 14:33:51 -0000 1.1 +++ dolphin-emu-4.0-gtk3.patch 9 Dec 2014 20:49:29 -0000 1.2 @@ -1,24 +1,34 @@ 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) +--- dolphin-emu-2879cbd2b564-orig/CMakeLists.txt 1979-11-30 00:00:00.000000000 -0500 ++++ dolphin-emu-2879cbd2b564/CMakeLists.txt 2014-12-09 15:27:57.364864541 -0500 +@@ -696,24 +696,12 @@ if(NOT DISABLE_WX AND NOT ANDROID) + endif(wxWidgets_FOUND) + + if(UNIX AND NOT APPLE) +- # There is a bug in the FindGTK module in cmake version 2.8.2 that +- # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3 +- # users have complained that pkg-config does not find +- # gdk-pixbuf-2.0. On yet another hand, cmake version 2.8.3 in +- # Ubuntu Natty does not find the glib libraries correctly. +- # Ugly!!! + execute_process(COMMAND lsb_release -c -s OUTPUT_VARIABLE DIST_NAME ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} +- 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() +- else() - include(FindGTK2) - if(GTK2_FOUND) - include_directories(${GTK2_INCLUDE_DIRS}) - endif() -+ include(FindGTK) +- endif() ++ ++ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED) + include_directories(${GTK3_INCLUDE_DIRS}) - endif() endif() + if(wxWidgets_FOUND) 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 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(-) Index: dolphin-emu-4.0-polarssl13.patch =================================================================== RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu-4.0-polarssl13.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dolphin-emu-4.0-polarssl13.patch 2 Oct 2014 14:33:51 -0000 1.1 +++ dolphin-emu-4.0-polarssl13.patch 9 Dec 2014 20:49:29 -0000 1.2 @@ -1,6 +1,6 @@ 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 +--- dolphin-emu-2879cbd2b564-orig/CMakeTests/FindPolarSSL.cmake 1979-11-30 00:00:00.000000000 -0500 ++++ dolphin-emu-2879cbd2b564/CMakeTests/FindPolarSSL.cmake 2014-12-09 13:15:25.488951757 -0500 @@ -6,14 +6,20 @@ # POLARSSL_WORKS, this is true if polarssl is found and contains the methods # needed by dolphin-emu @@ -100,8 +100,8 @@ +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 +--- dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp 1979-11-30 00:00:00.000000000 -0500 ++++ dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp 2014-12-09 13:16:30.203433018 -0500 @@ -28,12 +28,12 @@ CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_H ssl_session_free(&_SSL[i].session); ssl_free(&_SSL[i].ctx); @@ -125,7 +125,7 @@ - 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); ++ ssl_set_rng(&_SSL[sslID].ctx, entropy_func, &_SSL[sslID].entropy); // 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); @@ -221,8 +221,8 @@ } 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 +--- dolphin-emu-2879cbd2b564-orig/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 1979-11-30 00:00:00.000000000 -0500 ++++ dolphin-emu-2879cbd2b564/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 2014-12-09 13:15:25.489951749 -0500 @@ -9,7 +9,7 @@ #include <polarssl/net.h> Index: dolphin-emu.spec =================================================================== RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dolphin-emu.spec 7 Dec 2014 02:17:22 -0000 1.12 +++ dolphin-emu.spec 9 Dec 2014 20:49:29 -0000 1.13 @@ -1,6 +1,6 @@ Name: dolphin-emu Version: 4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gamecube / Wii / Triforce Emulator Url: http://dolphin-emu.org/ @@ -20,6 +20,9 @@ #Also see rpmfusion bug for details: #https://bugzilla.rpmfusion.org/show_bug.cgi?id=2995 Patch3: %{name}-%{version}-polarssl13.patch +#GCC 4.9, mostly fixed upstream, see bug for an include issue: +# +Patch4: %{name}-%{version}-gcc49.patch BuildRequires: alsa-lib-devel BuildRequires: bluez-libs-devel @@ -65,6 +68,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 ###CMAKE fixes #Allow building with cmake macro @@ -116,7 +120,6 @@ %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/%{name}.* %{_datadir}/pixmaps/%{name}.xpm -%{_libdir}/*.a %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -131,6 +134,10 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Dec 9 2014 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 4.0-6 +- Patching for GCC 4.9 +- GTK patch fixing + * Sat Dec 6 2014 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 4.0-5 - Line got deleted by accident, build fails