Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79965724af329314843c58129a8eff2a073b0a20
commit 79965724af329314843c58129a8eff2a073b0a20 Author: Marius Cirsta <mcir...@frugalware.org> Date: Sat Aug 20 21:00:06 2016 +0300 chromium-dev-54.0.2832.2-1-x86_64 * add devel version of Chromium, build with gn, with gtk3 instead of gtk2 and without gnome stuff diff --git a/source/xapps-extra/chromium-dev/FrugalBuild b/source/xapps-extra/chromium-dev/FrugalBuild new file mode 100644 index 0000000..b2eb660 --- /dev/null +++ b/source/xapps-extra/chromium-dev/FrugalBuild @@ -0,0 +1,270 @@ +# Compiling Time: 26.46 SBU +# Maintainer: Marius Cirsta <mcir...@frugalware.org> + +pkgname=chromium-dev +pkgver=54.0.2832.2 +pkgrel=1 +pkgdesc='Development version of Chromium browser' +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' 'libxtst>=1.2.2-2' 'libjpeg>=9a' 'freetype2' 'pango' 'ffmpeg' 'atk' 'libxkbcommon' \ + 'libatomic' 'pciutils>=3.5' 'gtk+3' 'libxslt' 'libwebp') +makedepends=('ninja' 'clang>=3.7.0-3' 'yasm' 'libexif' 'gperf' 'libpthread-stubs' 'x11-protos' 'krb5' 'cups' \ + 'python-ply' 'python-jinja' 'python-markupsafe' 'beautifulsoup4' 'html5lib-python' 'webencodings' 'protobuf-python') +license=('BSD') +groups=('xapps-extra') +archs=('i686' 'x86_64') +_F_gnome_iconcache="y" +Finclude gnome-scriptlet +_F_archive_name="chromium" +up2date="Flastarchive https://github.com/zcbenz/chromium-source-tarball/releases .tar.xz" +source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz \ + $pkgname.desktop \ + $pkgname.sh \ + chromium-system-jinja-r13.patch \ + chromium-system-ffmpeg-r3.patch \ + jpeg9.patch \ + gtk2_disable_fix.patch \ + chromium-last-commit-position-r1.patch) +sha1sums=('b429111875a4a96217002375ad5e02878de9fe73' \ + '8c45e9176f0bcbd1572b70a5fd2085bc61f4bc75' \ + '7b4b96c7150f3499cc02b8caeea73d28548dabd9' \ + 'c121b8ab729efc99040a2908d763110428c62b72' \ + '4d615c06c61388d6d981702c2c8291544e098464' \ + '95b850e2d22f3d42a25e33edfea549cf1bc5ab33' \ + 'f67ed24248c0ec152908d8c206c0efebe2a92997' \ + 'd03e6465cd5a84580f9dad5d45f24ccd42bb71e6') + +# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) +# Note: These are for Frugalware use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact de...@frugalware.org for +# more information. +_google_api_key='AIzaSyDBY0Wxey1VCsW8fP6j7oJy_-ojnpYMh2o' +_google_default_client_id='63071405569.apps.googleusercontent.com' +_google_default_client_secret='2bNvMsN-57D44Q5ireW62LcZ' + + +build() { + Fcd + Fpatchall + + conditional_bundled_libraries+=" + base/third_party/libevent \ + third_party/adobe \ + third_party/speech-dispatcher \ + third_party/usb_ids \ + third_party/xdg-utils \ + third_party/yasm/run_yasm.py " + +# Remove most bundled libraries. Some are still needed. + Fexec build/linux/unbundle/remove_bundled_libraries.py \ + ${conditional_bundled_libraries} \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/analytics' \ + 'third_party/angle' \ + 'third_party/angle/src/common/third_party/numerics' \ + 'third_party/angle/src/third_party/compiler' \ + 'third_party/angle/src/third_party/libXNVCtrl' \ + 'third_party/angle/src/third_party/murmurhash' \ + 'third_party/angle/src/third_party/trace_event' \ + 'third_party/boringssl' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/catapult' \ + 'third_party/catapult/third_party/polymer' \ + 'third_party/catapult/third_party/py_vulcanize' \ + 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ + 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ + 'third_party/catapult/tracing/third_party/d3' \ + 'third_party/catapult/tracing/third_party/gl-matrix' \ + 'third_party/catapult/tracing/third_party/jszip' \ + 'third_party/catapult/tracing/third_party/mannwhitneyu' \ + 'third_party/ced' \ + 'third_party/cld_2' \ + 'third_party/cld_3' \ + 'third_party/cros_system_api' \ + 'third_party/cython/python_flags.py' \ + 'third_party/devscripts' \ + 'third_party/dom_distiller_js' \ + 'third_party/fips181' \ + 'third_party/flatbuffers' \ + 'third_party/flot' \ + 'third_party/google_input_tools' \ + 'third_party/google_input_tools/third_party/closure_library' \ + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/icu' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libXNVCtrl' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsecret' \ + 'third_party/libsrtp' \ + 'third_party/libudev' \ + 'third_party/libusb' \ + 'third_party/libwebm' \ + 'third_party/libxml/chromium' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mt19937ar' \ + 'third_party/openh264' \ + 'third_party/openmax_dl' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/pdfium' \ + 'third_party/pdfium/third_party/agg23' \ + 'third_party/pdfium/third_party/base' \ + 'third_party/pdfium/third_party/bigint' \ + 'third_party/pdfium/third_party/freetype' \ + 'third_party/pdfium/third_party/lcms2-2.6' \ + 'third_party/pdfium/third_party/libjpeg' \ + 'third_party/pdfium/third_party/libopenjpeg20' \ + 'third_party/pdfium/third_party/libpng16' \ + 'third_party/pdfium/third_party/libtiff' \ + 'third_party/pdfium/third_party/zlib_v128' \ + 'third_party/polymer' \ + 'third_party/protobuf' \ + 'third_party/protobuf/third_party/six' \ + 'third_party/qcms' \ + 'third_party/re2' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/usrsctp' \ + 'third_party/web-animations-js' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/woff2' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/valgrind' \ + --do-remove + + + gn_system_libraries=" + flac + harfbuzz-ng + libevent + libpng + libvpx + libwebp + libxml + libxslt + snappy + yasm + zlib + ffmpeg" + + Fexec build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} + + Fexec touch chrome/test/data/webui/i18n_process_css_test.html + + Fexec third_party/libaddressinput/chromium/tools/update-strings.py + + myconf_gn+=" is_debug=false" +# myconf_gn+=" is_debug=true" + myconf_gn+=" enable_iterator_debugging=false" + myconf_gn+=" enable_nacl=false" + myconf_gn+=" symbol_level=0 remove_webcore_debug_symbols=true" + + myconf_gn+=" enable_hangout_services_extension=false" + myconf_gn+=" enable_widevine=false" + myconf_gn+=" use_allocator=\"none\"" + myconf_gn+=" use_cups=true" + myconf_gn+=" use_kerberos=true" + myconf_gn+=" use_pulseaudio=true" + myconf_gn+=" fieldtrial_testing_like_official_build=true" + myconf_gn+=" is_clang=false" + myconf_gn+=" use_gold=false use_sysroot=false" + myconf_gn+=" proprietary_codecs=true " + myconf_gn+=" use_atk=false " + myconf_gn+=" use_gconf=false " + myconf_gn+=" use_gio=false " + myconf_gn+=" use_gnome_keyring=false" +# myconf_gn+=" use_ozone=true " +# myconf_gn+=" use_aura=true " + myconf_gn+=" use_glib=true " + myconf_gn+=" use_gtk3=true " + myconf_gn+=" use_xkbcommon=true" +#remoting needs gtk2 so we disable it, test if it still needs gtk2 and if not enable + myconf_gn+=" enable_remoting=false " + myconf_gn+=" use_system_libjpeg=true " + + +# myconf_gn+=" ffmpeg_branding=\"Chrome\"" + + myconf_gn+=" google_api_key=\"${_google_api_key}\"" + myconf_gn+=" google_default_client_id=\"${_google_default_client_id}\"" + myconf_gn+=" google_default_client_secret=\"${_google_default_client_secret}\"" + + myconf_gn+=" treat_warnings_as_errors=false" + myconf_gn+=" fatal_linker_warnings=false" + + Fexec tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" + + Fexec out/Release/gn gen --args="${myconf_gn}" out/Release || Fdie + + Fexec ninja -j 40 -C out/Release chrome chrome_sandbox chromedriver + + Fmkdir usr/lib/chromium-dev + Fexerel out/Release/chrome usr/lib/chromium-dev/chromium + Finstallrel 4755 out/Release/chrome_sandbox usr/lib/chromium-dev/chrome-sandbox + Ffileschown usr/lib/chromium-dev/chrome-sandbox root root + + Fcprel out/Release/\*.pak usr/lib/chromium-dev/ + Fcprel out/Release/locales usr/lib/chromium-dev/ + Fcprel out/Release/resources usr/lib/chromium-dev/ + + Fcprel out/Release/icudtl.dat usr/lib/chromium-dev/ + + find $Fdestdir/usr/lib/chromium-dev/ -name '*.d' -type f -delete + + Finstall 644 $pkgname.desktop usr/share/applications/$pkgname.desktop + + 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 + + for size in 16 32; do + Finstallrel 644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \ + "usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png" + done + + Finstallrel 644 out/Release/natives_blob.bin usr/lib/chromium-dev + Finstallrel 644 out/Release/snapshot_blob.bin usr/lib/chromium-dev + + Fdirschmod usr/lib/chromium-dev/locales 755 + + Fexe $pkgname.sh usr/bin/$pkgname + + Fdocrel LICENSE + Fbuild_gnome_scriptlet +} + +# optimization OK diff --git a/source/xapps-extra/chromium-dev/chromium-dev.desktop b/source/xapps-extra/chromium-dev/chromium-dev.desktop new file mode 100644 index 0000000..b5c08fc --- /dev/null +++ b/source/xapps-extra/chromium-dev/chromium-dev.desktop @@ -0,0 +1,115 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Chromium Dev +# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. +# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. +GenericName=Web Browser +GenericName[ar]=٠تصÙØ Ø§ÙشبÙØ© +GenericName[bg]=Уеб бÑаÑзÑÑ +GenericName[ca]=Navegador web +GenericName[cs]=WWW prohlÞeÄ +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=ΠεÏιηγηÏÎ®Ï Î¹ÏÏÎ¿Ï +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[gu]=વà«àª¬ બà«àª°àª¾àªàªàª° +GenericName[he]=×פ××¤× ××× ××¨× × +GenericName[hi]=वà¥à¤¬ बà¥à¤°à¤¾à¤à¤à¤¼à¤° +GenericName[hu]=WebböngészÅ +GenericName[it]=Browser Web +GenericName[ja]=ã¦ã§ããã©ã¦ã¶ +GenericName[kn]=à²à²¾à²² ವà³à²à³à²·à² +GenericName[ko]=ì¹ ë¸ë¼ì°ì +GenericName[lt]=Žiniatinklio narÅ¡yklÄ +GenericName[lv]=TÄ«mekļa pÄrlÅ«ks +GenericName[ml]=à´µàµà´¬àµ à´¬àµà´°àµà´¸à´°àµâ +GenericName[mr]=वà¥à¤¬ बà¥à¤°à¤¾à¤à¤à¤° +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[pl]=PrzeglÄ darka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador da Internet +GenericName[ro]=Navigator de Internet +GenericName[ru]=Ðеб-бÑаÑÐ·ÐµÑ +GenericName[sl]=Spletni brskalnik +GenericName[sv]=Webbläsare +GenericName[ta]=à®à®£à¯à®¯ à®à®²à®¾à®µà®¿ +GenericName[th]=à¹à¸§à¹à¸à¹à¸à¸£à¸²à¸§à¹à¹à¸à¸à¸£à¹ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=ÐавÑгаÑÐ¾Ñ Ð¢ÐµÐ½ÐµÑ +GenericName[zh_CN]=ç½é¡µæµè§å¨ +GenericName[zh_HK]=網é çè¦½å¨ +GenericName[zh_TW]=網é çè¦½å¨ +# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. +GenericName[bn]=à¦à§à§à¦¬ বà§à¦°à¦¾à¦à¦à¦¾à¦° +GenericName[fil]=Web Browser +GenericName[hr]=Web preglednik +GenericName[id]=Browser Web +GenericName[or]=à¬àବàବ ବàରାà¬à¬à¬° +GenericName[sk]=WWW prehliadaÄ +GenericName[sr]=ÐнÑеÑÐ½ÐµÑ Ð¿Ñегледник +GenericName[te]=మహాతల à° à°¨à±à°µà±à°·à°¿ +GenericName[vi]=Bá» duyá»t Web +# Gnome and KDE 3 uses Comment. +Comment=Access the Internet +Comment[ar]=اÙدخÙ٠إÙ٠اÙØ¥ÙترÙت +Comment[bg]=ÐоÑÑÑп до инÑеÑÐ½ÐµÑ +Comment[bn]=à¦à¦¨à§à¦à¦¾à¦°à¦¨à§à¦à¦à¦¿ ঠà§à¦¯à¦¾à¦à§à¦¸à§à¦¸ à¦à¦°à§à¦¨ +Comment[ca]=Accedeix a Internet +Comment[cs]=PÅÃstup k internetu +Comment[da]=FÃ¥ adgang til internettet +Comment[de]=Internetzugriff +Comment[el]=Î ÏÏÏβαÏη ÏÏο ÎιαδίκÏÏ Î¿ +Comment[en_GB]=Access the Internet +Comment[es]=Accede a Internet. +Comment[et]=Pääs Internetti +Comment[fi]=Käytä internetiä +Comment[fil]=I-access ang Internet +Comment[fr]=Accéder à Internet +Comment[gu]=àªàªàªàª°àª¨à«àª àªàªà«àª¸à«àª¸ àªàª°à« +Comment[he]=×××©× ×× ×××× ××¨× × +Comment[hi]=à¤à¤à¤à¤°à¤¨à¥à¤ तठपहà¥à¤à¤ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤ +Comment[hr]=Pristup Internetu +Comment[hu]=Internetelérés +Comment[id]=Akses Internet +Comment[it]=Accesso a Internet +Comment[ja]=ã¤ã³ã¿ã¼ãããã«ã¢ã¯ã»ã¹ +Comment[kn]=à²à²à²à²°à³à²¨à³à²à³ ಠನà³à²¨à³ ಪà³à²°à²µà³à²¶à²¿à²¸à²¿ +Comment[ko]=ì¸í°ë· ì°ê²° +Comment[lt]=Interneto prieiga +Comment[lv]=Piekļūt internetam +Comment[ml]=à´à´¨àµà´±à´°àµââà´¨àµà´±àµà´±àµ à´à´àµâസസൠà´àµà´¯àµà´¯àµà´ +Comment[mr]=à¤à¤à¤à¤°à¤¨à¥à¤à¤®à¤§à¥à¤¯à¥ पà¥à¤°à¤µà¥à¤¶ à¤à¤°à¤¾ +Comment[nb]=GÃ¥ til Internett +Comment[nl]=Verbinding maken met internet +Comment[or]=à¬à¬£àà¬à¬°àନàà¬à ପàରବàଶ à¬à¬°à¬¨àତà +Comment[pl]=Skorzystaj z internetu +Comment[pt]=Aceder à Internet +Comment[pt_BR]=Acessar a internet +Comment[ro]=AccesaÅ£i Internetul +Comment[ru]=ÐоÑÑÑп в ÐнÑеÑÐ½ÐµÑ +Comment[sk]=PrÃstup do siete Internet +Comment[sl]=Dostop do interneta +Comment[sr]=ÐÑиÑÑÑпиÑе ÐнÑеÑнеÑÑ +Comment[sv]=GÃ¥ ut pÃ¥ Internet +Comment[ta]=à®à®£à¯à®¯à®¤à¯à®¤à¯ ஠ணà¯à®à¯à®¤à®²à¯ +Comment[te]=à°à°à°à°°à±à°¨à±à°à±âనౠà°à°à±à°¸à±à°¸à± à°à±à°¯à±à°¯à°à°¡à°¿ +Comment[th]=à¹à¸à¹à¸²à¸à¸¶à¸à¸à¸´à¸à¹à¸à¸à¸£à¹à¹à¸à¹à¸ +Comment[tr]=Ä°nternet'e eriÅin +Comment[uk]=ÐоÑÑÑп до ÐнÑеÑнеÑÑ +Comment[vi]=Truy cáºp Internet +Comment[zh_CN]=访é®äºèç½ +Comment[zh_HK]=é£ç·å°ç¶²é網路 +Comment[zh_TW]=é£ç·å°ç¶²é網路 +Exec=chromium-dev %U +Terminal=false +Icon=chromium-browser +Type=Application +Categories=Application;Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml_xml; + diff --git a/source/xapps-extra/chromium-dev/chromium-dev.sh b/source/xapps-extra/chromium-dev/chromium-dev.sh new file mode 100644 index 0000000..aff457e --- /dev/null +++ b/source/xapps-extra/chromium-dev/chromium-dev.sh @@ -0,0 +1,5 @@ +#!/bin/sh +export CHROME_WRAPPER=/usr/lib/chromium-dev/chromium +export CHROME_DESKTOP=chromium-dev.desktop + +exec /usr/lib/chromium-dev/chromium $CHROME_GLOBAL_FLAGS $CHROME_USER_FLAGS $@ diff --git a/source/xapps-extra/chromium-dev/chromium-last-commit-position-r1.patch b/source/xapps-extra/chromium-dev/chromium-last-commit-position-r1.patch new file mode 100644 index 0000000..700a86e --- /dev/null +++ b/source/xapps-extra/chromium-dev/chromium-last-commit-position-r1.patch @@ -0,0 +1,26 @@ +--- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000 ++++ b/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 { + +--- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000 ++++ b/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-dev/chromium-system-ffmpeg-r3.patch b/source/xapps-extra/chromium-dev/chromium-system-ffmpeg-r3.patch new file mode 100644 index 0000000..4704eb1 --- /dev/null +++ b/source/xapps-extra/chromium-dev/chromium-system-ffmpeg-r3.patch @@ -0,0 +1,113 @@ +--- 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> +--- a/media/filters/ffmpeg_demuxer.cc.orig 2016-08-01 10:52:01.528177808 +0000 ++++ b/media/filters/ffmpeg_demuxer.cc 2016-08-01 10:52:27.160707694 +0000 +@@ -1150,24 +1150,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; +- } +- } + + std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); + AVStream* audio_stream = NULL; +--- chromium-54.0.2832.2/media/ffmpeg/ffmpeg_common.cc 2016-08-20 01:03:36.000000000 +0300 ++++ chromium-54.0.2832.2.new/media/ffmpeg/ffmpeg_common.cc 2016-08-20 16:38:46.231221509 +0300 +@@ -761,62 +761,4 @@ + return hash; + } + +-#define TEST_PRIMARY(P) \ +- static_assert( \ +- static_cast<int>(gfx::ColorSpace::PrimaryID::P) == AVCOL_PRI_##P, \ +- "gfx::ColorSpace::PrimaryID::" #P " does not match AVCOL_PRI_" #P); +- +-#define TEST_TRANSFER(T) \ +- static_assert( \ +- static_cast<int>(gfx::ColorSpace::TransferID::T) == AVCOL_TRC_##T, \ +- "gfx::ColorSpace::TransferID::" #T " does not match AVCOL_TRC_" #T); +- +-#define TEST_COLORSPACE(C) \ +- static_assert( \ +- static_cast<int>(gfx::ColorSpace::MatrixID::C) == AVCOL_SPC_##C, \ +- "gfx::ColorSpace::MatrixID::" #C " does not match AVCOL_SPC_" #C); +- +-TEST_PRIMARY(RESERVED0); +-TEST_PRIMARY(BT709); +-TEST_PRIMARY(UNSPECIFIED); +-TEST_PRIMARY(RESERVED); +-TEST_PRIMARY(BT470M); +-TEST_PRIMARY(BT470BG); +-TEST_PRIMARY(SMPTE170M); +-TEST_PRIMARY(SMPTE240M); +-TEST_PRIMARY(FILM); +-TEST_PRIMARY(BT2020); +-TEST_PRIMARY(SMPTEST428_1); +- +-TEST_TRANSFER(RESERVED0); +-TEST_TRANSFER(BT709); +-TEST_TRANSFER(UNSPECIFIED); +-TEST_TRANSFER(RESERVED); +-TEST_TRANSFER(GAMMA22); +-TEST_TRANSFER(GAMMA28); +-TEST_TRANSFER(SMPTE170M); +-TEST_TRANSFER(SMPTE240M); +-TEST_TRANSFER(LINEAR); +-TEST_TRANSFER(LOG); +-TEST_TRANSFER(LOG_SQRT); +-TEST_TRANSFER(IEC61966_2_4); +-TEST_TRANSFER(BT1361_ECG); +-TEST_TRANSFER(IEC61966_2_1); +-TEST_TRANSFER(BT2020_10); +-TEST_TRANSFER(BT2020_12); +-TEST_TRANSFER(SMPTEST2084); +-TEST_TRANSFER(SMPTEST428_1); +- +-TEST_COLORSPACE(RGB); +-TEST_COLORSPACE(BT709); +-TEST_COLORSPACE(UNSPECIFIED); +-TEST_COLORSPACE(RESERVED); +-TEST_COLORSPACE(FCC); +-TEST_COLORSPACE(BT470BG); +-TEST_COLORSPACE(SMPTE170M); +-TEST_COLORSPACE(SMPTE240M); +-TEST_COLORSPACE(YCOCG); +-TEST_COLORSPACE(BT2020_NCL); +-TEST_COLORSPACE(BT2020_CL); +- + } // namespace media diff --git a/source/xapps-extra/chromium-dev/chromium-system-jinja-r13.patch b/source/xapps-extra/chromium-dev/chromium-system-jinja-r13.patch new file mode 100644 index 0000000..845ac94 --- /dev/null +++ b/source/xapps-extra/chromium-dev/chromium-system-jinja-r13.patch @@ -0,0 +1,59 @@ +--- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000 ++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000 +@@ -54,7 +54,6 @@ + 'actions': [{ + 'action_name': 'cache_jinja_templates', + 'inputs': [ +- '<@(jinja_module_files)', + 'code_generator_v8.py', + '<@(code_generator_template_files)', + ], +--- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000 ++++ b/third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000 +@@ -2,10 +2,6 @@ + { + 'variables': { + 'scripts_for_in_files': [ +- # jinja2/__init__.py contains version string, so sufficient as +- # dependency for whole jinja2 package +- '<(DEPTH)/third_party/jinja2/__init__.py', +- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + 'hasher.py', + 'in_file.py', + 'in_generator.py', +--- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000 ++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000 +@@ -12,9 +12,6 @@ + '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + ], + 'idl_lexer_parser_files': [ +- # PLY (Python Lex-Yacc) +- '<(DEPTH)/third_party/ply/lex.py', +- '<(DEPTH)/third_party/ply/yacc.py', + # Web IDL lexer/parser (base parser) + '<(DEPTH)/tools/idl_parser/idl_lexer.py', + '<(DEPTH)/tools/idl_parser/idl_node.py', +--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000 ++++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000 +@@ -9,10 +9,6 @@ + _scripts_dir = "//third_party/WebKit/Source/build/scripts" + + scripts_for_in_files = [ +- # jinja2/__init__.py contains version string, so sufficient as +- # dependency for whole jinja2 package +- "//third_party/jinja2/__init__.py", +- "//third_party/markupsafe/__init__.py", # jinja2 dep + "$_scripts_dir/hasher.py", + "$_scripts_dir/in_file.py", + "$_scripts_dir/in_generator.py", +--- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000 ++++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000 +@@ -36,7 +36,7 @@ + action("cached_jinja_templates") { + script = "code_generator_v8.py" + +- inputs = jinja_module_files + [ "code_generator_v8.py" ] + ++ inputs = [ "code_generator_v8.py" ] + + code_generator_template_files + + # Dummy file to track dependency. diff --git a/source/xapps-extra/chromium-dev/gtk2_disable_fix.patch b/source/xapps-extra/chromium-dev/gtk2_disable_fix.patch new file mode 100644 index 0000000..e237023 --- /dev/null +++ b/source/xapps-extra/chromium-dev/gtk2_disable_fix.patch @@ -0,0 +1,11 @@ +--- chromium-54.0.2832.2/chrome/test/BUILD.gn 2016-08-20 01:03:31.000000000 +0300 ++++ chromium-54.0.2832.2.new/chrome/test/BUILD.gn 2016-08-20 15:34:36.390367940 +0300 +@@ -471,7 +471,7 @@ + # suites, it seems like one or another starts timing out too. + "../browser/ui/views/keyboard_access_browsertest.cc", + ] +- if (!use_ozone) { ++ if (!use_ozone && !use_gtk3) { + sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ] + configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] + } diff --git a/source/xapps-extra/chromium-dev/jpeg9.patch b/source/xapps-extra/chromium-dev/jpeg9.patch new file mode 100644 index 0000000..9e10f59 --- /dev/null +++ b/source/xapps-extra/chromium-dev/jpeg9.patch @@ -0,0 +1,48 @@ +diff -Naur chromium-47.0.2526.111/ui/gfx/codec/jpeg_codec.cc chromium-47.0.2526.111-p/ui/gfx/codec/jpeg_codec.cc +--- chromium-47.0.2526.111/ui/gfx/codec/jpeg_codec.cc 2016-01-14 00:05:18.000000000 +0100 ++++ chromium-47.0.2526.111-p/ui/gfx/codec/jpeg_codec.cc 2016-01-17 16:15:46.931894308 +0100 +@@ -120,7 +120,7 @@ + // tell libjpeg where to write the next data + cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; + cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used; +- return 1; ++ return TRUE; + } + + // Cleans up the JpegEncoderState to prepare for returning in the final form. +@@ -261,7 +261,7 @@ + cinfo.data_precision = 8; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100 ++ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100 + + // set up the destination manager + jpeg_destination_mgr destmgr; +@@ -273,7 +273,7 @@ + JpegEncoderState state(output); + cinfo.client_data = &state; + +- jpeg_start_compress(&cinfo, 1); ++ jpeg_start_compress(&cinfo, TRUE); + + // feed it the rows, doing necessary conversions for the color format + #ifdef JCS_EXTENSIONS +@@ -359,7 +359,7 @@ + // set to a positive value if TRUE is returned. A FALSE return should only + // be used when I/O suspension is desired." + boolean FillInputBuffer(j_decompress_ptr cinfo) { +- return false; ++ return FALSE; + } + + // Skip data in the buffer. Since we have all the data at once, this operation +@@ -487,7 +487,7 @@ + cinfo.client_data = &state; + + // fill the file metadata into our buffer +- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) ++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) + return false; + + // we want to always get RGB data out
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
