From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CF4E1382C5 for ; Sat, 20 Jan 2018 09:31:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CD2FE0907; Sat, 20 Jan 2018 09:31:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9BE0E0907 for ; Sat, 20 Jan 2018 09:31:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0510E335C37 for ; Sat, 20 Jan 2018 09:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76477186 for ; Sat, 20 Jan 2018 09:31:00 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1516440499.e9451805afd1faa26b13afa235ccc1e8ffc2a920.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi/files/, www-client/vivaldi/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/vivaldi/Manifest www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild X-VCS-Directories: www-client/vivaldi/files/ www-client/vivaldi/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: e9451805afd1faa26b13afa235ccc1e8ffc2a920 X-VCS-Branch: master Date: Sat, 20 Jan 2018 09:31:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 43aa3f46-c889-41e1-b607-5fbf9aee35c9 X-Archives-Hash: 628c2e81a7b6580ba13d428c5d2748bf commit: e9451805afd1faa26b13afa235ccc1e8ffc2a920 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jan 20 09:28:19 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jan 20 09:28:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9451805 www-client/vivaldi: Version 1.13.1008.44_p1. Package-Manager: Portage-2.3.19, Repoman-2.3.6 www-client/vivaldi/Manifest | 3 + .../files/vivaldi-1.13.1008.44_p1-libffmpeg.patch | 27 +++++ www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild | 129 +++++++++++++++++++++ 3 files changed, 159 insertions(+) diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index e6c3fe24d9b..3fcbfba1d61 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -1,3 +1,6 @@ DIST vivaldi-1.13.1008.40_p1-amd64.deb 49253000 BLAKE2B 611ae67831400a6eed575d886fc36b324450b1d2efa65b0f504ad8067b224a6a38a3e8146a4ba9a188fc122584e70fcb65f34c084f501ac8e6e27a524f3fadc9 SHA512 8f6dc0adf328a53eef2b23b061dbbab93baa5f0dfbb12c386446a27791fda1ce95d31810e43167a9225e66eb5ae2db923363e7b4d51422a162c3b8dc84c26d50 DIST vivaldi-1.13.1008.40_p1-armhf.deb 45155072 BLAKE2B 76e851b23cc48e87257782cc9ccc73ff974161732784acf27031d3d3b2b1b7430ffbac7b75b71042f775c9e3596470653414c43505d09dae3465c75d0fa578f7 SHA512 815f33250705d9bebc3bd0e033250a7eca773e4acf2ca7745ea57d44b61ff489e102283bec97dfd0d1126fd5ab67d14b7f6be6f5b3a1c9a55d8b6895e067b23d DIST vivaldi-1.13.1008.40_p1-i386.deb 50136764 BLAKE2B 302456967c62b113c04458bc72a900d8c4d3ec17879d50e81ff326e0dda8255ca59f2995fb984bb5acbf2fdc2d15b02e93b80fc8263b10289256cf393745906b SHA512 a8aab123ecf0bacd16ffd2a239eddfd7125511d366a8bfb6b9bb2eaca3993dc3d90179d3012cc09cfe46cacae4097c0a36e74cad977c80eaebfc6fd5d85e0ab2 +DIST vivaldi-1.13.1008.44_p1-amd64.deb 49265816 BLAKE2B 4d49e00cb0bb7fbf72303eb32da01751b22f9ec252766205893ead6c65e95695457065d2d9dcd5c4d42621a1382b012b2718e67b7f514df2ee7b1ea959eeaeca SHA512 3bb7f5ac0e01b1b3d36b4faae8a0a7874ab8acad5398663c9e51b6f9f26a6f00f01c3a183ff964e18eda2358009c99b270e65a3d35d99cea1de72554a7f6255a +DIST vivaldi-1.13.1008.44_p1-armhf.deb 45147556 BLAKE2B 90d8c056c129273e2c759247d452d4a825cb0ad41052716674fac790bb488d3f0743fa692f302f1c7af3f22adb91b1a115e1bd5c2745560577c14e0645fe0afd SHA512 f390ef2a6afa98212458a803b2411e53849bc2be3ebf54f3fdedc15bd38462239f7590dd31870c312319a38bb0e293948e1bbd1f1a0cdf243747780925c9762c +DIST vivaldi-1.13.1008.44_p1-i386.deb 50145626 BLAKE2B 44c913c2e8242d2b4b5b24fb63bc21dd8636283ebbcc5b72178b7dd4a34e2fc0e5d45fe41fef9ce7c918809e0bfffa1cf3ddbe436626afaa6237b4c85d27c09e SHA512 2f34facdc0ee2662d0ce03347346f8e510c288259aa92306f22c1eced6fc8626275f766401f6468b7a3037c2e7d5e65f692de39753553c7c8537b6c7f7a57a7a diff --git a/www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch b/www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch new file mode 100644 index 00000000000..99213e265b1 --- /dev/null +++ b/www-client/vivaldi/files/vivaldi-1.13.1008.44_p1-libffmpeg.patch @@ -0,0 +1,27 @@ +--- a/opt/vivaldi/vivaldi ++++ b/opt/vivaldi/vivaldi +@@ -34,14 +34,14 @@ + # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h + if [ -r "$1" ]; then + FFMPEG_VERSION=`grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` +- if [ "$FFMPEG_VERSION" -ge "82746" -a "$FFMPEG_VERSION" -le "88062" ]; then ++# if [ "$FFMPEG_VERSION" -ge "82746" -a "$FFMPEG_VERSION" -le "88062" ]; then + if [[ -n "$LD_PRELOAD" ]]; then + export LD_PRELOAD="$LD_PRELOAD:$1" + else + export LD_PRELOAD="$1" + fi + export VIVALDI_FFMPEG_FOUND=YES +- fi ++# fi + fi + fi + fi +@@ -54,6 +54,7 @@ + # Check for libs in preferred order. + # Where possible, use other files/directories to confirm it's the correct variant. + VIVALDI_FFMPEG_FOUND=NO ++checkffmpeg "/usr/lib64/chromium/libffmpeg.so" + checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra' + checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra' + diff --git a/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild new file mode 100644 index 00000000000..64b2fd9f7d2 --- /dev/null +++ b/www-client/vivaldi/vivaldi-1.13.1008.44_p1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +CHROMIUM_LANGS=" + am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv + sw ta te th tr uk vi zh-CN zh-TW +" +inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils + +#VIVALDI_BRANCH="snapshot" + +VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}" +VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}" +VIVALDI_HOME="opt/${VIVALDI_BIN}" +DESCRIPTION="A new browser for our friends" +HOMEPAGE="http://vivaldi.com/" +VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_" +SRC_URI=" + amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) + arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb ) + x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb ) +" + +LICENSE="Vivaldi" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~x86" +RESTRICT="bindist mirror" + +DEPEND=" + virtual/libiconv +" +RDEPEND=" + >=dev-libs/openssl-1.0.1:0 + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/speex + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango[X] +" +QA_PREBUILT="*" +S=${WORKDIR} + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die + mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die + + sed -i \ + -e "s|${VIVALDI_BIN}|${PN}|g" \ + usr/share/applications/${VIVALDI_PN}.desktop \ + usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die + + mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die + chmod 0755 usr/share/doc/${PF} || die + + rm \ + _gpgbuilder \ + etc/cron.daily/${VIVALDI_BIN} \ + ${VIVALDI_HOME}/libwidevinecdm.so \ + || die + rmdir \ + etc/cron.daily/ \ + etc/ \ + || die + + local c d + for d in 16 22 24 32 48 64 128 256; do + mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die + cp \ + ${VIVALDI_HOME}/product_logo_${d}.png \ + usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die + done + + pushd "${VIVALDI_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + epatch "${FILESDIR}"/${PN}-1.13.1008.44_p1-libffmpeg.patch + + epatch_user +} + +src_install() { + mv * "${D}" || die + dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} + + fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +}