summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-04-22 23:34:24 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-04-22 23:34:24 -0300
commit28dc8d322e636f0c582f680e6df69ae5d08e5851 (patch)
tree47ce5e0c9855ff0120378140c8a928547b4e31e2
parent57f89ff5812e10e60a8ddf03bb33185862b02ace (diff)
icedove-1:31.6.0.deb1-2{,.nonprism1}: rebuild against libvpx 1.4.0
-rw-r--r--libre/icedove/PKGBUILD13
-rw-r--r--nonprism/icedove/PKGBUILD13
2 files changed, 22 insertions, 4 deletions
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 3ef3bb3e3..0f2f95f04 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -11,12 +11,12 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
pkgname=${_debname}
epoch=1
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
url="http://packages.debian.org/sid/${pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx=1.4.0' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird' "${pkgname}-libre")
@@ -102,6 +102,15 @@ prepare() {
# Add symlinks to use jquery files built for us
ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
+
+ # Fixing for libvpx >= 1.4.0
+ sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|;
+ s|PLANE_U|VPX_PLANE_U|;
+ s|PLANE_V|VPX_PLANE_V|;
+ s|PLANE_Y|VPX_PLANE_Y|;
+ s|VPX_VPX_PLANE_|VPX_PLANE_|;
+ ' mozilla/content/media/encoder/VP8TrackEncoder.cpp \
+ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
}
build() {
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 5d074331e..3ef75b2fa 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -11,12 +11,12 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
pkgname=${_debname}
epoch=1
pkgver=${_debver}.${_debrel}
-pkgrel=1.nonprism1
+pkgrel=2.nonprism1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
url="http://packages.debian.org/sid/${pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx=1.4.0' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui')
optdepends=('libcanberra: for sound support')
replaces=('thunderbird' "${pkgname}-libre" "${pkgname}-libre-nonprism")
@@ -118,6 +118,15 @@ prepare() {
# Add symlinks to use jquery files built for us
ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
+
+ # Fixing for libvpx >= 1.4.0
+ sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|;
+ s|PLANE_U|VPX_PLANE_U|;
+ s|PLANE_V|VPX_PLANE_V|;
+ s|PLANE_Y|VPX_PLANE_Y|;
+ s|VPX_VPX_PLANE_|VPX_PLANE_|;
+ ' mozilla/content/media/encoder/VP8TrackEncoder.cpp \
+ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
}
build() {