[patch] Disable system ffmpeg

chromium-disable-system-ffmpeg.patch (text/plain), 1.35 KB, created by Mike Gilbert on 2010-07-26 05:14:54 UTC

--- /usr/portage/www-client/chromium/chromium-9999.ebuild	2010-07-17 16:09:16.000000000 -0400
+++ chromium-9999.ebuild	2010-07-26 01:10:24.711827876 -0400
@@ -25,7 +25,6 @@
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-0.6[threads,vpx]
 	cups? ( >=net-print/cups-1.4.4 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
@@ -132,14 +131,14 @@
 	# TODO: use_system_ssl when we have a recent enough system NSS.
 	myconf="${myconf}
 		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=1
+		-Duse_system_ffmpeg=0
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_zlib=1"
 
 	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
-	myconf="${myconf} -Dproprietary_codecs=1"
+	myconf="${myconf} -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
 
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
@@ -229,9 +228,7 @@
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
-	dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)"
-	dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)"
-	dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)"
+	doexe out/Release/libffmpegsumo.so
 
 	# Use system plugins by default.
 	dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins"