diff options
| -rw-r--r-- | .INSTALL | 39 | ||||
| -rw-r--r-- | .MTREE | bin | 0 -> 33438 bytes | |||
| -rw-r--r-- | .PKGINFO | 33 | ||||
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | AUR | 1 | ||||
| -rw-r--r-- | PKGBUILD | 46 | ||||
| -rw-r--r-- | vivaldi-ffmpeg-codecs.patch | 19 |
7 files changed, 139 insertions, 18 deletions
diff --git a/.INSTALL b/.INSTALL new file mode 100644 index 000000000000..f60628dabc75 --- /dev/null +++ b/.INSTALL @@ -0,0 +1,39 @@ +available() +{ + command -v $1 >/dev/null 2>&1 +} + +integration() { + + # Setup Menus + if available update-desktop-database + then + update-desktop-database -q /usr/share/applications + fi + + # Setup MIME types + if available update-mime-database + then + update-mime-database /usr/share/mime >/dev/null + fi + + # Setup Icons + touch -c /usr/share/icons/hicolor + if available gtk-update-icon-cache + then + gtk-update-icon-cache -tq /usr/share/icons/hicolor + fi + +} + +post_install() { + integration +} + +post_upgrade() { + integration +} + +post_remove() { + integration +} diff --git a/.MTREE b/.MTREE Binary files differnew file mode 100644 index 000000000000..eb183db25bce --- /dev/null +++ b/.MTREE diff --git a/.PKGINFO b/.PKGINFO new file mode 100644 index 000000000000..6a07119466d3 --- /dev/null +++ b/.PKGINFO @@ -0,0 +1,33 @@ +# Generated by makepkg 4.2.1 +# using fakeroot version 1.20.2 +# Wed Nov 4 11:15:58 UTC 2015 +pkgname = vivaldi +pkgver = 1.0.303.52-1 +pkgdesc = An advanced browser made with the power user in mind. +url = https://vivaldi.com +builddate = 1446635758 +packager = BlackEagle <ike DOT devolder AT gmail DOT com> +size = 169818112 +arch = i686 +license = custom +depend = gtk2 +depend = nss +depend = libxtst +depend = gconf +depend = libxss +depend = freetype2 +depend = ttf-font +depend = desktop-file-utils +depend = shared-mime-info +depend = alsa-lib +optdepend = vivaldi-ffmpeg-codecs: playback of proprietary video/audio +optdepend = google-chrome: Widevine DRM Plugin +makepkgopt = !strip +makepkgopt = docs +makepkgopt = !libtool +makepkgopt = !staticlibs +makepkgopt = emptydirs +makepkgopt = !zipman +makepkgopt = purge +makepkgopt = !upx +makepkgopt = !debug @@ -1,11 +1,11 @@ pkgbase = vivaldi pkgdesc = An advanced browser made with the power user in mind. - pkgver = 1.0.219.50 - pkgrel = 2 + pkgver = 1.0.303.52 + pkgrel = 1 url = https://vivaldi.com install = vivaldi.install - arch = x86_64 arch = i686 + arch = x86_64 license = custom depends = gtk2 depends = nss @@ -17,13 +17,16 @@ pkgbase = vivaldi depends = desktop-file-utils depends = shared-mime-info depends = alsa-lib - optdepends = ffmpeg: playback of proprietary formats + optdepends = vivaldi-ffmpeg-codecs: playback of proprietary video/audio + optdepends = google-chrome: Widevine DRM Plugin options = !strip options = !zipman - source_x86_64 = https://vivaldi.com/download/vivaldi_TP4.1.0.219.50-1.x86_64.rpm - sha256sums_x86_64 = 65349f39479690806df09b5dfb7deda3bba084ac4c8758825e2a264f13a9004b - source_i686 = https://vivaldi.com/download/vivaldi_TP4.1.0.219.50-1.i386.rpm - sha256sums_i686 = a2a6614b160c7bd6178273b61e64c6116f581e30c587088207694ddb8daa8209 + source = vivaldi-ffmpeg-codecs.patch + sha256sums = 8e24a7074d9c8719040f6731ab91ab888a410d98bd41486aca96b35f79eeef6b + source_i686 = https://vivaldi.com/download/vivaldi-beta-1.0.303.52-2.i386.rpm + sha256sums_i686 = 3910a588bb3e1b6ad4cf9e5b6ab48e8b496b9b45cc7b212b5bceb5d43507c527 + source_x86_64 = https://vivaldi.com/download/vivaldi-beta-1.0.303.52-2.x86_64.rpm + sha256sums_x86_64 = 75a91e2b228a516507af61d35dbfceb282f9d97614e0c402ebca75cf5ecfd81d pkgname = vivaldi diff --git a/AUR b/AUR deleted file mode 100644 index e181da019bbd..000000000000 --- a/AUR +++ /dev/null @@ -1 +0,0 @@ -x11 @@ -2,31 +2,59 @@ # Contributor: TZ86 pkgname=vivaldi -pkgver=1.0.219.50 -pkgrel=2 +pkgver=1.0.303.52 +pkgrel=1 pkgdesc='An advanced browser made with the power user in mind.' url="https://vivaldi.com" install=${pkgname}.install options=(!strip !zipman) license=('custom') -arch=('x86_64' 'i686') +arch=('i686' 'x86_64') depends=('gtk2' 'nss' 'libxtst' 'gconf' 'libxss' 'freetype2' 'ttf-font' 'desktop-file-utils' 'shared-mime-info' 'alsa-lib') -optdepends=('ffmpeg: playback of proprietary formats') -source_i686=("https://vivaldi.com/download/vivaldi_TP4.${pkgver}-1.i386.rpm") -source_x86_64=("https://vivaldi.com/download/vivaldi_TP4.${pkgver}-1.x86_64.rpm") -sha256sums_x86_64=('65349f39479690806df09b5dfb7deda3bba084ac4c8758825e2a264f13a9004b') -sha256sums_i686=('a2a6614b160c7bd6178273b61e64c6116f581e30c587088207694ddb8daa8209') +optdepends=( + 'vivaldi-ffmpeg-codecs: playback of proprietary video/audio' + 'google-chrome: Widevine DRM Plugin' +) +source=('vivaldi-ffmpeg-codecs.patch') +source_i686=("https://vivaldi.com/download/vivaldi-beta-${pkgver}-2.i386.rpm") +source_x86_64=("https://vivaldi.com/download/vivaldi-beta-${pkgver}-2.x86_64.rpm") +sha256sums=('8e24a7074d9c8719040f6731ab91ab888a410d98bd41486aca96b35f79eeef6b') +sha256sums_i686=('3910a588bb3e1b6ad4cf9e5b6ab48e8b496b9b45cc7b212b5bceb5d43507c527') +sha256sums_x86_64=('75a91e2b228a516507af61d35dbfceb282f9d97614e0c402ebca75cf5ecfd81d') package() { - cp -a {opt,usr} "$pkgdir" + cp -a opt "$pkgdir" + install -dm755 "$pkgdir/usr/bin/" + + # cheat to have the vivaldi path + mv "$pkgdir/opt/vivaldi-beta" "$pkgdir/opt/vivaldi" # suid sanbox chmod 4755 "$pkgdir/opt/vivaldi/vivaldi-sandbox" + # link to vivaldi from /usr/bin + ln -sf "/opt/vivaldi/vivaldi" "$pkgdir/usr/bin/vivaldi" + + # fix internal vivaldi link + ( + cd "$pkgdir/opt/vivaldi" + rm vivaldi + ln -s vivaldi-beta vivaldi + ) + # install icons for res in 16 22 24 32 48 64 128 256; do install -Dm644 "$pkgdir/opt/vivaldi/product_logo_${res}.png" \ "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/vivaldi.png" done + + # install desktop file + install -Dm644 usr/share/applications/vivaldi-beta.desktop \ + "$pkgdir/usr/share/applications/vivaldi.desktop" + sed -e "s/-beta//g" -i "$pkgdir/usr/share/applications/vivaldi.desktop" + + # allow playback of proprietary video/audio when alternative ffmpeg.so is installed + cd "$pkgdir/opt/vivaldi" + patch -p1 -i "$srcdir/vivaldi-ffmpeg-codecs.patch" } diff --git a/vivaldi-ffmpeg-codecs.patch b/vivaldi-ffmpeg-codecs.patch new file mode 100644 index 000000000000..82accd1c6aae --- /dev/null +++ b/vivaldi-ffmpeg-codecs.patch @@ -0,0 +1,19 @@ +--- a/vivaldi-beta 2015-10-09 14:26:29.000000000 +0200 ++++ b/vivaldi-beta 2015-10-14 22:57:07.503932016 +0200 +@@ -45,13 +45,9 @@ + fi + + # Find libffmpeg.so with additional codecs. +-CHR_CODECS_CH="/usr/share/doc/chromium-codecs-ffmpeg-extra/changelog.Debian.gz" +-if [ -r $CHR_CODECS_CH ]; then +- CHR_CODECS_VER=$(gzip -cd $CHR_CODECS_CH | +- sed -n '1s/chromium-browser (\(\([0-9]\+\.\)\{3\}\).*/\1/p') +- if [ "$CHR_CODECS_VER" = "45.0.2454." ]; then +- FFMPEG_LD_LIBRARY_PATH=":/usr/lib/chromium-browser/libs" +- fi ++VIV_CODECS_SO="/usr/lib/vivaldi-ffmpeg-codecs/libffmpeg.so" ++if [ -r "$VIV_CODECS_SO" ]; then ++ FFMPEG_LD_LIBRARY_PATH=":/usr/lib/vivaldi-ffmpeg-codecs" + fi + # Set LD_LIBRARY_PATH to prefer our libs, excluding $HERE/lib/libffmpeg.so if + # an alternative ffmpeg was found. |