The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=b413a7441....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit 0d47ab0d0b9d6f2432dd5a50d01960dea161f8c4
Merge: 00b7151 21e3607
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 28 06:27:21 2017 -0400
Merge branch 'master' into f25
commit 21e36077483a64d95392724bbdf4bc60ed4864c7
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 25 16:59:08 2017 -0400
more aarch64 ffmpeg files
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 728a677..e68c589 100755
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -186,7 +186,12 @@ header_files=" libavcodec/x86/inline_asm.h \
compat/va_copy.h \
compat/atomics/gcc/stdatomic.h "
-manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
+manual_files=" libavcodec/aarch64/fft_neon.S \
+ libavcodec/aarch64/h264pred_neon.S \
+ libavcodec/aarch64/hpeldsp_neon.S \
+ libavcodec/aarch64/mdct_neon.S \
+ libavcodec/aarch64/vorbisdsp_neon.S \
+ libavcodec/x86/hpeldsp_rnd_template.c \
libavcodec/x86/rnd_template.c \
libavcodec/x86/videodsp.asm \
libavcodec/x86/videodsp_init.c \
@@ -213,6 +218,7 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
libavformat/utils.c \
libavutil/aarch64/asm.S \
libavutil/aarch64/bswap.h \
+ libavutil/aarch64/float_dsp_neon.S \
libavutil/aarch64/timer.h \
libavutil/cpu.c \
libavutil/fixed_dsp.c \
diff --git a/sources b/sources
index 82d3d69..c901ac2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) =
d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) =
4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
-SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
197b8b44a98709cbc17f7081d0fdcc0cd57e8a1516cca47cc5004d2f002a2b49e9dca362bc139cf0b9c042701601c27c22ff62af001eb026126adfc461cb4ff8
+SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
3fbcdf47485a9d655cf43f05b24f0e22e6d2662d155f54039668673b21616d2941a0620db74c3788288af91fcb0ded1d2f45497c51a8799ddcf70f7420aee2c5
commit 321d5de0345b4863d1625507044ed08ff9f00d12
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 25 15:31:37 2017 -0400
fix include pathing in libavutil/timer.h
diff --git a/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
b/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
new file mode 100644
index 0000000..7248825
--- /dev/null
+++ b/chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
@@ -0,0 +1,21 @@
+diff -up chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix
chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h
+--- chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix 2017-08-25
15:29:12.143242471 -0400
++++ chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h 2017-08-25
15:29:36.941835865 -0400
+@@ -39,13 +39,13 @@
+ #include "log.h"
+
+ #if ARCH_AARCH64
+-# include "aarch64/timer.h"
++# include "libavutil/aarch64/timer.h"
+ #elif ARCH_ARM
+-# include "arm/timer.h"
++# include "libavutil/arm/timer.h"
+ #elif ARCH_PPC
+-# include "ppc/timer.h"
++# include "libavutil/ppc/timer.h"
+ #elif ARCH_X86
+-# include "x86/timer.h"
++# include "libavutil/x86/timer.h"
+ #endif
+
+ #if !defined(AV_READ_TIME)
diff --git a/chromium.spec b/chromium.spec
index 9552beb..7df942d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -204,6 +204,9 @@ Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
Patch48: chromium-60.0.3112.101-camfix.patch
# Fix mp3 for aarch64
Patch49: chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
+# Fix libavutil include pathing to find arch specific timer.h
+# For some reason, this only fails on aarch64. No idea why.
+Patch50: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -643,6 +646,8 @@ udev.
%patch47 -p1 -b .c99
%endif
%patch48 -p1 -b .camfix
+%patch50 -p1 -b .pathfix
+
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
commit 7d1f0eac97963a947de652c5301165efb02a9521
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 25 13:45:36 2017 -0400
fixed sources for aarch64
diff --git a/.gitignore b/.gitignore
index 57a8df9..4364688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
/chromium-60.0.3112.90-clean.tar.xz
/chromium-60.0.3112.101-clean.tar.xz
/chromium-60.0.3112.113-clean.tar.xz
+/chromium-60.0.3112.113.tar.xz
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 272ec2d..728a677 100755
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -211,6 +211,9 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
libavformat/options.c \
libavformat/pcm.c \
libavformat/utils.c \
+ libavutil/aarch64/asm.S \
+ libavutil/aarch64/bswap.h \
+ libavutil/aarch64/timer.h \
libavutil/cpu.c \
libavutil/fixed_dsp.c \
libavutil/float_dsp.c \
diff --git a/sources b/sources
index a3e56fa..82d3d69 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) =
d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) =
4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
-SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
67cd2d29761b61187ccec90da7d755f4214afd99bcfba4f0633b444532e094fe4c6624f2b1f0695df5ea5d616cff971fa4be52e60ff108e660db36f54fc73c02
+SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
197b8b44a98709cbc17f7081d0fdcc0cd57e8a1516cca47cc5004d2f002a2b49e9dca362bc139cf0b9c042701601c27c22ff62af001eb026126adfc461cb4ff8
commit 761a02838d7de421b957b9ce089d1103606a9581
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 24 17:03:09 2017 -0400
fixed sources
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 7bd9e5d..272ec2d 100755
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -220,6 +220,7 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
libavutil/x86/x86util.asm "
mp3_files=" libavcodec/aarch64/mpegaudiodsp_init.c \
+ libavcodec/aarch64/mpegaudiodsp_neon.S \
libavcodec/aac_ac3_parser.c \
libavcodec/aac_parser.c \
libavcodec/aacadtsdec.c \
diff --git a/sources b/sources
index e3cfeb6..a3e56fa 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) =
d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) =
4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
-SHA512 (chromium-60.0.3112.101-clean.tar.xz) =
3ed13c6a32752294898fa72f2333f32fcf081eef7328307645dbc09baae95aca762d3083d2ae053fc903a0b4dc92e04da91a810d267aab21dea196362ed6abc6
-SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
7b9dcea4b256113757e57da6b4025873b0e57da38cbb37d6ea8ae8910127a885c02be2bd3f4e6f0af3c8403986da1190d94f2f060198a25d4780a3c70b3e6065
+SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
67cd2d29761b61187ccec90da7d755f4214afd99bcfba4f0633b444532e094fe4c6624f2b1f0695df5ea5d616cff971fa4be52e60ff108e660db36f54fc73c02
commit 984bf67d4286d0c64b3ee2d80e37482367559d01
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 24 16:03:00 2017 -0400
update to 60.0.3112.113, fix ffmpeg clean script to not delete aarch64 file
diff --git a/.gitignore b/.gitignore
index 428fd64..57a8df9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/chromium-59.0.3071.109-freetype.tar.bz2
/chromium-60.0.3112.90-clean.tar.xz
/chromium-60.0.3112.101-clean.tar.xz
+/chromium-60.0.3112.113-clean.tar.xz
diff --git a/chromium.spec b/chromium.spec
index 44792d6..9552beb 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -115,8 +115,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3112.101
-Release: 2%{?dist}
+Version: %{majorversion}.0.3112.113
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url:
http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
@@ -1862,6 +1862,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Thu Aug 23 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.113-1
+- fix ffmpeg clean script to not delete aarch64 file
+- update to 60.0.3112.113
+
* Wed Aug 23 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-3
- apply aarch64 fixes from Ryan Blakely <rblakely(a)redhat.com>
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 755ce8a..7bd9e5d 100755
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -219,7 +219,8 @@ manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
libavutil/x86/x86inc.asm \
libavutil/x86/x86util.asm "
-mp3_files=" libavcodec/aac_ac3_parser.c \
+mp3_files=" libavcodec/aarch64/mpegaudiodsp_init.c \
+ libavcodec/aac_ac3_parser.c \
libavcodec/aac_parser.c \
libavcodec/aacadtsdec.c \
libavcodec/aacps_float.c \
diff --git a/sources b/sources
index 9309b9e..e3cfeb6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (depot_tools.git-master.tar.gz) =
d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) =
4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
SHA512 (chromium-60.0.3112.101-clean.tar.xz) =
3ed13c6a32752294898fa72f2333f32fcf081eef7328307645dbc09baae95aca762d3083d2ae053fc903a0b4dc92e04da91a810d267aab21dea196362ed6abc6
+SHA512 (chromium-60.0.3112.113-clean.tar.xz) =
7b9dcea4b256113757e57da6b4025873b0e57da38cbb37d6ea8ae8910127a885c02be2bd3f4e6f0af3c8403986da1190d94f2f060198a25d4780a3c70b3e6065
commit c74ab79e4c2fddb71c175103babba7636e013a78
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Aug 23 16:34:59 2017 -0400
add BR: ninja-build
diff --git a/chromium.spec b/chromium.spec
index b058c6d..44792d6 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -377,6 +377,8 @@ BuildRequires: pkgconfig(gnome-keyring-1)
# remote desktop needs this
BuildRequires: pam-devel
BuildRequires: systemd
+# using the built from source version on aarch64
+BuildRequires: ninja-build
# We pick up an automatic requires on the library, but we need the version check
# because the nss shared library is unversioned.
commit b413a74418255ded1c8f4c6b45002d03372b0179
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Aug 23 14:53:36 2017 -0400
Another player has entered the game: aarch64!
diff --git a/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
b/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
new file mode 100644
index 0000000..a39e044
--- /dev/null
+++ b/chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
@@ -0,0 +1,12 @@
+diff -up chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64
chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 2017-08-23
14:46:37.305832399 -0400
++++ chromium-60.0.3112.101/third_party/ffmpeg/ffmpeg_generated.gni 2017-08-23
14:47:06.217148864 -0400
+@@ -539,7 +539,7 @@ if (is_linux && current_cpu == "arm64")
+ ]
+ }
+
+-if ((is_android && current_cpu == "arm64" && ffmpeg_branding
== "Chrome") || (is_linux && current_cpu == "arm64" &&
ffmpeg_branding == "Chrome") || (is_linux && current_cpu ==
"arm64" && ffmpeg_branding == "ChromeOS")) {
++if ((is_android && current_cpu == "arm64" && ffmpeg_branding
== "Chrome") || (is_linux && current_cpu == "arm64" &&
ffmpeg_branding == "Chrome") || (is_linux && current_cpu ==
"arm64" && ffmpeg_branding == "ChromeOS") || (is_linux
&& current_cpu == "arm64" && ffmpeg_branding ==
"Chromium")) {
+ ffmpeg_c_sources += [
+ "libavcodec/aarch64/mpegaudiodsp_init.c",
+ ]
diff --git a/chromium.spec b/chromium.spec
index 2c2e466..b058c6d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -202,6 +202,8 @@ Patch46: chromium-60.0.3112.90-init-list-hack.patch
Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
#
https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a...
Patch48: chromium-60.0.3112.101-camfix.patch
+# Fix mp3 for aarch64
+Patch49: chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -411,7 +413,7 @@ Provides: chromium-libs = %{version}-%{release}
Obsoletes: chromium-libs <= %{version}-%{release}
%endif
-ExclusiveArch: x86_64 i686
+ExclusiveArch: x86_64 i686 aarch64
# Bundled bits (I'm sure I've missed some)
Provides: bundled(angle) = 2422
@@ -623,6 +625,7 @@ udev.
# Do not apply mp3 change
%else
%patch34 -p1 -b .mp3
+%patch49 -p1 -b .aarch64
%endif
%patch36 -p1 -b .revert
%patch37 -p1 -b .ffmpeg-stdatomic
@@ -751,7 +754,7 @@ popd
# Core defines are flags that are true for both the browser and headless.
CHROMIUM_CORE_GN_DEFINES=""
CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
-%ifarch x86_64
+%ifarch x86_64 aarch64
CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
%endif
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}"
google_default_client_id="%{default_client_id}"
google_default_client_secret="%{default_client_secret}"'
@@ -762,6 +765,9 @@ CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS"
proprietary_codecs=true'
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium"
proprietary_codecs=false'
%endif
CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false'
+%ifarch aarch64
+CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
+%endif
export CHROMIUM_CORE_GN_DEFINES
CHROMIUM_BROWSER_GN_DEFINES=""
@@ -1005,6 +1011,18 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
yasm \
zlib
+# fix arm gcc
+sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
+
+%ifarch aarch64
+# We don't need to cross compile while building on an aarch64 system.
+sed -i 's|aarch64-linux-gnu-||g' build/toolchain/linux/BUILD.gn
+
+# Correct the ninja file to check for aarch64, not just x86.
+sed -i '/${LONG_BIT}/ a \ aarch64)\' ../depot_tools/ninja
+sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build"
"$@";;\' ../depot_tools/ninja
+%endif
+
tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES
$CHROMIUM_BROWSER_GN_DEFINES"
%{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES
$CHROMIUM_BROWSER_GN_DEFINES" %{target}
@@ -1030,9 +1048,6 @@ sed '14i#define WIDEVINE_CDM_VERSION_STRING "Something
fresh"' -i "third_party/w
FILE=chrome/common/channel_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora
Project"/' $FILE
-# fix arm gcc
-sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
-
%build
%if %{?tests}
@@ -1845,6 +1860,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Wed Aug 23 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-3
+- apply aarch64 fixes from Ryan Blakely <rblakely(a)redhat.com>
+
* Thu Aug 17 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-2
- fix dep issue with chrome-remote-desktop on el7
commit ae08a775d9336ef42c6aa3f65faf978fb71ddf1f
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 17 09:31:37 2017 -0400
fix dep issue with chrome-remote-desktop on el7
diff --git a/chromium.spec b/chromium.spec
index c99bb84..2c2e466 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -116,7 +116,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3112.101
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url:
http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
@@ -549,7 +549,11 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Requires: xorg-x11-server-Xvfb
+%if 0%{?rhel} == 7
+Requires: python-psutil
+%else
Requires: python2-psutil
+%endif
%if 0%{?shared}
Requires: chromium-libs%{_isa} = %{version}-%{release}
%endif
@@ -1841,6 +1845,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Thu Aug 17 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-2
+- fix dep issue with chrome-remote-desktop on el7
+
* Wed Aug 16 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-1
- update to 60.0.3112.101
- apply upstream fix for cameras which report zero resolution formats