[packages/chromium-browser/dev-37] start on 37 branch (37.0.2062.94)
glen
glen at pld-linux.org
Sat Oct 4 17:44:30 CEST 2014
commit 6e3c39b46bcc6003cc0a6b528c2115d0699d1f21
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Sep 1 14:08:20 2014 +0300
start on 37 branch (37.0.2062.94)
angle.patch | 11 ++++++++
chromium-browser.spec | 17 +++++++++---
ffmpeg.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 98 insertions(+), 4 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 23536cd..736a54d 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -61,8 +61,8 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define branch 36.0.1985
-%define basever 143
+%define branch 37.0.2062
+%define basever 94
#define patchver 132
%define gyp_rev 1014
Summary: A WebKit powered web browser
@@ -76,7 +76,7 @@ Release: 1
License: BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
Group: X11/Applications/Networking
Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: 8180f26a32fec2f28ae0a2f9a25bdca2
+# Source0-md5: b911b7768d90948b7f9b0a6cdb87ba40
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
# Patch0-md5: 4eafe1e64bd47a11dbfaf61a2dd50b6e
@@ -107,6 +107,8 @@ Patch30: system-ply.patch
Patch31: system-jinja.patch
Patch32: remove_bundled_libraries-stale.patch
Patch35: etc-dir.patch
+Patch36: angle.patch
+Patch37: ffmpeg.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -310,6 +312,8 @@ ln -s %{SOURCE7} .
#%patch31 -p0
%patch32 -p1
%patch35 -p1
+%patch36 -p1
+%patch37 -p1
%{?with_dev:exit 0}
@@ -369,15 +373,19 @@ fi
if [ ! -d third_party/ffmpeg/build.%{target_arch}.linux ]; then
# Re-configure bundled ffmpeg
cd third_party/ffmpeg
- chromium/scripts/build_ffmpeg.sh linux %{target_arch} "$PWD" config-only
+ chromium/scripts/build_ffmpeg.py linux %{target_arch}
chromium/scripts/copy_config.sh
+ chromium/scripts/generate_gyp.py
cd -
fi
%endif
+third_party/libaddressinput/chromium/tools/update-strings.py
+
flags="
-Dtarget_arch=%{target_arch} \
-Dpython_arch=%{target_arch} \
+ -Dffmpeg_branding=Chromium \
-Dsystem_libdir=%{_lib} \
-Dpython_ver=%{py_ver} \
%if "%{cc_version}" >= "4.4.0" && "%{cc_version}" < "4.5.0"
@@ -521,6 +529,7 @@ install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome-sandbox
%if %{without system_ffmpeg}
install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
%endif
+install -p libpdf.so $RPM_BUILD_ROOT%{_libdir}/%{name}
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/master_preferences
diff --git a/angle.patch b/angle.patch
new file mode 100644
index 0000000..ab9b45f
--- /dev/null
+++ b/angle.patch
@@ -0,0 +1,11 @@
+--- a/third_party/angle/src/angle.gypi
++++ b/third_party/angle/src/angle.gypi
+@@ -52,7 +52,7 @@
+ 'action_name': 'Generate ANGLE Commit ID Header',
+ 'message': 'Generating ANGLE Commit ID',
+ # reference the git index as an input, so we rebuild on changes to the index
+- 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
++ 'inputs': [ '<(angle_id_script)' ],
+ 'outputs': [ '<(angle_id_header)' ],
+ 'msvs_cygwin_shell': 0,
+ 'action':
diff --git a/ffmpeg.patch b/ffmpeg.patch
new file mode 100644
index 0000000..6ce1b87
--- /dev/null
+++ b/ffmpeg.patch
@@ -0,0 +1,74 @@
+--- ./third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig 2014-06-13 13:13:35.762996021 +0000
++++ ./third_party/ffmpeg/chromium/scripts/generate_gyp.py 2014-06-13 13:13:38.693099249 +0000
+@@ -131,7 +131,7 @@
+ """
+
+ # Controls GYP conditional stanza generation.
+-SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
++SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
+ SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
+ # Mac doesn't have any platform specific files, so just use linux and win.
+ SUPPORTED_PLATFORMS = ['linux', 'win']
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -7,7 +7,6 @@
+ from __future__ import print_function
+
+ import collections
+-import functools
+ import multiprocessing
+ import optparse
+ import os
+@@ -22,6 +21,14 @@ SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
+ FFMPEG_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..', '..'))
+
+
++BRANDINGS = [
++ 'Chrome',
++ 'ChromeOS',
++ 'Chromium',
++ 'ChromiumOS',
++]
++
++
+ USAGE = """Usage: %prog TARGET_OS TARGET_ARCH [options] -- [configure_args]
+
+ Valid combinations are linux [ia32|x64|mipsel|arm|arm-neon]
+@@ -113,8 +120,6 @@ def RewriteFile(path, search, replace):
+
+ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
+ config_only, config, configure_flags):
+- print('%s configure/build:' % config)
+-
+ config_dir = 'build.%s.%s/%s' % (target_arch, target_os, config)
+ shutil.rmtree(config_dir, ignore_errors=True)
+ os.makedirs(os.path.join(config_dir, 'out'))
+@@ -165,6 +170,9 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
+
+ def main(argv):
+ parser = optparse.OptionParser(usage=USAGE)
++ parser.add_option('--branding', action='append', dest='brandings',
++ choices=BRANDINGS,
++ help='Branding to build; determines e.g. supported codecs')
+ parser.add_option('--config-only', action='store_true',
+ help='Skip the build step. Useful when a given platform '
+ 'is not necessary for generate_gyp.py')
+@@ -426,9 +434,15 @@ def main(argv):
+ '--enable-parser=gsm',
+ ])
+
+- do_build_ffmpeg = functools.partial(
+- BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
+- options.config_only)
++ def do_build_ffmpeg(branding, configure_flags):
++ if options.brandings and branding not in options.brandings:
++ print('%s skipped' % branding)
++ return
++
++ print('%s configure/build:' % branding)
++ BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
++ options.config_only, branding, configure_flags)
++
+ do_build_ffmpeg('Chromium',
+ configure_flags['Common'] +
+ configure_flags['Chromium'] +
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/6e3c39b46bcc6003cc0a6b528c2115d0699d1f21
More information about the pld-cvs-commit
mailing list