rpms/dolphin-emu/F-18 dolphin-emu.spec, 1.2, 1.3 dolphin-emu-3.0-libavapichange.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-serv30786/F-18

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



Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/dolphin-emu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dolphin-emu.spec	14 Dec 2012 16:39:20 -0000	1.2
+++ dolphin-emu.spec	16 Feb 2013 16:12:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dolphin-emu
 Version:        3.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Gamecube / Wii / Triforce Emulator
 
 Url:            http://www.dolphin-emulator.com/
@@ -20,8 +20,6 @@
 #Build fix for gcc 4.7.0 (backwards compatible)
 #Note this is already fixed in the unstable version
 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
@@ -49,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
@@ -64,7 +61,6 @@
 %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:
@@ -81,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 \
        .
@@ -129,6 +124,10 @@
 /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


--- dolphin-emu-3.0-libavapichange.patch DELETED ---