rpms/dolphin-emu/F-20 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.1, NONE, 1.1 .cvsignore, 1.3, 1.4 dolphin-emu.spec, 1.6, 1.7 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:32:30 CEST 2014 

Author: jem256

Update of /cvs/nonfree/rpms/dolphin-emu/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24784/F-20

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.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)


--- 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/F-20/.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:32:30 -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/F-20/dolphin-emu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dolphin-emu.spec	18 Nov 2013 13:09:02 -0000	1.6
+++ dolphin-emu.spec	2 Oct 2014 14:32:30 -0000	1.7
@@ -1,29 +1,20 @@
 Name:           dolphin-emu
-Version:        3.5
-Release:        5%{?dist}
+Version:        4.0
+Release:        2%{?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
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  bluez-libs-devel
@@ -39,8 +30,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 +42,15 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  bochs-devel
 BuildRequires:  opencl-utils-devel
+BuildRequires:  soundtouch-devel
+#BuildRequires:  polarssl-devel
+BuildRequires:  miniupnpc-devel
+BuildRequires:  libusb-devel
+
+#Bug in fedora, not an issue for polarssl 1.3 in F21:
+#https://bugzilla.redhat.com/show_bug.cgi?id=1069394
+Provides: bundled(polarssl) = 1.2.8
+
 Requires:       hicolor-icon-theme
 
 %description
@@ -59,20 +60,20 @@
 present on the original consoles.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{name}-2879cbd2b564
 %patch0 -p1
 %patch1 -p1
 %patch2 -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 and polarssl:
 cd Externals
-rm -f -r `ls | grep -v 'Bochs_disasm'`
+rm -f -r `ls | grep -v 'Bochs_disasm' | grep -v 'polarssl'`
 #Remove Bundled Bochs source and replace with links:
 cd Bochs_disasm
 rm -f -r `ls | grep -v 'PowerPC*' | grep -v 'CMakeLists.txt'`
@@ -84,37 +85,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,14 +130,26 @@
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* 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/F-20/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:32:30 -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