← Back to branch summary

~oxide-developers/oxide/packaging.yakkety

« back to all changes in this revision

Viewing changes to debian/patches/gross-hack-for-dual-ffmpeg-build.patch

  • Committer: Chris Coulson
  • Date: 2017-01-26 19:05:34 UTC
  • mfrom: (79.1.84 packaging.yakkety.next)
  • Revision ID: chris.coulson@canonical.com-20170126190534-cnybzxhii2d6ulpq
https://launchpad.net/bugs/1610929
https://launchpad.net/bugs/1632487
https://launchpad.net/bugs/1632490
https://launchpad.net/bugs/1637184
https://launchpad.net/bugs/1637186
https://launchpad.net/bugs/1637187
https://launchpad.net/bugs/1637190
https://launchpad.net/bugs/1639241
https://launchpad.net/bugs/1640634
https://launchpad.net/bugs/1642317
https://launchpad.net/bugs/1642318
https://launchpad.net/bugs/1642381
https://launchpad.net/bugs/1643428
https://launchpad.net/bugs/1643548
https://launchpad.net/bugs/1649861
* Update to v1.20.3 (see USN-3180-1)
  - Bump Chromium rev to 56.0.2924.76
  - Fix LP: #1642318 - Build failure on arm64
  - Fix LP: #1649861 - session save/restore across oxide versions
  - Fix LP: #1632490 - Disable zoom-for-dsf
  - Fix LP: #1632487 - Update tst_WebView_findController.qml to test that
    results are updated on navigation
  - Fix LP: #1610929 - Implement Screen::GetShellMode()
  - Fix LP: #1637184 - Add libOxideUbuntuUITK, associated QML plugin and
    UbuntuWebView implementation, which will eventually replace the
    Ubuntu.Web component
  - Stop using Q_DECL_EXPORT in various places
  - Enable use_external_popup_menu and remove our hack for supporting these
  - Refactor WebContextMenu
  - Documentation changes - ensure that the PermissionRequest classe
    indicate the inheritance chain and add missing entries for a few signals
  - Remove WebView::GetDisplay, as it's unused
  - Pass context menu params to the webview via a separate object
  - Fix a compiler warning
  - Fix a build failure with ENABLE_HYBRIS_CAMERA
  - Fix a build failure with ENABLE_COMPONENT_BUILD
  - Fix media hub build
  - Fix LP: #1637186 - Add context menu implementation to UbuntuWebView
  - Disable enable_media_routing as it results in a lot of console spam now
  - Fix LP: #1639241 - Set the solid colour scrollbar colour correctly
  - Fix LP: #1643428 - Fix an issue where the fling direction sometimes
    reverses
  - Fix a build failure with ENABLE_HYBRIS_CAMERA
  - Fix LP: #1643548 - Emit a warning when importing Oxide.Ubuntu
  - Fix LP: #1642381 - Don't spin up a zygote process in single process mode
  - Remove OXIDE_DISABLE_SETUID_SANDBOX environment variable - it doesn't
    work anyway
  - Ensure that the value returned from TestApi.getBoundingClientRectForSelector
    is scaled correctly
  - Fix LP: #1637187 - Add QML tests for context menu
  - Fix LP: #1637190 - Add API to allow embedders to customize actions in
    the context menu
  - Fix LP: #1640634 - "Open {link,media} in new {tab,window}" entries in
    context menu shouldn't cause WebView.navigationRequested to fire
* Refresh gross-hack-for-dual-ffmpeg-build.patch
* Fix LP: #1642317 - misaligned access when running mksnapshot during the
  armhf build. Add this as a distro-patch to avoid having to fork the v8
  repo for upstream checkouts. This isn't a problem for cross-builds anyway
  - Add debian/patches/lp1642317.patch
  - Update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gross-hack-for-dual-ffmpeg-build.patch
1
 
Index: oxide-qt-1.18.0~git1472807112.34be5c5/oxide/shared/renderer/oxide_content_renderer_client.cc
 
1
Index: oxide-qt-1.20.0~git1479114350.05ba462/oxide/shared/renderer/oxide_content_renderer_client.cc
2
2
===================================================================
3
 
--- oxide-qt-1.18.0~git1472807112.34be5c5.orig/oxide/shared/renderer/oxide_content_renderer_client.cc
4
 
+++ oxide-qt-1.18.0~git1472807112.34be5c5/oxide/shared/renderer/oxide_content_renderer_client.cc
5
 
@@ -54,6 +54,12 @@
 
3
--- oxide-qt-1.20.0~git1479114350.05ba462.orig/oxide/shared/renderer/oxide_content_renderer_client.cc
 
4
+++ oxide-qt-1.20.0~git1479114350.05ba462/oxide/shared/renderer/oxide_content_renderer_client.cc
 
5
@@ -53,6 +53,12 @@
6
6
 #include "media/oxide_web_media_player.h"
7
7
 #endif
8
8
 
15
15
 namespace oxide {
16
16
 
17
17
 void ContentRendererClient::RenderThreadStarted() {
18
 
@@ -76,6 +82,14 @@ void ContentRendererClient::RenderThread
 
18
@@ -73,6 +79,14 @@ void ContentRendererClient::RenderThread
 
19
   // Oxide does not support NavigatorContentUtils.
 
20
   // See https://launchpad.net/bugs/1214046
19
21
   blink::WebRuntimeFeatures::enableNavigatorContentUtils(false);
20
 
 
21
 
   blink::WebView::setUseExternalPopupMenus(true);
22
22
+
23
23
+#if defined(USE_PROPRIETARY_CODECS)
24
24
+  media::FFmpegGlue::InitializeFFmpeg();
30
30
 }
31
31
 
32
32
 void ContentRendererClient::RenderFrameCreated(
33
 
Index: oxide-qt-1.18.0~git1472807112.34be5c5/oxide/build/cmake/ChromiumBuildShim.cmake
 
33
Index: oxide-qt-1.20.0~git1479114350.05ba462/oxide/build/cmake/ChromiumBuildShim.cmake
34
34
===================================================================
35
 
--- oxide-qt-1.18.0~git1472807112.34be5c5.orig/oxide/build/cmake/ChromiumBuildShim.cmake
36
 
+++ oxide-qt-1.18.0~git1472807112.34be5c5/oxide/build/cmake/ChromiumBuildShim.cmake
 
35
--- oxide-qt-1.20.0~git1479114350.05ba462.orig/oxide/build/cmake/ChromiumBuildShim.cmake
 
36
+++ oxide-qt-1.20.0~git1479114350.05ba462/oxide/build/cmake/ChromiumBuildShim.cmake
37
37
@@ -210,7 +210,7 @@ function(run_generate_ninja)
38
38
     list(APPEND MAKE_GN_ARGS_CMD -Dproprietary_codecs=true)
39
39
   else()
43
43
   endif()
44
44
 
45
45
   if(ENABLE_PLUGINS)
46
 
Index: oxide-qt-1.18.0~git1472807112.34be5c5/media/BUILD.gn
 
46
Index: oxide-qt-1.20.0~git1479114350.05ba462/media/BUILD.gn
47
47
===================================================================
48
 
--- oxide-qt-1.18.0~git1472807112.34be5c5.orig/media/BUILD.gn
49
 
+++ oxide-qt-1.18.0~git1472807112.34be5c5/media/BUILD.gn
50
 
@@ -23,12 +23,6 @@ buildflag_header("media_features") {
 
48
--- oxide-qt-1.20.0~git1479114350.05ba462.orig/media/BUILD.gn
 
49
+++ oxide-qt-1.20.0~git1479114350.05ba462/media/BUILD.gn
 
50
@@ -25,12 +25,6 @@ buildflag_header("media_features") {
51
51
   ]
52
52
 }
53
53
 
60
60
 # Common configuration for targets in the media directory.
61
61
 # NOT for exporting.
62
62
 config("media_config") {
63
 
Index: oxide-qt-1.18.0~git1472807112.34be5c5/oxide/shared/BUILD.gn
 
63
Index: oxide-qt-1.20.0~git1479114350.05ba462/oxide/shared/BUILD.gn
64
64
===================================================================
65
 
--- oxide-qt-1.18.0~git1472807112.34be5c5.orig/oxide/shared/BUILD.gn
66
 
+++ oxide-qt-1.18.0~git1472807112.34be5c5/oxide/shared/BUILD.gn
67
 
@@ -207,6 +207,7 @@ component("shared") {
68
 
     "//services/shell/public/cpp",
 
65
--- oxide-qt-1.20.0~git1479114350.05ba462.orig/oxide/shared/BUILD.gn
 
66
+++ oxide-qt-1.20.0~git1479114350.05ba462/oxide/shared/BUILD.gn
 
67
@@ -213,6 +213,7 @@ component("shared") {
 
68
     "//services/service_manager/public/cpp",
69
69
     "//skia",
70
70
     "//storage/common",
71
71
+    "//third_party/ffmpeg",