rpms/dolphin-emu/devel dolphin-emu-3.0-gcc-4.7.patch, NONE, 1.1 dolphin-emu.spec, 1.1, 1.2 dolphin-emu-gcc-4.7.patch, 1.1, NONE

[Jeremy Newton]

Author: jem256

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

Modified Files:
	dolphin-emu.spec 
Added Files:
	dolphin-emu-3.0-gcc-4.7.patch 
Removed Files:
	dolphin-emu-gcc-4.7.patch 
Log Message:
Fixed bug 2649


dolphin-emu-3.0-gcc-4.7.patch:
 CommonFuncs.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE dolphin-emu-3.0-gcc-4.7.patch ---
diff -Nru dolphin-emu-3.0.orig/Source/Core/Common/Src/CommonFuncs.h dolphin-emu-3.0/Source/Core/Common/Src/CommonFuncs.h
--- dolphin-emu-3.0.orig/Source/Core/Common/Src/CommonFuncs.h	2012-06-02 20:09:12.652636536 -0400
+++ dolphin-emu-3.0/Source/Core/Common/Src/CommonFuncs.h	2012-06-02 20:09:43.822657738 -0400
@@ -21,6 +21,7 @@
 #ifdef _WIN32
 #define SLEEP(x) Sleep(x)
 #else
+#include <unistd.h>
 #define SLEEP(x) usleep(x*1000)
 #endif
 


Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dolphin-emu.spec	5 Jul 2012 15:48:10 -0000	1.1
+++ dolphin-emu.spec	16 Feb 2013 16:11:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dolphin-emu
 Version:        3.0
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Gamecube / Wii / Triforce Emulator
 
 Url:            http://www.dolphin-emulator.com/
@@ -19,7 +19,7 @@
 Patch0:         %{name}-%{version}-clrun.patch
 #Build fix for gcc 4.7.0 (backwards compatible)
 #Note this is already fixed in the unstable version
-Patch1:         dolphin-emu-gcc-4.7.patch
+Patch1:         %{name}-%{version}-gcc-4.7.patch
 
 # Dolphin only runs on Intel x86 archictures
 ExclusiveArch:  i686 x86_64
@@ -47,7 +47,6 @@
 BuildRequires:  SOIL-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  ffmpeg-devel
 BuildRequires:  bochs-devel
 BuildRequires:  opencl-utils-devel
 Requires:       hicolor-icon-theme
@@ -78,10 +77,9 @@
 ln -s /usr/include/bochs/disasm/*.h ./
 
 %build
-#Required for ffmpeg header to build
-export CPATH='/usr/include/ffmpeg'
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-       -DBUILD_SHARED_LIBS:BOOL=OFF \
+       -DBUILD_SHARED_LIBS=FALSE \
+       -DENCODE_FRAMEDUMPS=FALSE \
        -DUSE_EXTERNAL_CLRUN=TRUE \
        -DCLRUN_INCLUDE_PATH=%{_includedir}/opencl-utils/include \
        .
@@ -126,6 +124,14 @@
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Sat Feb 16 2013 Jeremy Newton <alexjnewt at hotmail.com> - 3.0-12
+- Removed patch for libav and disabled ffmpeg, caused rendering issues
+- Minor consistency fixes to SPEC file
+
+* Fri Dec 14 2012 Jeremy Newton <alexjnewt at hotmail.com> - 3.0-11
+- Added patch for recent libav api change in fc18, credit to Xiao-Long Chen
+- Renamed patch 1 for consistency
+
 * Mon Jun 25 2012 Jeremy Newton <alexjnewt at hotmail.com> - 3.0-10
 - Changed CLRun buildrequire package name
 - Renamed GCC 4.7 patch to suit fedora standards


--- dolphin-emu-gcc-4.7.patch DELETED ---