Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/files/, www-client/vivaldi-snapshot/
Date: Wed, 25 Oct 2017 14:16:11
Message-Id: 1508940926.afe7d9e1071aefca8693cc5bd500f2c998623499.jer@gentoo
1 commit: afe7d9e1071aefca8693cc5bd500f2c998623499
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 25 14:15:26 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 25 14:15:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe7d9e1
7
8 www-client/vivaldi-snapshot: Version bump.
9
10 Package-Manager: Portage-2.3.12, Repoman-2.3.3
11
12 www-client/vivaldi-snapshot/Manifest | 2 +
13 .../vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch | 26 +++++
14 .../vivaldi-snapshot-1.13.997.3_p1.ebuild | 105 +++++++++++++++++++++
15 3 files changed, 133 insertions(+)
16
17 diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
18 index acba6c727f1..b3da3b7cf26 100644
19 --- a/www-client/vivaldi-snapshot/Manifest
20 +++ b/www-client/vivaldi-snapshot/Manifest
21 @@ -2,3 +2,5 @@ DIST vivaldi-snapshot-1.13.966.3_p1-amd64.deb 53410782 SHA256 a7a20c765d9a5ea223
22 DIST vivaldi-snapshot-1.13.966.3_p1-i386.deb 54706528 SHA256 3d132d1f2428ba816d2b93764205b2772f1fa84f2dac71cfbd60794121b1898b SHA512 373006f4b93e4f5bcd32bdd55ec97844a5eb1569a5177f541ffc572b4c7298e80e5479baf0ba5a5c2ed516beb27d68be5d092aab741e06e62b5e38b219f30d7b WHIRLPOOL c53f769b38448f5ecfce26167eaab82afdc73688e184f7dbd6f2c7b546e6f055946c5b54e21355e78fe536621898d40683f8e477b81877c1cc471763dbcf80f7
23 DIST vivaldi-snapshot-1.13.971.8_p1-amd64.deb 53403290 SHA256 1ee7306a6f6c02e1b66a4d36671bbfaf63a4119980e988a8ec67b54963d83e32 SHA512 884548741be907c6c3eaaabccb2d87440cbc07da886e0fdd7197fcd8e17ef7e59a977a6ead35ce5ffa1743bb038ea48a54af727d7cdf1b6ccf1974a2094e87ff WHIRLPOOL c4cfbd05a5123b402855a89d3e1016fc5d2f5abf91e3fe20e68e7b8d306d59e80c0e3c4ad1aa639b113bfe37d165f81eb56bce9241fe7e6e27c6de139e615e0e
24 DIST vivaldi-snapshot-1.13.971.8_p1-i386.deb 54726014 SHA256 a6e5a8274881a4f53f5e528bc0d832566611eca15f2fba0d10f3307c905e5629 SHA512 a6d4f14c34e2ebfda6db6c47d8db76acf64a7a7f21da95debe4aff01eeeef856a3c353f4c9a4f4658d5a39ffe64f715ab3eace9b614f8fa13a33ff04b7886305 WHIRLPOOL b7c2b769a98b7c4eb42db61f571b3224731d5720ecbfeea666d86b2c6ee3c28f84d96cf9512412ce82497ed95e8f68b094ba729aecb4524fd1a83a82929ce48d
25 +DIST vivaldi-snapshot-1.13.997.3_p1-amd64.deb 50485472 SHA256 81b132dfda7f82374a631cf81ec63a8f8c5f5b59c1af871d02ecff25c805ea89 SHA512 d88cac768f34788b8c3b6550bfe03ad64557e731af57b85a144f6c4622d256749f0498dac2d73c689890c8d5fe76c66efe0963813481d2a593b9ffcbfea7a966 WHIRLPOOL a9fa9cc3690f0943b42030f95f7cd3ddf1682aa9ea3160bef967619d30f2475e6b0ea48ff397a622d29f2a6bc04baf0357089a51212952342481be8503a98272
26 +DIST vivaldi-snapshot-1.13.997.3_p1-i386.deb 50953694 SHA256 d1f3a38651cef629c6aa77fc8d401593ed4915b6fd68a6177f25ff8a8fd8db45 SHA512 016fbe2bbf007a12417a14200c7136f0fbf887a74d76b2c6e34603da44f42bbc84a9a981cb8652e5c2c504080e0e4330fdf8a8a8886ef93a1ecdb73bc48ebb79 WHIRLPOOL 5c4212551fe57fa118fd7814cd3ecedcd685846d891860279c8fb8bcbad1d40604b37e26bbf56c118fffbbc3304749003aa48f04199125d200c5b61dac35a075
27
28 diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
29 new file mode 100644
30 index 00000000000..729d76f9af6
31 --- /dev/null
32 +++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
33 @@ -0,0 +1,26 @@
34 +--- a/opt/vivaldi-snapshot/vivaldi-snapshot
35 ++++ b/opt/vivaldi-snapshot/vivaldi-snapshot
36 +@@ -32,14 +32,14 @@
37 + # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
38 + # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
39 + if [ -r "$1" ]; then
40 +- if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
41 ++# if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
42 + if [[ -n "$LD_PRELOAD" ]]; then
43 + export LD_PRELOAD="$LD_PRELOAD:$1"
44 + else
45 + export LD_PRELOAD="$1"
46 + fi
47 + export VIVALDI_FFMPEG_FOUND=YES
48 +- fi
49 ++# fi
50 + fi
51 + fi
52 + fi
53 + # Check for libs in preferred order.
54 + # Where possible, use other files/directories to confirm it's the correct variant.
55 + VIVALDI_FFMPEG_FOUND=NO
56 ++checkffmpeg "/usr/lib64/chromium/libffmpeg.so"
57 + checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
58 + checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
59 +
60
61 diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1.ebuild
62 new file mode 100644
63 index 00000000000..53dd25845f8
64 --- /dev/null
65 +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1.ebuild
66 @@ -0,0 +1,105 @@
67 +# Copyright 1999-2017 Gentoo Foundation
68 +# Distributed under the terms of the GNU General Public License v2
69 +
70 +EAPI=5
71 +CHROMIUM_LANGS="
72 + am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
73 + 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
74 + sw ta te th tr uk vi zh-CN zh-TW
75 +"
76 +inherit chromium-2 eutils multilib unpacker toolchain-funcs
77 +
78 +VIVALDI_HOME="opt/${PN}"
79 +DESCRIPTION="A new browser for our friends"
80 +HOMEPAGE="http://vivaldi.com/"
81 +VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
82 +SRC_URI="
83 + amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
84 + x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
85 +"
86 +
87 +LICENSE="Vivaldi"
88 +SLOT="0"
89 +KEYWORDS="-* ~amd64 ~x86"
90 +RESTRICT="bindist mirror"
91 +
92 +DEPEND="
93 + virtual/libiconv
94 +"
95 +RDEPEND="
96 + dev-libs/expat
97 + dev-libs/glib:2
98 + dev-libs/nspr
99 + dev-libs/nss
100 + >=dev-libs/openssl-1.0.1:0
101 + gnome-base/gconf:2
102 + media-libs/alsa-lib
103 + media-libs/fontconfig
104 + media-libs/freetype
105 + net-misc/curl
106 + net-print/cups
107 + sys-apps/dbus
108 + sys-libs/libcap
109 + x11-libs/cairo
110 + x11-libs/gdk-pixbuf
111 + x11-libs/gtk+:2
112 + x11-libs/libX11
113 + x11-libs/libXScrnSaver
114 + x11-libs/libXcomposite
115 + x11-libs/libXcursor
116 + x11-libs/libXdamage
117 + x11-libs/libXext
118 + x11-libs/libXfixes
119 + x11-libs/libXi
120 + x11-libs/libXrandr
121 + x11-libs/libXrender
122 + x11-libs/libXtst
123 + x11-libs/pango[X]
124 +"
125 +QA_PREBUILT="*"
126 +S=${WORKDIR}
127 +
128 +src_unpack() {
129 + unpack_deb ${A}
130 +}
131 +
132 +src_prepare() {
133 + iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
134 + mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
135 +
136 + mv usr/share/doc/${PN} usr/share/doc/${PF} || die
137 + chmod 0755 usr/share/doc/${PF} || die
138 +
139 + rm \
140 + _gpgbuilder \
141 + etc/cron.daily/${PN} \
142 + ${VIVALDI_HOME}/libwidevinecdm.so \
143 + || die
144 + rmdir \
145 + etc/cron.daily/ \
146 + etc/ \
147 + || die
148 +
149 + local c d
150 + for d in 16 22 24 32 48 64 128 256; do
151 + mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
152 + cp \
153 + ${VIVALDI_HOME}/product_logo_${d}.png \
154 + usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
155 + done
156 +
157 + pushd "${VIVALDI_HOME}/locales" > /dev/null || die
158 + chromium_remove_language_paks
159 + popd > /dev/null || die
160 +
161 + epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
162 +
163 + epatch_user
164 +}
165 +
166 +src_install() {
167 + mv * "${D}" || die
168 + dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
169 +
170 + fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
171 +}