[chromium-vaapi/f29] Re brand chromium-vaapi and update vaapi patch
by hellbanger
commit e673b47df014849b69f2e58f22664982749a888f
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 16:35:02 2018 +0530
Re brand chromium-vaapi and update vaapi patch
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
brand.patch | 25 +++++++++
chromium-harfbuzz2.patch | 80 +++++++++++++++++++++++++++
chromium-vaapi.spec | 14 ++++-
enable-vaapi.patch | 139 +++++++++++++++++++++++++++++------------------
4 files changed, 204 insertions(+), 54 deletions(-)
---
diff --git a/brand.patch b/brand.patch
new file mode 100644
index 0000000..002c423
--- /dev/null
+++ b/brand.patch
@@ -0,0 +1,25 @@
+From bfff7b95bb4d9ff20a3a67191dfffe25334f9dca Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Wed, 7 Nov 2018 16:29:01 +0530
+Subject: [PATCH] Let's brand chromium-vaapi
+
+---
+ components/version_ui_strings.grdp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/version_ui_strings.grdp b/components/version_ui_strings.grdp
+index 6278a8a38..1611b4c80 100644
+--- a/components/version_ui_strings.grdp
++++ b/components/version_ui_strings.grdp
+@@ -7,7 +7,7 @@
+ Official Build
+ </message>
+ <message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
+- Developer Build
++ RPMFusion Build
+ </message>
+ <message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
+ (32-bit)
+--
+2.19.1
+
diff --git a/chromium-harfbuzz2.patch b/chromium-harfbuzz2.patch
new file mode 100644
index 0000000..2d5602d
--- /dev/null
+++ b/chromium-harfbuzz2.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster(a)gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+ void* font_data,
+ unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned int glyph_stride,
+ hb_position_t* first_advance,
+ unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+ return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ } // namespace
+
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* glyphs,
++ const hb_codepoint_t* glyphs,
+ unsigned glyph_stride,
+ hb_position_t* advances,
+ unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+ // array that copy them to a regular array.
+ Vector<Glyph, 256> glyph_array(count);
+ for (unsigned i = 0; i < count;
+- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+ glyph_array[i] = *glyphs;
+ }
+ Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+
+ void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+ void GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned glyph_stride,
+ hb_position_t* first_advance,
+ unsigned advance_stride);
+--
+2.19.1
+
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 95aff15..53162ca 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -123,6 +123,12 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
+%if 0%{?fedora} >= 30
+# Fix chromium build with harfbuzz 2 in rawhide
+Patch53: chromium-harfbuzz2.patch
+%endif
+# Let's brand chromium!
+Patch54: brand.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -437,7 +443,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
# Hard code extra version
FILE=chrome/common/channel_info_posix.cc
-sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi Fedora Project"/' $FILE
+sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi"/' $FILE
#####################################BUILD#############################################
%build
#export compilar variables
@@ -625,6 +631,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+- Use correct branding in chromium
+- update vaapi patch
+
* Fri Oct 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-1
- Update to 70.0.3538.77
- Add a patch to fix building with system libicu
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 2cb451e..6211000 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,46 +1,25 @@
-From a4d39ad4677cbc83c5e32a205d25c27beb84e13c Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
-Date: Fri, 19 Oct 2018 19:19:44 +0530
-Subject: [PATCH] Enable hardware video decoding and encoding using libva vaapi
+From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Sun, 4 Nov 2018 20:26:54 +0530
+Subject: [PATCH] Enable vaapi on Linux
+
---
- chrome/browser/about_flags.cc | 14 +++++++-------
- chrome/browser/flag_descriptions.cc | 6 +++---
- chrome/browser/flag_descriptions.h | 8 ++++++--
+ chrome/browser/about_flags.cc | 14 +++++++------
+ chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
+ chrome/browser/flag_descriptions.h | 16 +++++++++-----
components/viz/service/main/viz_main_impl.cc | 2 +-
- content/gpu/BUILD.gn | 5 +++++
+ content/gpu/BUILD.gn | 6 ++++++
content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 -----------
+ gpu/config/software_rendering_list.json | 11 ----------
media/base/media_switches.cc | 2 +-
media/filters/BUILD.gn | 3 ++-
media/gpu/BUILD.gn | 7 +++++++
- 10 files changed, 34 insertions(+), 28 deletions(-)
+ 10 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..942f3627b 100644
+index d029d0648..39df8d6cf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -1386,18 +1386,18 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
- {"enable-webrtc-hw-h264-encoding",
- flag_descriptions::kWebrtcHwH264EncodingName,
-- flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWH264Encoding)},
- {"enable-webrtc-hw-vp8-encoding",
- flag_descriptions::kWebrtcHwVP8EncodingName,
-- flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWVP8Encoding)},
- #if !defined(OS_ANDROID)
- {"enable-webrtc-remote-event-log",
@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -66,8 +45,25 @@ index d029d0648..942f3627b 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
+@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+ "AutofillDropdownLayout")},
+ #endif // OS_ANDROID
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ {"enable-vaapi-jpeg-image-decode-acceleration",
+ flag_descriptions::kVaapiJpegImageDecodeAccelerationName,
+- flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS,
++ flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS | kOsLinux,
+ FEATURE_VALUE_TYPE(features::kVaapiJpegImageDecodeAcceleration)},
++#endif
+
++#if defined(OS_CHROMEOS)
+ {"enable-home-launcher-gestures",
+ flag_descriptions::kEnableHomeLauncherGesturesName,
+ flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..b53567008 100644
+index 0cb812619..df8ecb24e 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
@@ -75,46 +71,84 @@ index 0cb812619..b53567008 100644
#endif
-// Chrome OS -------------------------------------------------------------------
-+// Chrome OS and Linux-------------------------------------------------------------------
++// Chrome OS and Linux -------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3595,7 +3595,7 @@ const char kZipArchiverUnpackerName[] = "ZIP archiver - Unpacker";
- const char kZipArchiverUnpackerDescription[] =
- "Enable or disable the ability to unpack archives in incognito mode";
-
--#endif // defined(OS_CHROMEOS)
-+#endif // defined(OS_CHROMEOS) defined(OS_LINUX)
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+ "Enable hardware-accelerated mjpeg decode for captured frame where "
+ "available.";
- // Random platform combinations -----------------------------------------------
++const char kVaapiJpegImageDecodeAccelerationName[] =
++ "VA-API JPEG decode acceleration for images";
++const char kVaapiJpegImageDecodeAccelerationDescription[] =
++ "Enable or disable decode acceleration of JPEG images (as opposed to camera"
++ " captures) using the VA-API.";
++
++#endif // defined(OS_CHROMEOS) defined(OS_LINUX) and !defined(OS_ANDROID)
++
++// Only Chrome OS ------------------------------------------------------
++
++#if defined(OS_CHROMEOS)
++
+ const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
+ const char kAllowTouchpadThreeFingerClickDescription[] =
+ "Enables touchpad three-finger-click as middle button.";
+@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+ "Enables Chrome to use the color space information provided by the monitor"
+ " instead of the default sRGB color space.";
+-const char kVaapiJpegImageDecodeAccelerationName[] =
+- "VA-API JPEG decode acceleration for images";
+-const char kVaapiJpegImageDecodeAccelerationDescription[] =
+- "Enable or disable decode acceleration of JPEG images (as opposed to camera"
+- " captures) using the VA-API.";
+-
+ const char kVideoPlayerChromecastSupportName[] =
+ "Experimental Chromecast support for Video Player";
+ const char kVideoPlayerChromecastSupportDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..3306c5a27 100644
+index b3c5e5691..14d7e33e9 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,17 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
++// Chrome OS and Linux ------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
++extern const char kVaapiJpegImageDecodeAccelerationName[];
++extern const char kVaapiJpegImageDecodeAccelerationDescription[];
++
+#endif
-+// Only Chrome OS ------------------------------------------------------------------
++
++// Chrome OS ----------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
+
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
+@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+ extern const char kUseMonitorColorSpaceName[];
+ extern const char kUseMonitorColorSpaceDescription[];
+
+-extern const char kVaapiJpegImageDecodeAccelerationName[];
+-extern const char kVaapiJpegImageDecodeAccelerationDescription[];
+-
+ extern const char kVideoPlayerChromecastSupportName[];
+ extern const char kVideoPlayerChromecastSupportDescription[];
+
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
index 2196abef4..b4e0a1ae1 100644
--- a/components/viz/service/main/viz_main_impl.cc
@@ -129,7 +163,7 @@ index 2196abef4..b4e0a1ae1 100644
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..24b7acd3d 100644
+index 8974e441d..d7eba85a9 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
@@ -140,13 +174,14 @@ index 8974e441d..24b7acd3d 100644
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,8 @@ target(link_target_type, "gpu_sources") {
+@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
-+ # Use vaapi on desktop Linux builds when use_vaapi is set
++
++ # Use vaapi on desktop Linux builds when use_vaapi is set
+ if (is_desktop_linux && use_vaapi) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
@@ -253,5 +288,5 @@ index 9ef4730a4..0c3a06c24 100644
}
--
-2.17.2
+2.19.1
6 years
[chromium-vaapi] Re brand chromium-vaapi and update vaapi patch
by hellbanger
commit 7f8e0b3d0d3ff2c924257f9e6d84a312c968de50
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 16:35:02 2018 +0530
Re brand chromium-vaapi and update vaapi patch
brand.patch | 25 +++++++++
chromium-harfbuzz2.patch | 80 +++++++++++++++++++++++++++
chromium-vaapi.spec | 14 ++++-
enable-vaapi.patch | 139 +++++++++++++++++++++++++++++------------------
4 files changed, 204 insertions(+), 54 deletions(-)
---
diff --git a/brand.patch b/brand.patch
new file mode 100644
index 0000000..002c423
--- /dev/null
+++ b/brand.patch
@@ -0,0 +1,25 @@
+From bfff7b95bb4d9ff20a3a67191dfffe25334f9dca Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Wed, 7 Nov 2018 16:29:01 +0530
+Subject: [PATCH] Let's brand chromium-vaapi
+
+---
+ components/version_ui_strings.grdp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/version_ui_strings.grdp b/components/version_ui_strings.grdp
+index 6278a8a38..1611b4c80 100644
+--- a/components/version_ui_strings.grdp
++++ b/components/version_ui_strings.grdp
+@@ -7,7 +7,7 @@
+ Official Build
+ </message>
+ <message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
+- Developer Build
++ RPMFusion Build
+ </message>
+ <message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
+ (32-bit)
+--
+2.19.1
+
diff --git a/chromium-harfbuzz2.patch b/chromium-harfbuzz2.patch
new file mode 100644
index 0000000..2d5602d
--- /dev/null
+++ b/chromium-harfbuzz2.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster(a)gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+ void* font_data,
+ unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned int glyph_stride,
+ hb_position_t* first_advance,
+ unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+ return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ } // namespace
+
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* glyphs,
++ const hb_codepoint_t* glyphs,
+ unsigned glyph_stride,
+ hb_position_t* advances,
+ unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+ // array that copy them to a regular array.
+ Vector<Glyph, 256> glyph_array(count);
+ for (unsigned i = 0; i < count;
+- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+ glyph_array[i] = *glyphs;
+ }
+ Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+
+ void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+ void GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned glyph_stride,
+ hb_position_t* first_advance,
+ unsigned advance_stride);
+--
+2.19.1
+
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 95aff15..53162ca 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -123,6 +123,12 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
+%if 0%{?fedora} >= 30
+# Fix chromium build with harfbuzz 2 in rawhide
+Patch53: chromium-harfbuzz2.patch
+%endif
+# Let's brand chromium!
+Patch54: brand.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -437,7 +443,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
# Hard code extra version
FILE=chrome/common/channel_info_posix.cc
-sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi Fedora Project"/' $FILE
+sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi"/' $FILE
#####################################BUILD#############################################
%build
#export compilar variables
@@ -625,6 +631,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+- Use correct branding in chromium
+- update vaapi patch
+
* Fri Oct 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-1
- Update to 70.0.3538.77
- Add a patch to fix building with system libicu
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 2cb451e..6211000 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,46 +1,25 @@
-From a4d39ad4677cbc83c5e32a205d25c27beb84e13c Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
-Date: Fri, 19 Oct 2018 19:19:44 +0530
-Subject: [PATCH] Enable hardware video decoding and encoding using libva vaapi
+From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Sun, 4 Nov 2018 20:26:54 +0530
+Subject: [PATCH] Enable vaapi on Linux
+
---
- chrome/browser/about_flags.cc | 14 +++++++-------
- chrome/browser/flag_descriptions.cc | 6 +++---
- chrome/browser/flag_descriptions.h | 8 ++++++--
+ chrome/browser/about_flags.cc | 14 +++++++------
+ chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
+ chrome/browser/flag_descriptions.h | 16 +++++++++-----
components/viz/service/main/viz_main_impl.cc | 2 +-
- content/gpu/BUILD.gn | 5 +++++
+ content/gpu/BUILD.gn | 6 ++++++
content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 -----------
+ gpu/config/software_rendering_list.json | 11 ----------
media/base/media_switches.cc | 2 +-
media/filters/BUILD.gn | 3 ++-
media/gpu/BUILD.gn | 7 +++++++
- 10 files changed, 34 insertions(+), 28 deletions(-)
+ 10 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..942f3627b 100644
+index d029d0648..39df8d6cf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -1386,18 +1386,18 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
- {"enable-webrtc-hw-h264-encoding",
- flag_descriptions::kWebrtcHwH264EncodingName,
-- flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWH264Encoding)},
- {"enable-webrtc-hw-vp8-encoding",
- flag_descriptions::kWebrtcHwVP8EncodingName,
-- flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWVP8Encoding)},
- #if !defined(OS_ANDROID)
- {"enable-webrtc-remote-event-log",
@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -66,8 +45,25 @@ index d029d0648..942f3627b 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
+@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+ "AutofillDropdownLayout")},
+ #endif // OS_ANDROID
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ {"enable-vaapi-jpeg-image-decode-acceleration",
+ flag_descriptions::kVaapiJpegImageDecodeAccelerationName,
+- flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS,
++ flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS | kOsLinux,
+ FEATURE_VALUE_TYPE(features::kVaapiJpegImageDecodeAcceleration)},
++#endif
+
++#if defined(OS_CHROMEOS)
+ {"enable-home-launcher-gestures",
+ flag_descriptions::kEnableHomeLauncherGesturesName,
+ flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..b53567008 100644
+index 0cb812619..df8ecb24e 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
@@ -75,46 +71,84 @@ index 0cb812619..b53567008 100644
#endif
-// Chrome OS -------------------------------------------------------------------
-+// Chrome OS and Linux-------------------------------------------------------------------
++// Chrome OS and Linux -------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3595,7 +3595,7 @@ const char kZipArchiverUnpackerName[] = "ZIP archiver - Unpacker";
- const char kZipArchiverUnpackerDescription[] =
- "Enable or disable the ability to unpack archives in incognito mode";
-
--#endif // defined(OS_CHROMEOS)
-+#endif // defined(OS_CHROMEOS) defined(OS_LINUX)
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+ "Enable hardware-accelerated mjpeg decode for captured frame where "
+ "available.";
- // Random platform combinations -----------------------------------------------
++const char kVaapiJpegImageDecodeAccelerationName[] =
++ "VA-API JPEG decode acceleration for images";
++const char kVaapiJpegImageDecodeAccelerationDescription[] =
++ "Enable or disable decode acceleration of JPEG images (as opposed to camera"
++ " captures) using the VA-API.";
++
++#endif // defined(OS_CHROMEOS) defined(OS_LINUX) and !defined(OS_ANDROID)
++
++// Only Chrome OS ------------------------------------------------------
++
++#if defined(OS_CHROMEOS)
++
+ const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
+ const char kAllowTouchpadThreeFingerClickDescription[] =
+ "Enables touchpad three-finger-click as middle button.";
+@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+ "Enables Chrome to use the color space information provided by the monitor"
+ " instead of the default sRGB color space.";
+-const char kVaapiJpegImageDecodeAccelerationName[] =
+- "VA-API JPEG decode acceleration for images";
+-const char kVaapiJpegImageDecodeAccelerationDescription[] =
+- "Enable or disable decode acceleration of JPEG images (as opposed to camera"
+- " captures) using the VA-API.";
+-
+ const char kVideoPlayerChromecastSupportName[] =
+ "Experimental Chromecast support for Video Player";
+ const char kVideoPlayerChromecastSupportDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..3306c5a27 100644
+index b3c5e5691..14d7e33e9 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,17 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
++// Chrome OS and Linux ------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
++extern const char kVaapiJpegImageDecodeAccelerationName[];
++extern const char kVaapiJpegImageDecodeAccelerationDescription[];
++
+#endif
-+// Only Chrome OS ------------------------------------------------------------------
++
++// Chrome OS ----------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
+
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
+@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+ extern const char kUseMonitorColorSpaceName[];
+ extern const char kUseMonitorColorSpaceDescription[];
+
+-extern const char kVaapiJpegImageDecodeAccelerationName[];
+-extern const char kVaapiJpegImageDecodeAccelerationDescription[];
+-
+ extern const char kVideoPlayerChromecastSupportName[];
+ extern const char kVideoPlayerChromecastSupportDescription[];
+
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
index 2196abef4..b4e0a1ae1 100644
--- a/components/viz/service/main/viz_main_impl.cc
@@ -129,7 +163,7 @@ index 2196abef4..b4e0a1ae1 100644
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..24b7acd3d 100644
+index 8974e441d..d7eba85a9 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
@@ -140,13 +174,14 @@ index 8974e441d..24b7acd3d 100644
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,8 @@ target(link_target_type, "gpu_sources") {
+@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
-+ # Use vaapi on desktop Linux builds when use_vaapi is set
++
++ # Use vaapi on desktop Linux builds when use_vaapi is set
+ if (is_desktop_linux && use_vaapi) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
@@ -253,5 +288,5 @@ index 9ef4730a4..0c3a06c24 100644
}
--
-2.17.2
+2.19.1
6 years
[x264] reverse order of generic/generic10 install to fix -devel contents (rfbz #5071)
by Leigh Scott
commit 93d1914240dddeff78a2c6cae3fbb68d9e2a3ac8
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Nov 7 11:06:21 2018 +0000
reverse order of generic/generic10 install to fix -devel contents (rfbz #5071)
x264.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index c78c19f..f808b7c 100644
--- a/x264.spec
+++ b/x264.spec
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 2%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -148,7 +148,8 @@ popd
%endif
%install
-for variant in generic generic10 ; do
+# NOTE: the order is important here! We want the generic devel stuff
+for variant in generic10 generic ; do
pushd ${variant}
%make_install
popd
@@ -204,6 +205,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Wed Nov 07 2018 Stefan Becker <chemobejk(a)gmail.com> - 0.155-2.20180806git0a84d98
+- reverse order of generic/generic10 install to fix -devel contents (rfbz #5071)
+
* Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com> - 0.155-8.20180806git0a84d98
- Update x264 to 0.155
- Rebase x264-10b.patch
6 years
[mpv] Rebuild for new ffmpeg
by Leigh Scott
commit 6fe59af832a8f368d19b4e238a97e89b8ce4fd43
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Nov 6 10:00:57 2018 +0000
Rebuild for new ffmpeg
mpv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mpv.spec b/mpv.spec
index 29cd5c6..0eb213a 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.29.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -148,6 +148,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Tue Nov 06 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.1-2
+- Rebuild for new ffmpeg
+
* Sat Oct 13 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.1-1
- Update to 0.29.1
- Drop old Obsoletes and Provides
6 years
[chromium-freeworld] AUTO IMPORT FEDORA:70.0.3538.77; No. of merged commits:1
by hellbanger
commit 3b12910d0c4207660936f317ca51d83e6a74d68e
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Tue Nov 6 12:17:32 2018 +0530
AUTO IMPORT FEDORA:70.0.3538.77; No. of merged commits:1
chromium-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index ae39c13..b348a4b 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -146,7 +146,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3538.77
-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)
@@ -999,7 +999,7 @@ CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false'
%ifarch aarch64
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
%endif
-CHROMIUM_CORE_GN_DEFINES+=' use_jumbo_build=true jumbo_file_merge_limit=12'
+CHROMIUM_CORE_GN_DEFINES+=' use_jumbo_build=true jumbo_file_merge_limit=8'
export CHROMIUM_CORE_GN_DEFINES
CHROMIUM_BROWSER_GN_DEFINES=""
@@ -1790,6 +1790,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Nov 5 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-2
+- drop jumbo_file_merge_limit to 8 to (hopefully) avoid OOMs on aarch64
+
* Fri Nov 2 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-1
- .77 came out while I was working on this. :/
diff --git a/sources b/sources
index d726751..d065a85 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
a246a9c95308d8918db963731e553e70 chromium-70.0.3538.77.tar.xz
-8d9961dcc76a2abdc189c32c6e029600 depot_tools.git-master.tar.gz
+ab69a5aedf20b83acbec195b42673cbf depot_tools.git-master.tar.gz
4d610887ff4d445cbc639aae7828d139 gelasio.zip
314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
6 years
[chromium-freeworld/f29] AUTO IMPORT FEDORA:70.0.3538.77; No. of merged commits:1
by hellbanger
commit 24c649ec29debf9470e7463661aab90bced08a4b
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Tue Nov 6 12:17:40 2018 +0530
AUTO IMPORT FEDORA:70.0.3538.77; No. of merged commits:1
chromium-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index ae39c13..b348a4b 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -146,7 +146,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3538.77
-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)
@@ -999,7 +999,7 @@ CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false'
%ifarch aarch64
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
%endif
-CHROMIUM_CORE_GN_DEFINES+=' use_jumbo_build=true jumbo_file_merge_limit=12'
+CHROMIUM_CORE_GN_DEFINES+=' use_jumbo_build=true jumbo_file_merge_limit=8'
export CHROMIUM_CORE_GN_DEFINES
CHROMIUM_BROWSER_GN_DEFINES=""
@@ -1790,6 +1790,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Nov 5 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-2
+- drop jumbo_file_merge_limit to 8 to (hopefully) avoid OOMs on aarch64
+
* Fri Nov 2 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-1
- .77 came out while I was working on this. :/
diff --git a/sources b/sources
index 93ea90c..d065a85 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
a246a9c95308d8918db963731e553e70 chromium-70.0.3538.77.tar.xz
-5f394788d9403dfe8512c751755c7b04 depot_tools.git-master.tar.gz
+ab69a5aedf20b83acbec195b42673cbf depot_tools.git-master.tar.gz
4d610887ff4d445cbc639aae7828d139 gelasio.zip
314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
6 years
[ffmpeg] Update to 4.1 release
by Leigh Scott
commit f7884dac9b8b8f0f9c4386ccef2cc9a544b8a416
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Nov 6 05:57:56 2018 +0000
Update to 4.1 release
...aomenc-remove-AVOption-related-to-frame-p.patch | 34 ----------------------
ffmpeg.spec | 9 +++---
sources | 2 +-
3 files changed, 5 insertions(+), 40 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 53066c6..ecd1199 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -73,7 +73,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.0.3
+Version: 4.1
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
@@ -82,9 +82,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-# Upstream commit to fix aom build issue
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23ad74b2ae2...
-Patch0: avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
@@ -303,7 +300,6 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1 -b .aom_build_fix
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -409,6 +405,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Nov 06 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1-1
+- Update to 4.1 release
+
* Sat Nov 03 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.3-1
- Update to 4.0.3 release
diff --git a/sources b/sources
index 77eb023..622ba28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91b52d8cacbb9693e29c8d2d95c21a9d ffmpeg-4.0.3.tar.xz
+b011c94e075c2d0cd7c914730f55f9a9 ffmpeg-4.1.tar.xz
6 years
[xorg-x11-drv-nvidia/el7] Rebuilt for multilibs
by Nicolas Chauvet
commit 6f51de354d3b6a9545cc4666a7716293b9bbc56b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Nov 5 17:43:44 2018 +0100
Rebuilt for multilibs
xorg-x11-drv-nvidia.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 747d928..70122ec 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -21,7 +21,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 410.73
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -475,6 +475,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Mon Nov 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3:410.73-1.1
+- Rebuilt for multilibs support
+
* Thu Oct 25 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:410.73-1
- Update to 410.73 release
6 years
[vlc] Move vdpau to core
by Nicolas Chauvet
commit 4316568810caade24fd2d48b997cf43d415f0694
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Nov 5 15:45:08 2018 +0100
Move vdpau to core
core avcodec libraries now rely on libvdpau
vlc.spec | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 536f74a..1bbdf91 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -488,10 +488,6 @@ fi || :
%{?_with_fluidsynth:
%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
}
-#vdpau in main
-%dir %{_libdir}/vlc/plugins/vdpau
-%{_libdir}/vlc/plugins/vdpau/libvdpau_*_plugin.so
-
%files core -f %{name}.lang
%{_bindir}/vlc
@@ -552,6 +548,9 @@ fi || :
%exclude %{_libdir}/vlc/plugins/vdpau
%ghost %{_libdir}/vlc/plugins/plugins.dat
%dir %{_libdir}/vlc/
+%dir %{_libdir}/vlc/plugins
+%dir %{_libdir}/vlc/plugins/vdpau
+%{_libdir}/vlc/plugins/vdpau/libvdpau_*_plugin.so
%{_libdir}/vlc/vlc-cache-gen
%{_libdir}/vlc/plugins
%{_mandir}/man1/vlc*.1*
6 years