Date: Thursday, March 2, 2017 @ 23:22:42
Author: foutrelis
Revision: 214592
upgpkg: handbrake 1.0.3-1
Stop unbundling libraries upstream wants to use its own copy of. This
mainly created subtle issues with ffmpeg due to upstream using libav
and us forcing it to use ffmpeg (FS#52948).
Modified:
handbrake/trunk/PKGBUILD
Deleted:
handbrake/trunk/handbrake-fix-missing-x265-link-flag.patch
--------------------------------------------+
PKGBUILD | 50 ++++++++-------------------
handbrake-fix-missing-x265-link-flag.patch | 13 -------
2 files changed, 16 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-03-02 22:57:51 UTC (rev 214591)
+++ PKGBUILD 2017-03-02 23:22:42 UTC (rev 214592)
@@ -4,52 +4,34 @@
# Contributor: Sebastien Piccand <sebcactus gmail com>
pkgname=('handbrake' 'handbrake-cli')
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
arch=('i686' 'x86_64')
url="https://handbrake.fr/";
license=('GPL')
-makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
- 'gst-plugins-base' 'gtk3' 'dbus-glib' 'fribidi' 'libass' 'lame'
- 'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'cmake'
- 'libtheora' 'libsamplerate' 'ffmpeg' 'x264' 'libx264' 'x265'
- 'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev')
-source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
- handbrake-fix-missing-x265-link-flag.patch)
-sha256sums=('18e4563cc150309df03f7e73462b823ba2eca61644a7a536c9930611f3f9aa1e'
- '05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4')
+makedepends=('intltool' 'python2' 'yasm' 'wget' 'cmake' 'bzip2' 'gcc-libs'
+ 'zlib' 'libnotify' 'gst-plugins-base' 'gtk3' 'dbus-glib' 'libass'
+ 'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora' 'libsamplerate'
+ 'x264' 'libx264' 'jansson' 'librsvg' 'libgudev')
+source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2)
+sha256sums=('591fb489edd6146136f0a92f895c2098365f612ad308d5ff9dc83223ad73ed27')
-prepare() {
- cd "$srcdir/HandBrake-$pkgver"
-
- # https://bugs.gentoo.org/show_bug.cgi?id=552792
- patch -Np1 -i ../handbrake-fix-missing-x265-link-flag.patch
-
- # Use more system libs
- # Bundled libbluray is kept because it is patched locally
- for _lib in ffmpeg x265 libvpx libdvdnav libdvdread; do
- sed -i "/MODULES += contrib\/$_lib/d" make/include/main.defs
- done
-}
-
build() {
cd "$srcdir/HandBrake-$pkgver"
- ./configure \
- --prefix=/usr \
- --disable-gtk-update-checks
+ ./configure --prefix=/usr
make -C build
}
package_handbrake() {
pkgdesc="Multithreaded video transcoder"
- depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib'
- 'fribidi' 'libass' 'lame' 'gtk3' 'fontconfig' 'freetype2' 'libxml2'
- 'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'ffmpeg' 'libx264'
- 'x265' 'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev'
+ depends=('bzip2' 'gcc-libs' 'zlib' 'gst-plugins-base' 'libnotify' 'dbus-glib'
+ 'gtk3' 'libass' 'lame' 'libxml2' 'opus' 'libvorbis' 'libtheora'
+ 'libsamplerate' 'libx264' 'jansson' 'librsvg' 'libgudev'
'desktop-file-utils' 'hicolor-icon-theme')
optdepends=('gst-plugins-good: for video previews'
- 'gst-libav: for video previews')
+ 'gst-libav: for video previews'
+ 'libdvdcss: for decoding encrypted DVDs')
cd "$srcdir/HandBrake-$pkgver/build"
@@ -59,9 +41,9 @@
package_handbrake-cli() {
pkgdesc="Multithreaded video transcoder (CLI)"
- depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'lame' 'libxml2'
- 'libtheora' 'libsamplerate' 'ffmpeg' 'libx264' 'x265' 'libvpx'
- 'libdvdnav' 'jansson')
+ depends=('bzip2' 'gcc-libs' 'zlib' 'libass' 'lame' 'libxml2' 'opus'
+ 'libvorbis' 'libtheora' 'libsamplerate' 'libx264' 'jansson')
+ optdepends=('libdvdcss: for decoding encrypted DVDs')
cd "$srcdir/HandBrake-$pkgver/build"
install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
Deleted: handbrake-fix-missing-x265-link-flag.patch
===================================================================
--- handbrake-fix-missing-x265-link-flag.patch 2017-03-02 22:57:51 UTC (rev
214591)
+++ handbrake-fix-missing-x265-link-flag.patch 2017-03-02 23:22:42 UTC (rev
214592)
@@ -1,13 +0,0 @@
-Written by: Peter Foley <[email protected]>
-Gentoo Bug: #552792
-
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -25,6 +25,7 @@
-
- ifeq (1,$(FEATURE.x265))
- TEST.GCC.D += USE_X265
-+ TEST.GCC.l += x265
- endif
-
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
