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 ) |
27 |
ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 ) |
28 |
sys-libs/zlib |
28 |
sys-libs/zlib |
29 |
>=x11-libs/gtk+-2.14.7 |
29 |
>=x11-libs/gtk+-2.14.7 |
30 |
x11-libs/libXScrnSaver |
30 |
x11-libs/libXScrnSaver |
Lines 77-82
Link Here
|
77 |
# bug 297273. |
77 |
# bug 297273. |
78 |
epatch "${FILESDIR}"/${PN}-fix-make-build.patch |
78 |
epatch "${FILESDIR}"/${PN}-fix-make-build.patch |
79 |
|
79 |
|
|
|
80 |
# In case we don't use system ffmpeg, allow us to compile chromium with |
81 |
# internal ffmpeg and h264 |
82 |
if ! use ffmpeg; then |
83 |
epatch "${FILESDIR}"/${PN}-fix-ffmpeg-branding.patch |
84 |
|
85 |
# This needs some fixing, we have to alter the chromium includes of |
86 |
# ffmpeg, fix the paths inside the include and disable zlib, we will link |
87 |
# against system |
88 |
cp third_party/ffmpeg/source/config/Chrome/linux/x64/config.h \ |
89 |
third_party/ffmpeg/source/config/Chromium/linux/x64/config.h |
90 |
|
91 |
sed -e 's/chrome-ffmpeg/chromium-ffmpeg/' \ |
92 |
-i third_party/ffmpeg/source/config/Chromium/linux/x64/config.h \ |
93 |
|| die "ffmpeg chromium path sed failed" |
94 |
|
95 |
sed -e 's/^#define CONFIG_ZLIB 1$/#define CONFIG_ZLIB 0/' \ |
96 |
-i third_party/ffmpeg/source/config/Chromium/linux/x64/config.h \ |
97 |
|| die "ffmpeg zlib sed failed" |
98 |
fi |
99 |
|
80 |
# Disable prefixing to allow linking against system zlib |
100 |
# Disable prefixing to allow linking against system zlib |
81 |
sed -e '/^#include "mozzconf.h"$/d' \ |
101 |
sed -e '/^#include "mozzconf.h"$/d' \ |
82 |
-i third_party/zlib/zconf.h \ |
102 |
-i third_party/zlib/zconf.h \ |
Lines 102-114
Link Here
|
102 |
export HOME="${S}" |
122 |
export HOME="${S}" |
103 |
|
123 |
|
104 |
# Configuration options (system libraries) |
124 |
# Configuration options (system libraries) |
105 |
local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1" |
125 |
local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" |
106 |
# -Duse_system_sqlite=1 : http://crbug.com/22208 |
126 |
# -Duse_system_sqlite=1 : http://crbug.com/22208 |
107 |
# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) |
127 |
# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) |
108 |
|
128 |
|
109 |
# Sandbox paths |
129 |
# Sandbox paths |
110 |
myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
130 |
myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
111 |
|
131 |
|
|
|
132 |
if use ffmpeg ; then |
133 |
myconf="${myconf} -Duse_system_ffmpeg=1" |
134 |
fi |
135 |
|
112 |
if use amd64 ; then |
136 |
if use amd64 ; then |
113 |
myconf="${myconf} -Dtarget_arch=x64" |
137 |
myconf="${myconf} -Dtarget_arch=x64" |
114 |
fi |
138 |
fi |
Lines 151-156
Link Here
|
151 |
doexe out/Release/xdg-settings |
175 |
doexe out/Release/xdg-settings |
152 |
doexe "${FILESDIR}"/chromium-launcher.sh |
176 |
doexe "${FILESDIR}"/chromium-launcher.sh |
153 |
|
177 |
|
|
|
178 |
if ! use ffmpeg; then |
179 |
doexe out/Release/ffmpegsumo_nolink |
180 |
doexe out/Release/libffmpegsumo.so # Treat as an exe |
181 |
fi |
182 |
|
154 |
insinto ${CHROMIUM_HOME} |
183 |
insinto ${CHROMIUM_HOME} |
155 |
doins out/Release/chrome.pak |
184 |
doins out/Release/chrome.pak |
156 |
|
185 |
|