Merge branch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre

4 files changed, 16 insertions, 13 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 3626a8623..770e5a224 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111778 2014-05-24 09:48:31Z jelle $
+# $Id: PKGBUILD 112255 2014-05-30 17:49:50Z jelle $
 # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.38.0
+pkgver=1.39.0
 pkgrel=1
 pkgdesc="Ebook management application, without nonfree libunrar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -32,11 +32,11 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}
         'desktop_integration.patch'
         'calibre-mount-helper'
         'libre.patch')
-mkmd5sums=('c8f5e077c10bc3975a384fee291dbc8b')
-md5sums=('62bce33edc0803eb8c125665aa982a7c'
+mkmd5sums=('38aa711c11586eb365bc5ff522cf9b58')
+md5sums=('fad9ab43170f284dcb159413093de2e4'
          'ece36dfd737fa4a346f0a0e59395e949'
          '675cd87d41342119827ef706055491e7'
-         '64b6798f526165146084e447cc3d9e1a')
+         '073a36adbb3628d21c2dff8b41e84abe')
 
 mksource(){
   cd "${srcdir}/${_pkgname}"
diff --git a/libre/calibre-libre/libre.patch b/libre/calibre-libre/libre.patch
index cff783d15..e2101d8a2 100644
--- a/libre/calibre-libre/libre.patch
+++ b/libre/calibre-libre/libre.patch
@@ -521,10 +521,10 @@ index fd9a36d..130d08d 100644
      test_icu()
      test_woff()
      test_qt()
-diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
+diff --git a/translations/calibre/main.pot b/translations/calibre/main.pot
 index 1775b71..65cf8c4 100644
---- a/src/calibre/translations/calibre.pot
-+++ b/src/calibre/translations/calibre.pot
+--- a/translations/calibre/main.pot
++++ b/translations/calibre/main.pot
 @@ -3870,7 +3870,7 @@ msgid "Set book ID"
  msgstr ""
  
diff --git a/libre/handbrake-svn/PKGBUILD b/libre/handbrake-svn/PKGBUILD
index 19803de3c..41d5895b6 100644
--- a/libre/handbrake-svn/PKGBUILD
+++ b/libre/handbrake-svn/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('handbrake-svn' 'handbrake-cli-svn')
 _pkgver=0.9.9.1
-pkgver=6103
+pkgver=6207
 url="http://handbrake.fr/"
 license=('GPL')
 
@@ -56,7 +56,9 @@ _contrib_ign+=('x265') # FEATURE.x265
 _contrib_sys+=('lame') # always
 # Using system ffmpeg will break PGS subtitle processing
 # https://forum.handbrake.fr/viewtopic.php?f=13&t=27581
-_contrib_mod+=('ffmpeg:libav-v10_beta1.tar.bz2') # always
+_contrib_mod+=('ffmpeg:libav-v10.1.tar.bz2') # always
+# XXX: I can't get it to set LDFLAGS right to use system libvpx
+_contrib_mod+=('libvpx:libvpx-v1.3.0.tar.bz2') # always
 _contrib_sys+=('libdvdread') # always
 # XXX: I don't even know, but system libdvdnav doesn't work
 _contrib_mod+=('libdvdnav:libdvdnav-a5c1325.tar.bz2') # always
@@ -73,11 +75,12 @@ for _f in "${_contrib_mod[@]#*:}"; do
   source+=("http://download.handbrake.fr/handbrake/contrib/${_f}")
   noextract+=("${_f}")
 done; unset _f
-sha256sums=('59aac48702c8b55d78e8cba3f94b4cc42f8077bce6d775d1560891628ed532a1'
+sha256sums=('2e9cda0bbfc47252c2ebe70b4faa1b34bc8193077f8c32163c9ed702ac6f99ec'
             'f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc'
             '5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f'
             '7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97'
-            '41e7b81c4bf49acf4f5e74a61ffe2a593d22df5326997aa4fb253b5de1410773'
+            'bc3807426d4e73fe8c245730b0df4ba95766cf7e17e47c738ee302f73d066ac9'
+            'd3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9'
             'd190ce2ca4d1d9878145acd9c1b8ac76636c3b6d12066e8cc87ee674f943fb2a')
 
 mksource=("HandBrake-svn${pkgver}::svn://svn.handbrake.fr/HandBrake/trunk")
diff --git a/libre/openshadinglanguage/PKGBUILD b/libre/openshadinglanguage/PKGBUILD
index 1ba120173..2ef3fa52b 100644
--- a/libre/openshadinglanguage/PKGBUILD
+++ b/libre/openshadinglanguage/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=openshadinglanguage
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced shading language for production GI renderers (built for the blender-libre package)"
 arch=(
   mips64el