Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4490290ac59bba8df55aa3046b94371c9b55ed25

commit 4490290ac59bba8df55aa3046b94371c9b55ed25
Author: DeX77 <de...@frugalware.org>
Date:   Tue Sep 20 14:25:47 2016 +0200

chromium-browser-53.0.2785.116-1-x86_64

* version bump

diff --git a/source/xapps-extra/chromium-browser/FrugalBuild 
b/source/xapps-extra/chromium-browser/FrugalBuild
index c496a4e..eb4c61c 100644
--- a/source/xapps-extra/chromium-browser/FrugalBuild
+++ b/source/xapps-extra/chromium-browser/FrugalBuild
@@ -2,14 +2,14 @@
# Maintainer: DeX77 <de...@frugalware.org>

pkgname=chromium-browser
-pkgver=52.0.2743.116
+pkgver=53.0.2785.116
pkgrel=1
pkgdesc='An open-source browser project that aims to build a safer, faster, and 
more stable way for all users to experience the web'
url='http://www.chromium.org/'
depends=('libevent>=2.0.22-3' 'nss>=3.21-3' 'libxscrnsaver>=1.2.2-2' 
'libpulse>=7.1-4' 'snappy>=1.1.3-2' 'libcups' \
-       'speech-dispatcher>=0.7.1-4' 'gtk+2-libs>=2.24.29-2' 
'gdk-pixbuf2>=2.32.3-2' 'libxtst>=1.2.2-2' 'libjpeg>=9a' \
-       'libatomic' 'pciutils>=3.5')
-makedepends=('ninja' 'clang>=3.7.0-3' 'gtk+2' 'yasm' 'libexif' 'gperf' 
'libpthread-stubs' 'x11-protos' 'krb5' 'cups')
+       'speech-dispatcher>=0.7.1-4' 'gdk-pixbuf2>=2.32.3-2' 'libxtst>=1.2.2-2' 
'libjpeg>=9a' \
+       'libatomic' 'pciutils>=3.5' 'opus' 'ffmpeg' 'libxslt' 'libwebp' 
'libgles' 'libegl' 'gtk+3')
+makedepends=('ninja' 'gtk+2' 'yasm' 'libexif' 'gperf' 'libpthread-stubs' 
'x11-protos' 'krb5' 'cups' 'mesa' 'lib32-libstdc++' 'lib32-zlib')
license=('BSD')
groups=('xapps-extra')
archs=('i686' 'x86_64')
@@ -22,11 +22,25 @@ up2date="lynx -dump -useragent='Mozilla/5.0 (Macintosh; 
Intel Mac OS X 10_8_0) A
egrep -o '([0123456789.]*)'"
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz
 \
$pkgname.desktop \
-        $pkgname.sh jpeg9.patch)
-sha1sums=('0a3c488132b4f729f0cb83efdb26e72a33b200b8' \
-          '78ed8913b8a598de6a9e45d206973a846dbe8a51' \
+        $pkgname.sh \
+       jpeg9.patch \
+       chromium-last-commit-position-r0.patch \
+       chromium-system-ffmpeg-r2.patch \
+       chromium-52.0.2743.82-widevinefix.patch \
+       chromium-46.0.2490.86-use_system_opus.patch \
+       chromium-52.0.2723.2-use_system_harfbuzz.patch \
+       chromium-52.0.2743.82-cups22.patch )
+
+sha1sums=('9f20ac0a5d1720bc932ed85779112d164390327f' \
+          '264b8e7c4e3273263d504e041e5e4d152677922c' \
'4c41d59b4d85a9f0443d6ca1dec456e50059dab5' \
-          '95b850e2d22f3d42a25e33edfea549cf1bc5ab33')
+          '95b850e2d22f3d42a25e33edfea549cf1bc5ab33' \
+          '0db176bb4b6175b408f75b0644d38b5229bd113c' \
+          '450cd81653499eb50f0f7df1b0d4d1c1620365a5' \
+          '452ca515e91ff27957ee1b5dfd975f2daabc5b64' \
+          'd6d09996ff5ff4d796cf26f239eb2b688e017d25' \
+          '4ac2af324c6927507d214ba3b6512ad1a879a2ff' \
+          '281ef7c51b733765b741d69b78e7d74ec6cb328a')

CXXFLAGS="$CXXFLAGS -fpermissive"

@@ -39,74 +53,127 @@ 
_google_default_client_id="63071405569.apps.googleusercontent.com"
_google_default_client_secret="2bNvMsN-57D44Q5ireW62LcZ"

build() {
+       LDFLAGS+=" -Wl,-rpath,/usr/lib/chromium,-rpath,/usr/lib/chromium/lib"
+
Fcd
-       Fpatchall

-       Fexec touch chrome/test/data/webui/i18n_process_css_test.html
+       if [ $CARCH = x86_64 ]; then
+               Fexec python2 build/download_nacl_toolchains.py \
+                       --packages 
nacl_x86_newlib,pnacl_newlib,pnacl_translator \
+                       sync --extract || Fdie
+       fi

-       myconf+="-Dgoogle_api_key=$_google_api_key
-       -Dgoogle_default_client_id=$_google_default_client_id
-       -Dgoogle_default_client_secret=$_google_default_client_secret
-       -Dwerror=
-       -Dclang=1
-       -Dclang_use_chrome_plugins=0
-       -Dpython_ver=2.7
-       -Dlinux_link_gsettings=1
-       -Dlinux_link_libpci=1
-       -Dlinux_link_libspeechd=1
-       -Dlinux_link_pulseaudio=1
-       -Dlinux_strip_binary=1
-       -Dlinux_use_bundled_binutils=0
-       -Dlinux_use_bundled_gold=0
-       -Dlinux_use_gold_flags=0
-       -Dlogging_like_official_build=1
-       -Dtracing_like_official_build=1
-       -Dfieldtrial_testing_like_official_build=1
-       -Dffmpeg_branding=Chrome
-       -Dproprietary_codecs=1
-       -Duse_gnome_keyring=0
-       -Duse_system_bzip2=1
-       -Duse_system_flac=1
-       -Duse_system_ffmpeg=0
-       -Duse_system_harfbuzz=1
-       -Duse_system_icu=0
-       -Duse_system_libevent=1
-       -Duse_system_libjpeg=1
-       -Duse_system_libpng=0
-       -Duse_system_libxml=0
-       -Duse_system_snappy=1
-       -Duse_system_ssl=0
-       -Duse_system_xdg_utils=1
-       -Duse_system_yasm=1
-       -Duse_system_zlib=0
-       -Dusb_ids_path=/usr/share/hwdata/usb.ids
-       -Duse_mojo=0
-       -Duse_gconf=0
-        -Duse_sysroot=0
-       -Denable_hangout_services_extension=1
-       -Ddisable_fatal_linker_warnings=1
-       -Dlibspeechd_h_prefix=speech-dispatcher/
-       -Ddisable_nacl=1
-       -Ddisable_glibc=1
-       -Ddisable_pnacl=1
-       -Ddisable_glibc=1"
+       Fpatchall

+       Fexec touch chrome/test/data/webui/i18n_process_css_test.html

-       if [ $CARCH = x86_64 ]; then
-               myconf+=" -Dtarget_arch=x64"
-       fi
+       # Google API stuff
+       myconf+="       -Dgoogle_api_key=$_google_api_key
+                       -Dgoogle_default_client_id=$_google_default_client_id
+                       
-Dgoogle_default_client_secret=$_google_default_client_secret"
+
+       # System libs
+       myconf+="       -Duse_system_bzip2=1
+                       -Duse_system_flac=1
+                       -Duse_system_ffmpeg=1
+                       -Duse_system_harfbuzz=1
+                       -Duse_system_libevent=1
+                       -Duse_system_libjpeg=1
+                       -Duse_system_libpng=1
+                       -Duse_system_libxml=1
+                       -Duse_system_snappy=1
+                       -Duse_system_ssl=1
+                       -Duse_system_xdg_utils=1
+                       -Duse_system_yasm=1
+                       -Duse_system_zlib=1
+                       -Duse_system_libexif=1
+                       -Duse_system_protobuf=0
+                       -Duse_system_yasm=1
+                       -Duse_system_sqlite=0
+                       -Duse_system_fontconfig=1
+                       -Duse_system_expat=1
+                       -Duse_system_jsoncpp=1
+                       -Duse_system_libevent=1
+                       -Duse_system_libusb=1
+                       -Duse_system_libvpx=1
+                       -Duse_system_libwebp=1
+                       -Duse_system_libxnvctrl=0
+                       -Duse_system_libxslt=1
+                       -Duse_system_re2=0
+                       -Duse_system_snappy=1
+                       -Duse_system_v8=0
+                       -Duse_system_minizip=1
+                       -Duse_system_opus=1"
+
+       # Linkage
+       myconf+="       -Dlinux_link_gsettings=1
+                       -Dlinux_link_libpci=1
+                       -Dlinux_link_libspeechd=1
+                       -Dlinux_link_pulseaudio=1"
+       # FFmpeg
+       myconf+="       -Dffmpeg_branding=Chromium
+                       -Denable_widevine=1
+                       -Denable_pepper_cdms=1
+                       -Denable_webrtc=1
+                       -Dbuild_ffmpegsumo=1
+                       -Dffmpeg_component=shared_library
+                       -Dproprietary_codecs=1"
+
+       # Like official
+       myconf+="       -Dlogging_like_official_build=1
+                       -Dtracing_like_official_build=1
+                       -Dfieldtrial_testing_like_official_build=1"
+
+       # Misc
+       myconf+="       -Dwerror=
+                       -Dpython_ver=2.7
+                       -Dremove_webcore_debug_symbols=1
+                       -Dlinux_strip_binary=1
+                       -Dlinux_use_bundled_binutils=0
+                       -Dlinux_use_bundled_gold=0
+                       -Duse_gnome_keyring=0
+                       -Denable_pepper_cdms=1
+                       -Denable_webrtc=1
+                       -Duse_aura=1
+                       -Dcomponent=shared_library
+                       -Dno_strict_aliasing=1
+                       -Dv8_no_strict_aliasing=1
+                       -Duse_gtk3=1
+                       -Denable_hidpi=1
+                       -Denable_hotwording=0
+                       -Dlinux_fpic=1
+                       -Denable_touch_ui=1
+                       -Duse_pulseaudio=1
+                       -Dusb_ids_path=/usr/share/hwdata/usb.ids
+                       -Duse_mojo=0
+                       -Duse_gconf=0
+                       -Duse_sysroot=0
+                       -Denable_hangout_services_extension=1
+                       -Ddisable_fatal_linker_warnings=1
+                       -Dlibspeechd_h_prefix=speech-dispatcher/
+                       -Dclang=0
+                       -Dgenerate_character_data=0
+                       -Ddisable_glibc=1"
+
+       # Disable NaCl for i686
if [ $CARCH = i686 ]; then
-               myconf+=" -Ddisable_sse2=1"
+       myconf+="       -Ddisable_nacl=1
+                       -Ddisable_pnacl=1"
fi

-        export CC=clang
-        export CXX=clang++
+       Fexec build/linux/unbundle/replace_gyp_files.py $myconf 
-Drelease_extra_cflags="$CFLAGS" || Fdie

+       Fexec ./build/gyp_chromium --no-parallel --depth .  $myconf || Fdie
+       Fexec ninja -v -C out/Release chrome chrome_sandbox || Fdie

-       Fexec build/linux/unbundle/replace_gyp_files.py $myconf 
-Drelease_extra_cflags="$CFLAGS"
+       strip -s out/Release/chrome
+       strip -s out/Release/chrome_sandbox
+       strip -s out/Release/lib/*.so

-       Fexec ./build/gyp_chromium --no-parallel --depth .  $myconf
-       Fexec ninja -v -C out/Release chrome chrome_sandbox chromedriver
+       if [ ! $CARCH = i686 ]; then
+               strip -s out/Release/nacl_helper{,_bootstrap}
+               strip -s out/Release/nacl_irt_*.nexe
+       fi

Fmkdir usr/lib/chromium
Fexerel out/Release/chrome usr/lib/chromium/chromium
@@ -116,6 +183,16 @@ build() {
Fcprel out/Release/\*.pak usr/lib/chromium/
Fcprel out/Release/locales usr/lib/chromium/
Fcprel out/Release/resources usr/lib/chromium/
+       Fcprel out/Release/libwidevinecdmadapter.so usr/lib/chromium/
+       Fcprel out/Release/lib usr/lib/chromium/
+
+       Frm usr/lib/chromium/lib/*.TOC #WTF!?
+
+       if [ ! $CARCH = i686 ]; then
+               Fcprel out/Release/nacl_helper usr/lib/chromium/
+               Fcprel out/Release/nacl_helper_bootstrap usr/lib/chromium/
+               Fcprel out/Release/nacl_irt_*.nexe usr/lib/chromium/
+       fi

Fcprel out/Release/icudtl.dat usr/lib/chromium/

@@ -127,7 +204,7 @@ build() {
for size in 22 24 48 64 128 256; do
Finstallrel 644 "chrome/app/theme/chromium/product_logo_$size.png" \
"usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png"
-       done
+                       done

for size in 16 32; do
Finstallrel 644 
"chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
diff --git 
a/source/xapps-extra/chromium-browser/chromium-46.0.2490.86-use_system_opus.patch
 
b/source/xapps-extra/chromium-browser/chromium-46.0.2490.86-use_system_opus.patch
new file mode 100644
index 0000000..d54938b
--- /dev/null
+++ 
b/source/xapps-extra/chromium-browser/chromium-46.0.2490.86-use_system_opus.patch
@@ -0,0 +1,12 @@
+diff -up 
chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus
 chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc
+--- 
chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus
        2015-10-07 04:42:12.000000000 +0200
++++ chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc        
2015-11-11 16:11:13.535250609 +0100
+@@ -13,7 +13,7 @@
+ #include "media/cast/test/utility/audio_utility.h"
+ #include "media/cast/test/utility/standalone_cast_environment.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+-#include "third_party/opus/src/include/opus.h"
++#include <opus/opus.h>
+
+ namespace media {
+ namespace cast {
diff --git 
a/source/xapps-extra/chromium-browser/chromium-52.0.2723.2-use_system_harfbuzz.patch
 
b/source/xapps-extra/chromium-browser/chromium-52.0.2723.2-use_system_harfbuzz.patch
new file mode 100644
index 0000000..dcdc9aa
--- /dev/null
+++ 
b/source/xapps-extra/chromium-browser/chromium-52.0.2723.2-use_system_harfbuzz.patch
@@ -0,0 +1,12 @@
+diff -up 
chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz 
chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h
+--- chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz     
2016-05-09 14:17:34.867555791 -0400
++++ chromium-52.0.2723.2/ui/gfx/render_text_harfbuzz.h 2016-05-09 
14:18:56.131677853 -0400
+@@ -13,7 +13,7 @@
+ #include "base/gtest_prod_util.h"
+ #include "base/macros.h"
+ #include "base/memory/scoped_vector.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
++#include <harfbuzz/hb.h>
+ #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/source/xapps-extra/chromium-browser/chromium-52.0.2743.82-cups22.patch 
b/source/xapps-extra/chromium-browser/chromium-52.0.2743.82-cups22.patch
new file mode 100644
index 0000000..ac0700a
--- /dev/null
+++ b/source/xapps-extra/chromium-browser/chromium-52.0.2743.82-cups22.patch
@@ -0,0 +1,47 @@
+diff -up chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 
chromium-52.0.2743.82/printing/backend/print_backend_cups.cc
+--- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22        
2016-07-22 09:20:15.794340886 -0400
++++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc       
2016-07-22 09:20:26.338261197 -0400
+@@ -16,6 +16,7 @@
+ #include "base/synchronization/lock.h"
+ #include "base/values.h"
+ #include "printing/backend/cups_helper.h"
++#include <cups/ppd.h>
+ #include "printing/backend/print_backend_consts.h"
+ #include "url/gurl.h"
+
+diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 
chromium-52.0.2743.82/printing/BUILD.gn
+--- chromium-52.0.2743.82/printing/BUILD.gn.cups22     2016-07-21 
11:27:05.597507544 -0400
++++ chromium-52.0.2743.82/printing/BUILD.gn    2016-07-21 14:36:45.574137758 
-0400
+@@ -147,12 +147,13 @@ component("printing") {
+                                  ],
+                                  "trim string")
+
+-      if (cups_version == "1.6" || cups_version == "1.7") {
++      if (cups_version == "1.6" || cups_version == "1.7" || cups_version == 
"2.2") {
+         cflags += [
+           # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
+           # API for now as supported Linux and Mac OS'es are still using
+           # older versions of CUPS. More info: crbug.com/226176
+           "-Wno-deprecated-declarations",
++          "-D_PPD_DEPRECATED=\"\"",
+           # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
+           # below.
+         ]
+diff -up chromium-52.0.2743.82/printing/printing.gyp.cups22 
chromium-52.0.2743.82/printing/printing.gyp
+--- chromium-52.0.2743.82/printing/printing.gyp.cups22 2016-07-21 
11:26:26.622746918 -0400
++++ chromium-52.0.2743.82/printing/printing.gyp        2016-07-21 
14:36:07.390373060 -0400
+@@ -142,12 +142,13 @@
+             'cups_version': '<!(python cups_config_helper.py --api-version 
<(sysroot))',
+           },
+           'conditions': [
+-            ['cups_version in ["1.6", "1.7"]', {
++            ['cups_version in ["1.6", "1.7", "2.2"]', {
+               'cflags': [
+                 # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
+                 # API for now as supported Linux and Mac OS'es are still using
+                 # older versions of CUPS. More info: crbug.com/226176
+                 '-Wno-deprecated-declarations',
++                '-D_PPD_DEPRECATED=""',
+                 # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac 
section
+                 # below.
+               ],
diff --git 
a/source/xapps-extra/chromium-browser/chromium-52.0.2743.82-widevinefix.patch 
b/source/xapps-extra/chromium-browser/chromium-52.0.2743.82-widevinefix.patch
new file mode 100644
index 0000000..86414a6
--- /dev/null
+++ 
b/source/xapps-extra/chromium-browser/chromium-52.0.2743.82-widevinefix.patch
@@ -0,0 +1,25 @@
+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::vector<c
+     widevine_cdm.is_out_of_process = true;
+     widevine_cdm.path = adapter_path;
+     widevine_cdm.name = kWidevineCdmDisplayName;
+-    widevine_cdm.description =
+-        base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")",
+-                           kWidevineCdmDescription);
+-    widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
++    widevine_cdm.description = kWidevineCdmDescription;
+     content::WebPluginMimeType widevine_cdm_mime_type(
+         kWidevineCdmPluginMimeType, kWidevineCdmPluginExtension,
+         kWidevineCdmPluginMimeTypeDescription);
+@@ -555,8 +552,7 @@ void ChromeContentClient::AddContentDecr
+     // CdmInfo needs |path| to be the actual Widevine library,
+     // not the adapter, so adjust as necessary. It will be in the
+     // same directory as the installed adapter.
+-    const base::Version version(WIDEVINE_CDM_VERSION_STRING);
+-    DCHECK(version.IsValid());
++    const base::Version version;
+     cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
+                                      codecs_supported));
+   }
diff --git a/source/xapps-extra/chromium-browser/chromium-browser.desktop 
b/source/xapps-extra/chromium-browser/chromium-browser.desktop
index c3b4d2a..3067f97 100644
--- a/source/xapps-extra/chromium-browser/chromium-browser.desktop
+++ b/source/xapps-extra/chromium-browser/chromium-browser.desktop
@@ -111,5 +111,4 @@ Terminal=false
Icon=chromium-browser
Type=Application
Categories=Application;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml_xml;
-
+MimeType=text/html;text/xml;application/xhtml_xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/mailto;x-scheme-handler/webcal;
diff --git 
a/source/xapps-extra/chromium-browser/chromium-last-commit-position-r0.patch 
b/source/xapps-extra/chromium-browser/chromium-last-commit-position-r0.patch
new file mode 100644
index 0000000..344ed4c
--- /dev/null
+++ b/source/xapps-extra/chromium-browser/chromium-last-commit-position-r0.patch
@@ -0,0 +1,26 @@
+--- tools/gn/gn_main.cc.orig   2015-11-12 11:49:56.260549036 +0000
++++ tools/gn/gn_main.cc        2015-11-12 11:50:14.780931485 +0000
+@@ -11,13 +11,7 @@
+ #include "tools/gn/standard_out.h"
+ #include "tools/gn/switches.h"
+
+-// Only the GN-generated build makes this header for now.
+-// TODO(brettw) consider adding this if we need it in GYP.
+-#if defined(GN_BUILD)
+-#include "tools/gn/last_commit_position.h"
+-#else
+ #define LAST_COMMIT_POSITION "UNKNOWN"
+-#endif
+
+ namespace {
+
+--- tools/gn/BUILD.gn.orig     2015-11-12 11:50:43.513524769 +0000
++++ tools/gn/BUILD.gn  2015-11-12 11:50:57.697817632 +0000
+@@ -227,7 +227,6 @@
+
+   deps = [
+     ":gn_lib",
+-    ":last_commit_position",
+     "//base",
+     "//build/config/sanitizers:deps",
+   ]
diff --git 
a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r2.patch 
b/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r2.patch
new file mode 100644
index 0000000..8d67ef3
--- /dev/null
+++ b/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r2.patch
@@ -0,0 +1,50 @@
+--- a/media/ffmpeg/ffmpeg_common.h     2015-11-27 12:01:56.155462264 +0000
++++ b/media/ffmpeg/ffmpeg_common.h     2015-11-27 12:03:03.348846300 +0000
+@@ -19,10 +19,6 @@
+
+ // Include FFmpeg header files.
+ extern "C" {
+-// Disable deprecated features which result in spammy compile warnings.  This
+-// list of defines must mirror those in the 'defines' section of BUILD.gn 
file &
+-// ffmpeg.gyp file or the headers below will generate different structures!
+-#define FF_API_CONVERGENCE_DURATION 0
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
+@@ -36,7 +32,6 @@
+ MSVC_PUSH_DISABLE_WARNING(4244);
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+-#include <libavformat/internal.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index 155e980..7ba327a 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -1034,24 +1034,6 @@
+   // If no estimate is found, the stream entry will be kInfiniteDuration().
+   std::vector<base::TimeDelta> 
start_time_estimates(format_context->nb_streams,
+                                                     kInfiniteDuration());
+-  const AVFormatInternal* internal = format_context->internal;
+-  if (internal && internal->packet_buffer &&
+-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-    struct AVPacketList* packet_buffer = internal->packet_buffer;
+-    while (packet_buffer != internal->packet_buffer_end) {
+-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
+-                start_time_estimates.size());
+-      const AVStream* stream =
+-          format_context->streams[packet_buffer->pkt.stream_index];
+-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-        const base::TimeDelta packet_pts =
+-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
+-        if (packet_pts < start_time_estimates[stream->index])
+-          start_time_estimates[stream->index] = packet_pts;
+-      }
+-      packet_buffer = packet_buffer->next;
+-    }
+-  }
+
+   AVStream* audio_stream = NULL;
+   AudioDecoderConfig audio_config;
diff --git a/source/xapps-extra/chromium-browser/webui_test.patch 
b/source/xapps-extra/chromium-browser/webui_test.patch
deleted file mode 100644
index 02618e9..0000000
--- a/source/xapps-extra/chromium-browser/webui_test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up 
chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd.542819fix 
chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd
---- chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd.542819fix  
 2015-10-14 10:47:17.568757249 -0400
-+++ chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd     
2015-10-14 10:48:01.196466805 -0400
-@@ -8,7 +8,6 @@
-   </outputs>
-   <release seq="1">
-     <includes>
--      <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" 
file="webui/i18n_process_css_test.html" flattenhtml="true" 
allowexternalscript="true" type="BINDATA" />
-     </includes>
-   </release>
- </grit>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to