diff --git a/.gitignore b/.gitignore index 0bc1f69..351b0e3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /chromium-56.0.2924.87-clean.tar.xz /chromium-57.0.2987.110-clean.tar.xz /chromium-57.0.2987.133-clean.tar.xz +/chromium-58.0.3029.81-clean.tar.xz +/chromium-58.0.3029.110-clean.tar.xz diff --git a/chrome-remote-desktop.service b/chrome-remote-desktop.service deleted file mode 100644 index 2713bf1..0000000 --- a/chrome-remote-desktop.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description="Chrome Remote Desktop host daemon" - -[Service] -Environment=HOME=%h -ExecStart=@@CRD_PATH@@/chrome-remote-desktop --start --foreground -ExecStop=@@CRD_PATH@@/chrome-remote-desktop --stop -ExecReload=@@CRD_PATH@@/chrome-remote-desktop --reload -Restart=always -TimeoutStopSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/chrome-remote-desktop@.service b/chrome-remote-desktop@.service new file mode 100644 index 0000000..4b5b1fc --- /dev/null +++ b/chrome-remote-desktop@.service @@ -0,0 +1,14 @@ +[Unit] +Description="Chrome Remote Desktop host daemon" + +[Service] +User=%i +Environment=HOME=%h +ExecStart=@@CRD_PATH@@/chrome-remote-desktop --start --foreground +ExecStop=@@CRD_PATH@@/chrome-remote-desktop --stop +ExecReload=@@CRD_PATH@@/chrome-remote-desktop --reload +Restart=always +TimeoutStopSec=10 + +[Install] +WantedBy=multi-user.target diff --git a/chromium-52.0.2743.82-widevinefix.patch b/chromium-52.0.2743.82-widevinefix.patch deleted file mode 100644 index 86414a6..0000000 --- a/chromium-52.0.2743.82-widevinefix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix chromium-52.0.2743.82/chrome/common/chrome_content_client.cc ---- chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix 2016-07-22 12:18:49.505235856 -0400 -+++ chromium-52.0.2743.82/chrome/common/chrome_content_client.cc 2016-07-22 12:20:04.200789682 -0400 -@@ -203,10 +203,7 @@ void ComputeBuiltInPlugins(std::vectorpush_back(content::CdmInfo(kWidevineCdmType, version, cdm_path, - codecs_supported)); - } diff --git a/chromium-56.0.2924.87-gcc-49.patch b/chromium-56.0.2924.87-gcc-49.patch deleted file mode 100644 index f5ff3d2..0000000 --- a/chromium-56.0.2924.87-gcc-49.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc.gcc49 chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc ---- chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc.gcc49 2017-02-13 11:41:35.563497836 -0500 -+++ chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc 2017-02-13 11:42:43.608161336 -0500 -@@ -412,7 +412,7 @@ std::unique_ptr Desktop - return nullptr; - } - -- return capturer; -+ return std::move(capturer); - } - - } // namespace webrtc diff --git a/chromium-56.0.2924.87-unique-ptr-fix.patch b/chromium-56.0.2924.87-unique-ptr-fix.patch deleted file mode 100644 index 4542143..0000000 --- a/chromium-56.0.2924.87-unique-ptr-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc.unique-ptr-fix chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc ---- chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc.unique-ptr-fix 2017-02-24 07:50:09.183551244 -0500 -+++ chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc 2017-02-24 07:50:31.619111443 -0500 -@@ -130,7 +130,7 @@ std::unique_ptr Fa - - ipc_server_map_[connection_id] = fake_ipc_server->AsWeakPtr(); - -- return fake_ipc_server; -+ return std::move(fake_ipc_server); - } - - base::WeakPtr diff --git a/chromium-57.0.2987.110-enable-mp3.patch b/chromium-57.0.2987.110-enable-mp3.patch deleted file mode 100644 index a8b9ee6..0000000 --- a/chromium-57.0.2987.110-enable-mp3.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -up chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni ---- chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-03-20 13:53:24.000000000 -0400 -+++ chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni 2017-03-20 13:59:11.214419428 -0400 -@@ -176,19 +176,12 @@ if ((is_linux && current_cpu == "arm" && - ] - } - --if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { -+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) -+{ - ffmpeg_c_sources += [ -- "libavcodec/aac_ac3_parser.c", -- "libavcodec/aac_parser.c", -- "libavcodec/aacadtsdec.c", -- "libavcodec/aacps_float.c", -- "libavcodec/aacpsdsp_float.c", -- "libavcodec/aacsbr.c", -- "libavcodec/aactab.c", -- "libavcodec/ac3tab.c", -- "libavcodec/autorename_libavcodec_aacdec.c", - "libavcodec/autorename_libavcodec_mpegaudiodsp.c", - "libavcodec/autorename_libavcodec_sbrdsp.c", -+ "libavcodec/ac3tab.c", - "libavcodec/cbrt_data.c", - "libavcodec/dct.c", - "libavcodec/dct32_fixed.c", -@@ -204,7 +197,6 @@ if ((current_cpu == "x64" && ffmpeg_bran - "libavcodec/mpegaudiodsp_float.c", - "libavcodec/sinewin.c", - "libavcodec/sinewin_fixed.c", -- "libavformat/aacdec.c", - "libavformat/apetag.c", - "libavformat/img2.c", - "libavformat/mov.c", -@@ -213,6 +205,21 @@ if ((current_cpu == "x64" && ffmpeg_bran - ] - } - -+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) -+{ -+ ffmpeg_c_sources += [ -+ "libavcodec/aac_ac3_parser.c", -+ "libavcodec/aac_parser.c", -+ "libavcodec/aacadtsdec.c", -+ "libavcodec/aacps_float.c", -+ "libavcodec/aacpsdsp_float.c", -+ "libavcodec/aacsbr.c", -+ "libavcodec/aactab.c", -+ "libavcodec/autorename_libavcodec_aacdec.c", -+ "libavformat/aacdec.c", -+ ] -+} -+ - if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { - ffmpeg_c_sources += [ - "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", -@@ -312,21 +319,31 @@ if ((is_linux && current_cpu == "x64") | - if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { - ffmpeg_c_sources += [ - "libavcodec/x86/aacpsdsp_init.c", -+ ] -+} -+ -+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { -+ ffmpeg_c_sources += [ - "libavcodec/x86/dct_init.c", - "libavcodec/x86/mpegaudiodsp.c", - "libavcodec/x86/sbrdsp_init.c", - ] - } - --if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { -+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { - ffmpeg_yasm_sources += [ -- "libavcodec/x86/aacpsdsp.asm", - "libavcodec/x86/dct32.asm", - "libavcodec/x86/imdct36.asm", - "libavcodec/x86/sbrdsp.asm", - ] - } - -+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { -+ ffmpeg_yasm_sources += [ -+ "libavcodec/x86/aacpsdsp.asm", -+ ] -+} -+ - if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) { - ffmpeg_c_sources += [ - "libavcodec/arm/h264pred_init_arm.c", -diff -up chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c ---- chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-03-20 14:15:22.068309439 -0400 -+++ chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-03-20 14:15:47.826802603 -0400 -@@ -23,6 +23,7 @@ - #define USE_FIXED 0 - - #include "aac.h" -+#include "aacsbrdata.h" - #include "config.h" - #include "libavutil/attributes.h" - #include "libavutil/intfloat.h" -diff -up chromium-57.0.2987.110/media/base/mime_util_internal.cc.mp3 chromium-57.0.2987.110/media/base/mime_util_internal.cc ---- chromium-57.0.2987.110/media/base/mime_util_internal.cc.mp3 2017-03-26 11:11:41.480377812 -0400 -+++ chromium-57.0.2987.110/media/base/mime_util_internal.cc 2017-03-26 11:13:19.289810708 -0400 -@@ -291,10 +291,10 @@ void MimeUtil::AddSupportedMediaFormats( - CodecSet webm_codecs(webm_audio_codecs); - webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); - --#if defined(USE_PROPRIETARY_CODECS) - CodecSet mp3_codecs; - mp3_codecs.insert(MP3); - -+#if defined(USE_PROPRIETARY_CODECS) - CodecSet aac; - aac.insert(MPEG2_AAC); - aac.insert(MPEG4_AAC); -@@ -335,10 +335,10 @@ void MimeUtil::AddSupportedMediaFormats( - AddContainerWithCodecs("application/ogg", ogg_codecs, false); - AddContainerWithCodecs("audio/flac", implicit_codec, false); - --#if defined(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". - AddContainerWithCodecs("audio/mp3", implicit_codec, true); - AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); -+#if defined(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. - AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true); - DCHECK(!mp4_video_codecs.empty()); diff --git a/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch b/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch deleted file mode 100644 index 4e92fe4..0000000 --- a/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc ---- chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 2017-03-28 11:42:53.308857207 -0400 -+++ chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc 2017-03-28 11:43:04.172579015 -0400 -@@ -676,7 +676,7 @@ std::unique_ptr GtkUi::Cr - : nullptr); - } - -- return gtk_border; -+ return std::move(gtk_border); - } - - void GtkUi::AddWindowButtonOrderObserver( diff --git a/chromium-58.0.3029.81-enable-mp3.patch b/chromium-58.0.3029.81-enable-mp3.patch new file mode 100644 index 0000000..7fbc0d0 --- /dev/null +++ b/chromium-58.0.3029.81-enable-mp3.patch @@ -0,0 +1,144 @@ +diff -up chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3 chromium-58.0.3029.81/media/base/mime_util_internal.cc +--- chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3 2017-04-21 14:46:15.817743487 -0400 ++++ chromium-58.0.3029.81/media/base/mime_util_internal.cc 2017-04-21 14:52:58.544150880 -0400 +@@ -244,10 +244,10 @@ void MimeUtil::AddSupportedMediaFormats( + CodecSet webm_codecs(webm_audio_codecs); + webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); + +-#if BUILDFLAG(USE_PROPRIETARY_CODECS) + CodecSet mp3_codecs; + mp3_codecs.insert(MP3); + ++#if BUILDFLAG(USE_PROPRIETARY_CODECS) + CodecSet aac; + aac.insert(MPEG2_AAC); + aac.insert(MPEG4_AAC); +@@ -291,10 +291,10 @@ void MimeUtil::AddSupportedMediaFormats( + AddContainerWithCodecs("application/ogg", ogg_codecs, false); + AddContainerWithCodecs("audio/flac", implicit_codec, false); + +-#if BUILDFLAG(USE_PROPRIETARY_CODECS) + AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". + AddContainerWithCodecs("audio/mp3", implicit_codec, true); + AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); ++#if BUILDFLAG(USE_PROPRIETARY_CODECS) + AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. + AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true); + DCHECK(!mp4_video_codecs.empty()); +@@ -715,7 +715,6 @@ bool MimeUtil::IsCodecProprietary(Codec + case INVALID_CODEC: + case AC3: + case EAC3: +- case MP3: + case MPEG2_AAC: + case MPEG4_AAC: + case H264: +@@ -723,6 +722,7 @@ bool MimeUtil::IsCodecProprietary(Codec + case DOLBY_VISION: + return true; + ++ case MP3: + case PCM: + case VORBIS: + case OPUS: +diff -up chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni +--- chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-04-21 11:49:42.000000000 -0400 ++++ chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni 2017-04-21 14:46:15.816743506 -0400 +@@ -176,19 +176,12 @@ if ((is_linux && current_cpu == "arm" && + ] + } + +-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) ++{ + ffmpeg_c_sources += [ +- "libavcodec/aac_ac3_parser.c", +- "libavcodec/aac_parser.c", +- "libavcodec/aacadtsdec.c", +- "libavcodec/aacps_float.c", +- "libavcodec/aacpsdsp_float.c", +- "libavcodec/aacsbr.c", +- "libavcodec/aactab.c", +- "libavcodec/ac3tab.c", +- "libavcodec/autorename_libavcodec_aacdec.c", + "libavcodec/autorename_libavcodec_mpegaudiodsp.c", + "libavcodec/autorename_libavcodec_sbrdsp.c", ++ "libavcodec/ac3tab.c", + "libavcodec/cbrt_data.c", + "libavcodec/dct.c", + "libavcodec/dct32_fixed.c", +@@ -204,7 +197,6 @@ if ((current_cpu == "x64" && ffmpeg_bran + "libavcodec/mpegaudiodsp_float.c", + "libavcodec/sinewin.c", + "libavcodec/sinewin_fixed.c", +- "libavformat/aacdec.c", + "libavformat/apetag.c", + "libavformat/img2.c", + "libavformat/mov.c", +@@ -213,6 +205,21 @@ if ((current_cpu == "x64" && ffmpeg_bran + ] + } + ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) ++{ ++ ffmpeg_c_sources += [ ++ "libavcodec/aac_ac3_parser.c", ++ "libavcodec/aac_parser.c", ++ "libavcodec/aacadtsdec.c", ++ "libavcodec/aacps_float.c", ++ "libavcodec/aacpsdsp_float.c", ++ "libavcodec/aacsbr.c", ++ "libavcodec/aactab.c", ++ "libavcodec/autorename_libavcodec_aacdec.c", ++ "libavformat/aacdec.c", ++ ] ++} ++ + if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { + ffmpeg_c_sources += [ + "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", +@@ -312,21 +319,31 @@ if ((is_linux && current_cpu == "x64") | + if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { + ffmpeg_c_sources += [ + "libavcodec/x86/aacpsdsp_init.c", ++ ] ++} ++ ++if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { ++ ffmpeg_c_sources += [ + "libavcodec/x86/dct_init.c", + "libavcodec/x86/mpegaudiodsp.c", + "libavcodec/x86/sbrdsp_init.c", + ] + } + +-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_win)) { + ffmpeg_yasm_sources += [ +- "libavcodec/x86/aacpsdsp.asm", + "libavcodec/x86/dct32.asm", + "libavcodec/x86/imdct36.asm", + "libavcodec/x86/sbrdsp.asm", + ] + } + ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++ ffmpeg_yasm_sources += [ ++ "libavcodec/x86/aacpsdsp.asm", ++ ] ++} ++ + if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) { + ffmpeg_c_sources += [ + "libavcodec/arm/h264pred_init_arm.c", +diff -up chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c +--- chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-04-21 11:49:43.000000000 -0400 ++++ chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-04-21 14:46:15.817743487 -0400 +@@ -23,6 +23,7 @@ + #define USE_FIXED 0 + + #include "aac.h" ++#include "aacsbrdata.h" + #include "config.h" + #include "libavutil/attributes.h" + #include "libavutil/intfloat.h" diff --git a/chromium-58.0.3029.81-ffmpeg-stdatomic.patch b/chromium-58.0.3029.81-ffmpeg-stdatomic.patch new file mode 100644 index 0000000..e08d5b2 --- /dev/null +++ b/chromium-58.0.3029.81-ffmpeg-stdatomic.patch @@ -0,0 +1,14 @@ +diff -up chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c +--- chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic 2017-02-03 07:07:36.000000000 +0100 ++++ chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c 2017-02-09 11:54:34.083000442 +0100 +@@ -20,6 +20,10 @@ + // Chromium: Windows doesn't provide stdatomic.h, so use the compat version. + #if defined(_MSC_VER) + #include ++// GCC 4.8 didn't have stdatomic, but was advertising it. ++// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016 ++#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8))) ++#include + #else + #include + #endif diff --git a/chromium-58.0.3029.81-fix-gn.patch b/chromium-58.0.3029.81-fix-gn.patch new file mode 100644 index 0000000..d8b2207 --- /dev/null +++ b/chromium-58.0.3029.81-fix-gn.patch @@ -0,0 +1,11 @@ +diff -up chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py +--- chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn 2017-04-21 15:39:59.704874747 -0400 ++++ chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py 2017-04-21 15:43:06.778809475 -0400 +@@ -384,6 +384,7 @@ def write_gn_ninja(path, root_gen_dir, o + 'base/base_paths.cc', + 'base/base_switches.cc', + 'base/build_time.cc', ++ 'base/callback_helpers.cc', + 'base/callback_internal.cc', + 'base/command_line.cc', + 'base/debug/activity_tracker.cc', diff --git a/chromium-58.0.3029.81-use_system_harfbuzz.patch b/chromium-58.0.3029.81-use_system_harfbuzz.patch new file mode 100644 index 0000000..df784fd --- /dev/null +++ b/chromium-58.0.3029.81-use_system_harfbuzz.patch @@ -0,0 +1,12 @@ +diff -up chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h +--- chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz 2017-04-21 14:58:23.182030756 -0400 ++++ chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h 2017-04-21 15:06:22.681991351 -0400 +@@ -12,7 +12,7 @@ + #include + + #include "base/macros.h" +-#include "third_party/harfbuzz-ng/src/hb.h" ++#include + #include "third_party/icu/source/common/unicode/ubidi.h" + #include "third_party/icu/source/common/unicode/uscript.h" + #include "ui/gfx/render_text.h" diff --git a/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch b/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch new file mode 100644 index 0000000..ddb94a0 --- /dev/null +++ b/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch @@ -0,0 +1,19 @@ +diff -up chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc.revert chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc +--- chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc.revert 2017-05-08 14:58:11.767482431 -0400 ++++ chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc 2017-05-08 14:58:37.722960109 -0400 +@@ -790,15 +790,6 @@ void DeviceDataManagerX11::UpdateScrollC + DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum); + ScrollInfo& info = scroll_data_[deviceid]; + +- bool legacy_scroll_available = +- (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0; +- // If the device's highest resolution is lower than the resolution of xinput1 +- // then use xinput1's events instead (ie. don't configure smooth scrolling). +- if (legacy_scroll_available && +- std::abs(scroll_class_info->increment) <= 1.0) { +- return; +- } +- + switch (scroll_class_info->scroll_type) { + case XIScrollTypeVertical: + info.vertical.number = scroll_class_info->number; diff --git a/chromium.spec b/chromium.spec index 8c1c8af..21fa094 100644 --- a/chromium.spec +++ b/chromium.spec @@ -20,7 +20,7 @@ # Requires is trickier. %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so -%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_common|libblink_core|libblink_modules|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcc_animation|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcommon|libcompositor|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_battery|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vibration|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfont_service_library|libgcm|libgeneric_sensor|libgeolocation|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_in_process_context|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libpower_monitor|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libsandbox_services|libseccomp_bpf|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtest_ime_driver_library|libtime_zone_monitor|libtracing_library|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_library|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm|libwtf|libx11_events_platform|libx11_window +%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_common|libblink_core|libblink_modules|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcapture_base|libcapture_lib|libcc_animation|libcc_blink|libcc_ipc|libcc_paint|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcommon|libcompositor|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_battery|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vibration|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents|libevents_x|libfingerprint|libffmpeg|libfont_service_library|libgcm|libgeneric_sensor|libgeolocation|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_in_process_context|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libpower_monitor|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libsandbox_services|libseccomp_bpf|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtest_ime_driver_library|libtime_zone_monitor|libtracing_library|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_library|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm|libwtf|libx11_events_platform|libx11_window %global __requires_exclude ^(%{privlibs})\\.so # Try to not use the Xvfb as it is slow.. @@ -93,10 +93,10 @@ BuildRequires: libicu-devel >= 5.4 %global default_client_secret miEreAep8nuvTdvLums6qyLK %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com -%global majorversion 57 +%global majorversion 58 Name: chromium%{chromium_channel} -Version: %{majorversion}.0.2987.133 +Version: %{majorversion}.0.3029.110 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home @@ -148,25 +148,26 @@ Patch26: chromium-54.0.2840.59-i686-ld-memory-tricks.patch # obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)': # /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)' Patch27: chromium-54.0.2840.90-setopaque.patch -# Fix compiler issue with gcc 4.9 -# https://chromium.googlesource.com/external/webrtc/trunk/webrtc/+/69556b1c264da9e0f484eaab890ebd555966630c%5E%21/#F0 -Patch30: chromium-56.0.2924.87-gcc-49.patch # Use -fpermissive to build WebKit Patch31: chromium-56.0.2924.87-fpermissive.patch -# Fix issue with unique_ptr move on return with older gcc -Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch # Fix issue with compilation on gcc7 # Thanks to Ben Noordhuis Patch33: chromium-56.0.2924.87-gcc7.patch # Enable mp3 support -Patch34: chromium-57.0.2987.110-enable-mp3.patch -# Fix issue in gtk_ui.cc -# https://chromium.googlesource.com/chromium/src.git/+/b95cf280873664a44297368676ff589721ddb6f2%5E%21/#F5 -Patch35: chromium-57.0.2987.110-gtk_ui-gcc-fix.patch +Patch34: chromium-58.0.3029.81-enable-mp3.patch +# Fix gn build +# https://chromium.googlesource.com/chromium/src.git/+/379e35f6f3eaa41a97f2659249509ca599749b27%5E%21/tools/gn/bootstrap/bootstrap.py +Patch35: chromium-58.0.3029.81-fix-gn.patch +# Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8db6940240c563cf4%5E%21/#F0 +# https://bugs.chromium.org/p/chromium/issues/detail?id=712737 +# https://bugzilla.redhat.com/show_bug.cgi?id=1446851 +Patch36: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch +# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8 +Patch37: chromium-58.0.3029.81-ffmpeg-stdatomic.patch ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch -Patch101: chromium-55.0.2883.75-use_system_harfbuzz.patch +Patch101: chromium-58.0.3029.81-use_system_harfbuzz.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -195,14 +196,9 @@ Source8: get_linux_tests_names.py # GNOME stuff Source9: chromium-browser.xml Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip -Source11: chrome-remote-desktop.service +Source11: chrome-remote-desktop@.service Source12: chromium-browser.appdata.xml Source13: master_preferences -# Only needed for platforms where gcc doesn't have stdatomic.h -# RHEL 7 or older -# Taken from https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/compat/atomics/gcc/stdatomic.h -# on 2017-03-26 -Source14: stdatomic.h # We can assume gcc and binutils. BuildRequires: gcc-c++ @@ -232,6 +228,7 @@ BuildRequires: libusb-devel BuildRequires: libXdamage-devel BuildRequires: libXScrnSaver-devel BuildRequires: libXtst-devel +BuildRequires: nodejs BuildRequires: nss-devel BuildRequires: pciutils-devel BuildRequires: pulseaudio-libs-devel @@ -542,23 +539,17 @@ members of the Chromium and WebDriver teams. %patch25 -p1 -b .jpegfix %patch26 -p1 -b .ldmemory %patch27 -p1 -b .setopaque -%patch30 -p1 -b .gcc49 %patch31 -p1 -b .permissive -%patch32 -p1 -b .unique-ptr-fix %patch33 -p1 -b .gcc7 %patch34 -p1 -b .mp3 -%patch35 -p1 -b .gtkuifix +%patch35 -p1 -b .fixgn +%patch36 -p1 -b .revert +%patch37 -p1 -b .ffmpeg-stdatomic ### Chromium Tests Patches ### %patch100 -p1 -b .use_system_opus %patch101 -p1 -b .use_system_harfbuzz -%if 0%{?fedora} >= 24 -# Do nothing. We're modern enough to not need it. -%else -cp -a %{SOURCE14} third_party/ffmpeg/ -%endif - %if 0%{?asan} export CC="clang" export CXX="clang++" @@ -697,6 +688,9 @@ CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=false' CHROMIUM_BROWSER_GN_DEFINES+=' treat_warnings_as_errors=false' export CHROMIUM_BROWSER_GN_DEFINES +mkdir -p third_party/node/linux/node-linux-x64/bin +ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node + # Remove most of the bundled libraries. Libraries specified below (taken from # Gentoo's Chromium ebuild) are the libraries that needs to be preserved. build/linux/unbundle/remove_bundled_libraries.py \ @@ -807,6 +801,8 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/mesa' \ 'third_party/modp_b64' \ 'third_party/mt19937ar' \ + 'third_party/node' \ + 'third_party/node/node_modules/vulcanize/third_party/UglifyJS2' \ 'third_party/openmax_dl' \ 'third_party/opus' \ 'third_party/ots' \ @@ -1093,7 +1089,7 @@ cp -a remoting/host/installer/linux/is-remoting-session %{buildroot}%{crd_path}/ mkdir -p %{buildroot}%{_unitdir} cp -a %{SOURCE11} %{buildroot}%{_unitdir}/ -sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desktop.service +sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desktop@.service # Add directories for policy management mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed @@ -1453,13 +1449,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-desktop %post -n chrome-remote-desktop -%systemd_post chrome-remote-desktop.service +%systemd_post chrome-remote-desktop@.service %preun -n chrome-remote-desktop -%systemd_preun chrome-remote-desktop.service +%systemd_preun chrome-remote-desktop@.service %postun -n chrome-remote-desktop -%systemd_postun_with_restart chrome-remote-desktop.service +%systemd_postun_with_restart chrome-remote-desktop@.service %files %doc AUTHORS @@ -1578,7 +1574,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{_sysconfdir}/opt/chrome/ %{crd_path}/remoting_locales/ %{crd_path}/start-host -%{_unitdir}/chrome-remote-desktop.service +%{_unitdir}/chrome-remote-desktop@.service /var/lib/chrome-remote-desktop/ %if 0%{?build_remoting_app} %if 0%{?nacl} @@ -1593,6 +1589,15 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Mon May 15 2017 Tom Callaway 58.0.3029.110-1 +- update to 58.0.3029.110 + +* Mon May 8 2017 Tom Callaway 58.0.3029.96-1 +- update to 58.0.3029.96 + +* Fri Apr 21 2017 Tom Callaway 58.0.3029.81-1 +- update to 58.0.3029.81 + * Thu Mar 30 2017 Tom Callaway 57.0.2987.133-1 - update to 57.0.2987.133 diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 39e68f7..01a89fc 100644 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -182,7 +182,8 @@ header_files=" libavcodec/x86/inline_asm.h \ libavutil/version.h \ libswresample/swresample.h \ libswresample/version.h \ - compat/va_copy.h " + compat/va_copy.h \ + compat/atomics/gcc/stdatomic.h " manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \ libavcodec/x86/rnd_template.c \ diff --git a/sources b/sources index 44e8109..5faaaee 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (policy_templates.zip) = 6a0564da805ee8d290453c9e46550fa8eed42d0fbd51a90eda566d888d9d7cf35ec9bb39f2340ec1ed98e7e813815eceb1f11cd202746815a7c8f8ecbef73a85 -SHA512 (chromium-57.0.2987.133-clean.tar.xz) = 5b5b3b9b8da008c04a8519eee1199e042bd1ee022e3eeb22eb10c075aeac64abe9312350cb867ab17854815d2aaf91fb6387b45f41f475fd854ee20e47d49ef8 +SHA512 (policy_templates.zip) = 28f1f85eab1719dd1c6a70f7e4cd1c9bea46215adc327a32f2509098e70768a61dbb8b24c186279ec4e4e1299953c219e9eb71af6d5527fe9e422599ad0d785e +SHA512 (chromium-58.0.3029.81-clean.tar.xz) = b2ac41d6eccfd025d816b814354330fe4a9bb81c212fd7b98f79cc6f0c693d1b2ce5fbe0ce9397d43808ffcfa171585769c9db5d4b7d24e9bf548c450f8ad7f6 +SHA512 (chromium-58.0.3029.110-clean.tar.xz) = f26be2eaabe47d6294fd411bbb9abe07721c54fe06e6792a3ff0bd173571bb84ee673bc022f626883fc133e5285cf1386ba8539351d4eb82102feb3cab5f9852 diff --git a/stdatomic.h b/stdatomic.h deleted file mode 100644 index 2b64687..0000000 --- a/stdatomic.h +++ /dev/null @@ -1,173 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * based on vlc_atomic.h from VLC - * Copyright (C) 2010 Rémi Denis-Courmont - */ - -#ifndef COMPAT_ATOMICS_GCC_STDATOMIC_H -#define COMPAT_ATOMICS_GCC_STDATOMIC_H - -#include -#include - -#define ATOMIC_FLAG_INIT 0 - -#define ATOMIC_VAR_INIT(value) (value) - -#define atomic_init(obj, value) \ -do { \ - *(obj) = (value); \ -} while(0) - -#define kill_dependency(y) ((void)0) - -#define atomic_thread_fence(order) \ - __sync_synchronize() - -#define atomic_signal_fence(order) \ - ((void)0) - -#define atomic_is_lock_free(obj) 0 - -typedef _Bool atomic_flag; -typedef _Bool atomic_bool; -typedef char atomic_char; -typedef signed char atomic_schar; -typedef unsigned char atomic_uchar; -typedef short atomic_short; -typedef unsigned short atomic_ushort; -typedef int atomic_int; -typedef unsigned int atomic_uint; -typedef long atomic_long; -typedef unsigned long atomic_ulong; -typedef long long atomic_llong; -typedef unsigned long long atomic_ullong; -typedef wchar_t atomic_wchar_t; -typedef int_least8_t atomic_int_least8_t; -typedef uint_least8_t atomic_uint_least8_t; -typedef int_least16_t atomic_int_least16_t; -typedef uint_least16_t atomic_uint_least16_t; -typedef int_least32_t atomic_int_least32_t; -typedef uint_least32_t atomic_uint_least32_t; -typedef int_least64_t atomic_int_least64_t; -typedef uint_least64_t atomic_uint_least64_t; -typedef int_fast8_t atomic_int_fast8_t; -typedef uint_fast8_t atomic_uint_fast8_t; -typedef int_fast16_t atomic_int_fast16_t; -typedef uint_fast16_t atomic_uint_fast16_t; -typedef int_fast32_t atomic_int_fast32_t; -typedef uint_fast32_t atomic_uint_fast32_t; -typedef int_fast64_t atomic_int_fast64_t; -typedef uint_fast64_t atomic_uint_fast64_t; -typedef intptr_t atomic_intptr_t; -typedef uintptr_t atomic_uintptr_t; -typedef size_t atomic_size_t; -typedef ptrdiff_t atomic_ptrdiff_t; -typedef intmax_t atomic_intmax_t; -typedef uintmax_t atomic_uintmax_t; - -#define atomic_store(object, desired) \ -do { \ - *(object) = (desired); \ - __sync_synchronize(); \ -} while (0) - -#define atomic_store_explicit(object, desired, order) \ - atomic_store(object, desired) - -#define atomic_load(object) \ - (__sync_synchronize(), *(object)) - -#define atomic_load_explicit(object, order) \ - atomic_load(object) - -#define atomic_exchange(object, desired) \ -({ \ - __typeof__(object) _obj = (object); \ - __typeof__(*object) _old; \ - do \ - _old = atomic_load(_obj); \ - while (!__sync_bool_compare_and_swap(_obj, _old, (desired))); \ - _old; \ -}) - -#define atomic_exchange_explicit(object, desired, order) \ - atomic_exchange(object, desired) - -#define atomic_compare_exchange_strong(object, expected, desired) \ -({ \ - __typeof__(object) _exp = (expected); \ - __typeof__(*object) _old = *_exp; \ - *_exp = __sync_val_compare_and_swap((object), _old, (desired)); \ - *_exp == _old; \ -}) - -#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \ - atomic_compare_exchange_strong(object, expected, desired) - -#define atomic_compare_exchange_weak(object, expected, desired) \ - atomic_compare_exchange_strong(object, expected, desired) - -#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \ - atomic_compare_exchange_weak(object, expected, desired) - -#define atomic_fetch_add(object, operand) \ - __sync_fetch_and_add(object, operand) - -#define atomic_fetch_add_explicit(object, operand, order) \ - atomic_fetch_add(object, operand) - -#define atomic_fetch_sub(object, operand) \ - __sync_fetch_and_sub(object, operand) - -#define atomic_fetch_sub_explicit(object, operand, order) \ - atomic_fetch_sub(object, operand) - -#define atomic_fetch_or(object, operand) \ - __sync_fetch_and_or(object, operand) - -#define atomic_fetch_or_explicit(object, operand, order) \ - atomic_fetch_or(object, operand) - -#define atomic_fetch_xor(object, operand) \ - __sync_fetch_and_sub(object, operand) - -#define atomic_fetch_xor_explicit(object, operand, order) \ - atomic_fetch_sub(object, operand) - -#define atomic_fetch_and(object, operand) \ - __sync_fetch_and_and(object, operand) - -#define atomic_fetch_and_explicit(object, operand, order) \ - atomic_fetch_and(object, operand) - -#define atomic_flag_test_and_set(object) \ - atomic_exchange(object, 1) - -#define atomic_flag_test_and_set_explicit(object, order) \ - atomic_flag_test_and_set(object) - -#define atomic_flag_clear(object) \ - atomic_store(object, 0) - -#define atomic_flag_clear_explicit(object, order) \ - atomic_flag_clear(object) - -#endif /* COMPAT_ATOMICS_GCC_STDATOMIC_H */