Attachment 10146 Details for Bug 22138 – M66 ffmpeg/jsoncpp related build script fixes

M66 ffmpeg/jsoncpp related build script fixes

chromium-66-ffmpeg-buildflag-header.patch (text/plain), 1014 bytes, created by Christiaan Welvaart on 2018-05-13 16:55:05 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Christiaan Welvaart

Created: 2018-05-13 16:55:05 CEST

Size: 1014 bytes

patch

obsolete

>--- chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn.buildflag_header	2018-03-29 22:00:27.309041504 +0200
>+++ chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn	2018-03-30 12:30:19.959072993 +0200
>@@ -14,8 +14,8 @@
>   ]
> }
> 
>-buildflag_header("ffmpeg_buildflags") {
>-  header = "ffmpeg_buildflags.h"
>+buildflag_header("ffmpeg_features") {
>+  header = "ffmpeg_features.h"
>   flags = [ "USE_SYSTEM_FFMPEG=true" ]
> }
> 
>@@ -36,7 +36,7 @@
> 
> source_set("ffmpeg") {
>   deps = [
>-    ":ffmpeg_buildflags",
>+    ":ffmpeg_features",
>     ":ffmpeg_shim",
>   ]
>   public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ]
>--- chromium-66.0.3359.66/build/linux/unbundle/jsoncpp.gn.overrides	2018-03-29 22:00:27.291041781 +0200
>+++ chromium-66.0.3359.66/build/linux/unbundle/jsoncpp.gn	2018-03-30 12:35:59.317987225 +0200
>@@ -20,9 +20,13 @@
>   ]
> }
> 
>+config("jsoncpp_config") {
>+}
>+
> source_set("jsoncpp") {
>   deps = [
>     ":jsoncpp_shim",
>   ]
>+  public_configs = [ ":jsoncpp_config" ]
>   libs = [ "jsoncpp" ]
> }

--- chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn.buildflag_header	2018-03-29 22:00:27.309041504 +0200
+++ chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn	2018-03-30 12:30:19.959072993 +0200
@@ -14,8 +14,8 @@
   ]
 }
 
-buildflag_header("ffmpeg_buildflags") {
-  header = "ffmpeg_buildflags.h"
+buildflag_header("ffmpeg_features") {
+  header = "ffmpeg_features.h"
   flags = [ "USE_SYSTEM_FFMPEG=true" ]
 }
 
@@ -36,7 +36,7 @@
 
 source_set("ffmpeg") {
   deps = [
-    ":ffmpeg_buildflags",
+    ":ffmpeg_features",
     ":ffmpeg_shim",
   ]
   public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ]
--- chromium-66.0.3359.66/build/linux/unbundle/jsoncpp.gn.overrides	2018-03-29 22:00:27.291041781 +0200
+++ chromium-66.0.3359.66/build/linux/unbundle/jsoncpp.gn	2018-03-30 12:35:59.317987225 +0200
@@ -20,9 +20,13 @@
   ]
 }
 
+config("jsoncpp_config") {
+}
+
 source_set("jsoncpp") {
   deps = [
     ":jsoncpp_shim",
   ]
+  public_configs = [ ":jsoncpp_config" ]
   libs = [ "jsoncpp" ]
 }

Actions: View

Attachments on bug 22138: 10145 | 10146 | 10149 | 10158 | 10159