[arch-commits] Commit in dolphin-emu/trunk (2 files)

[Maxime Gauduin]

    Date: Tuesday, February 16, 2016 @ 20:07:09
  Author: alucryd
Revision: 161868

ffmpeg 3.0 rebuild: dolphin-emu 1:5.0rc-1

Deleted:
  dolphin-emu/trunk/dolphin-emu-findx11.patch
  dolphin-emu/trunk/dolphin-emu-gcc49.patch

---------------------------+
 dolphin-emu-findx11.patch |   11 -----------
 dolphin-emu-gcc49.patch   |   17 -----------------
 2 files changed, 28 deletions(-)

Deleted: dolphin-emu-findx11.patch
===================================================================
--- dolphin-emu-findx11.patch	2016-02-16 19:05:37 UTC (rev 161867)
+++ dolphin-emu-findx11.patch	2016-02-16 19:07:09 UTC (rev 161868)
@@ -1,11 +0,0 @@
-diff -rupN dolphin-4.0.2.orig/CMakeLists.txt dolphin-4.0.2/CMakeLists.txt
---- dolphin-4.0.2.orig/CMakeLists.txt	2015-03-31 15:05:43.953995860 +0200
-+++ dolphin-4.0.2/CMakeLists.txt	2015-03-31 15:06:53.379078333 +0200
-@@ -417,6 +417,7 @@ if(NOT ANDROID)
- 
- 		# Note: We do not need to explicitly check for X11 as it is done in the cmake
- 		# FindOpenGL module on linux.
-+		include(FindX11)
- 		if(USE_X11 AND X11_FOUND)
- 			set(USE_X11 1)
- 			add_definitions(-DHAVE_X11=1)

Deleted: dolphin-emu-gcc49.patch
===================================================================
--- dolphin-emu-gcc49.patch	2016-02-16 19:05:37 UTC (rev 161867)
+++ dolphin-emu-gcc49.patch	2016-02-16 19:07:09 UTC (rev 161868)
@@ -1,17 +0,0 @@
-diff -rupN dolphin.orig/Source/Core/Common/Src/CommonFuncs.h dolphin/Source/Core/Common/Src/CommonFuncs.h
---- dolphin.orig/Source/Core/Common/Src/CommonFuncs.h	2014-08-19 02:36:05.555642000 +0200
-+++ dolphin/Source/Core/Common/Src/CommonFuncs.h	2014-08-19 02:38:44.301036700 +0200
-@@ -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)