Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 306921 | Differences between
and this patch

Collapse All | Expand All

(-)www-client/chromium/chromium-5.0.307.9.ebuild (-4 / +4 lines)
Lines 13-19 Link Here
13
LICENSE="BSD"
13
LICENSE="BSD"
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="~amd64 ~arm ~x86"
15
KEYWORDS="~amd64 ~arm ~x86"
16
IUSE="+ffmpeg +plugins-symlink"
16
IUSE="+html5 +plugins-symlink"
17
17
18
RDEPEND="app-arch/bzip2
18
RDEPEND="app-arch/bzip2
19
	>=dev-libs/libevent-1.4.13
19
	>=dev-libs/libevent-1.4.13
Lines 24-30 Link Here
24
	>=media-libs/alsa-lib-1.0.19
24
	>=media-libs/alsa-lib-1.0.19
25
	media-libs/jpeg:0
25
	media-libs/jpeg:0
26
	media-libs/libpng
26
	media-libs/libpng
27
	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
28
	sys-libs/zlib
27
	sys-libs/zlib
29
	>=x11-libs/gtk+-2.14.7
28
	>=x11-libs/gtk+-2.14.7
30
	x11-libs/libXScrnSaver
29
	x11-libs/libXScrnSaver
Lines 39-44 Link Here
39
	>=dev-util/gperf-3.0.3
38
	>=dev-util/gperf-3.0.3
40
	>=dev-util/pkgconfig-0.23
39
	>=dev-util/pkgconfig-0.23
41
	sys-devel/flex"
40
	sys-devel/flex"
41
RDEPEND+= " html5? ( >=media-video/ffmpeg-0.5_p19787 )"
42
42
43
pkg_setup() {
43
pkg_setup() {
44
	# Prevent user problems like bug 299777.
44
	# Prevent user problems like bug 299777.
Lines 72-78 Link Here
72
	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
72
	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
73
	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
73
	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
74
	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
74
	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
75
	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
75
	use html5 && epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
76
	# Prevent the make build from filling entire disk space on some systems,
76
	# Prevent the make build from filling entire disk space on some systems,
77
	# bug 297273.
77
	# bug 297273.
78
	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
78
	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
Lines 159-165 Link Here
159
	newman out/Release/chrome.1 chrome.1
159
	newman out/Release/chrome.1 chrome.1
160
	newman out/Release/chrome.1 chromium.1
160
	newman out/Release/chrome.1 chromium.1
161
161
162
	if use ffmpeg; then
162
	if use html5; then
163
		# Chromium looks for these in its folder
163
		# Chromium looks for these in its folder
164
		# See media_posix.cc and base_paths_linux.cc
164
		# See media_posix.cc and base_paths_linux.cc
165
		dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
165
		dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}

Return to bug 306921