rpms/dolphin-emu/F-18 dolphin-emu-3.0-gcc-4.7.patch, NONE, 1.1 dolphin-emu-3.0-libavapichange.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/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1290/F-18

Modified Files:
	dolphin-emu.spec 
Added Files:
	dolphin-emu-3.0-gcc-4.7.patch 
	dolphin-emu-3.0-libavapichange.patch 
Removed Files:
	dolphin-emu-gcc-4.7.patch 
Log Message:
Update Dolphin to work on F18, need libav api patch


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
 

dolphin-emu-3.0-libavapichange.patch:
 AVIDump.cpp |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE dolphin-emu-3.0-libavapichange.patch ---
>From e5d051a4e977443785f4e78cb6464eca0408e578 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster at gmail.com>
Date: Tue, 22 Nov 2011 19:24:05 -0600
Subject: [PATCH] Update linux libav frame dump code for recent api changes.

---
 Source/Core/VideoCommon/Src/AVIDump.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
index a5a6098..469e00d 100644
--- a/Source/Core/VideoCommon/Src/AVIDump.cpp
+++ b/Source/Core/VideoCommon/Src/AVIDump.cpp
@@ -267,8 +267,6 @@ bool AVIDump::CreateFile()
 	s_Stream->codec->gop_size = 12;
 	s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P;
 
-	av_set_parameters(s_FormatContext, NULL);
-
 	if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) ||
 			(avcodec_open(s_Stream->codec, codec) < 0))
 	{
@@ -287,14 +285,14 @@ bool AVIDump::CreateFile()
 	s_OutBuffer = new uint8_t[s_size];
 
 	NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_FormatContext->filename);
-	if (url_fopen(&s_FormatContext->pb, s_FormatContext->filename, URL_WRONLY) < 0)
+	if (avio_open(&s_FormatContext->pb, s_FormatContext->filename, AVIO_FLAG_WRITE) < 0)
 	{
 		WARN_LOG(VIDEO, "Could not open %s", s_FormatContext->filename);
 		CloseFile();
 		return false;
 	}
 
-	av_write_header(s_FormatContext);
+	avformat_write_header(s_FormatContext, NULL);
 
 	return true;
 }
@@ -374,7 +372,7 @@ void AVIDump::CloseFile()
 	if (s_FormatContext)
 	{
 		if (s_FormatContext->pb)
-			url_fclose(s_FormatContext->pb);
+			avio_close(s_FormatContext->pb);
 		av_free(s_FormatContext);
 		s_FormatContext = NULL;
 	}
-- 
1.8.0.1



Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/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	14 Dec 2012 16:39:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dolphin-emu
 Version:        3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Gamecube / Wii / Triforce Emulator
 
 Url:            http://www.dolphin-emulator.com/
@@ -19,7 +19,9 @@
 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
+#Thanks to Xiao-Long Chen, fixes recent api change in libav
+Patch2:         %{name}-%{version}-libavapichange.patch
 
 # Dolphin only runs on Intel x86 archictures
 ExclusiveArch:  i686 x86_64
@@ -62,6 +64,7 @@
 %setup -q -a 1
 %patch0 -p1 -b .clrun
 %patch1 -p1 -b .gcc470
+%patch2 -p1 -b .libav
 sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
 
 #Remove all Bundled Libraries except Bochs:
@@ -126,6 +129,10 @@
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* 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 ---