Revision

author: FabioLolix 2019-12-26 00:10:59 +0100
committer: FabioLolix 2019-12-26 00:10:59 +0100
commit: e3bc20de494ec6f72ce92c014bcfcbb3ef01536e (patch)
tree: 95fdfeed56c03af9153e768fd1bd162e399f7974
parent: f05770297e5c55d1e5f651c58e482e04a51eaceb (diff)
download: aur-e3bc20de494ec6f72ce92c014bcfcbb3ef01536e.tar.gz
2 files changed, 163 insertions, 130 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1f52827cc233..42a515613b93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,86 +1,107 @@
 pkgbase = handbrake-git
 	pkgdesc = Multiplatform, multithreaded DVD to MPEG-4/H264/Theora converter
-	pkgver = 1.2.0.r377.ga5590df40
-	pkgrel = 1
-	epoch = 1
+	pkgver = 1.3.0.r95.gc8e4c8c34
+	pkgrel = 3
 	url = http://handbrake.fr/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = cmake
 	makedepends = intltool
-	makedepends = python2
-	makedepends = gettext
-	makedepends = paxtest
-	makedepends = lame
-	makedepends = opus
-	makedepends = jansson
-	makedepends = libvorbis
-	makedepends = libx264
+	makedepends = python
+	makedepends = nasm
+	makedepends = wget
+	makedepends = cmake
+	makedepends = meson
+	makedepends = libxml2
 	makedepends = libass
-	makedepends = gtk3
-	makedepends = libnotify
-	makedepends = dbus-glib
-	makedepends = libsamplerate
+	makedepends = libvorbis
+	makedepends = opus
+	makedepends = speex
 	makedepends = libtheora
-	makedepends = nasm
+	makedepends = lame
+	makedepends = x264
+	makedepends = jansson
+	makedepends = libvpx
+	makedepends = libva
 	makedepends = numactl
-	noextract = fdk-aac-0.1.5.tar.gz
-	noextract = ffmpeg-4.0.tar.bz2
-	noextract = libdvdnav-5.0.3.tar.bz2
-	noextract = x265_2.8.tar.gz
-	noextract = libdvdread-5.0.3.tar.bz2
-	noextract = libvpx-1.6.1.tar.bz2
-	source = git+https://github.com/HandBrake/HandBrake.git
-	source = https://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.5.tar.gz
-	source = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.0.tar.bz2
-	source = https://download.handbrake.fr/handbrake/contrib/libbluray-1.0.1.tar.bz2
-	source = https://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.3.tar.bz2
-	source = https://download.handbrake.fr/handbrake/contrib/libvpx-1.6.1.tar.bz2
-	source = https://download.handbrake.fr/handbrake/contrib/x265_2.8.tar.gz
-	source = https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.3.tar.bz2
+	makedepends = gst-plugins-base
+	makedepends = gtk3
+	makedepends = librsvg
+	makedepends = libgudev
+	optdepends = intel-media-server-studio: for QSV
+	optdepends = nvidia-utils: for nvenc
+	noextract = AMF-1.4.9.tar.gz
+	noextract = dav1d-0.5.1.tar.bz2
+	noextract = fdk-aac-2.0.1.tar.gz
+	noextract = ffmpeg-4.2.1.tar.bz2
+	noextract = libbluray-1.1.2.tar.bz2
+	noextract = libdvdnav-6.0.1.tar.bz2
+	noextract = libdvdread-6.0.2.tar.bz2
+	noextract = libvpx-1.7.0.tar.gz
+	noextract = mfx_dispatch-c200d83.tar.gz
+	noextract = nv-codec-headers-9.0.18.1.tar.gz
+	noextract = x265_3.2.1.tar.gz
+	source = handbrake::git+https://github.com/HandBrake/HandBrake.git
+	source = https://download.handbrake.fr/handbrake/contrib/AMF-1.4.9.tar.gz
+	source = https://download.handbrake.fr/handbrake/contrib/dav1d-0.5.1.tar.bz2
+	source = https://download.handbrake.fr/handbrake/contrib/fdk-aac-2.0.1.tar.gz
+	source = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.2.1.tar.bz2
+	source = https://download.handbrake.fr/handbrake/contrib/libbluray-1.1.2.tar.bz2
+	source = https://download.handbrake.fr/handbrake/contrib/libdvdnav-6.0.1.tar.bz2
+	source = https://download.handbrake.fr/handbrake/contrib/libdvdread-6.0.2.tar.bz2
+	source = https://download.handbrake.fr/handbrake/contrib/libvpx-1.7.0.tar.gz
+	source = https://download.handbrake.fr/handbrake/contrib/mfx_dispatch-c200d83.tar.gz
+	source = https://download.handbrake.fr/handbrake/contrib/nv-codec-headers-9.0.18.1.tar.gz
+	source = https://download.handbrake.fr/handbrake/contrib/x265_3.2.1.tar.gz
 	sha256sums = SKIP
-	sha256sums = 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7
-	sha256sums = 318a39d906c9107d49766c63787798dd078d2a36e6670a9dfeda3c55be4573b8
-	sha256sums = 0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a
-	sha256sums = 5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d
-	sha256sums = 1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819
-	sha256sums = 6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863
-	sha256sums = 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b
+	sha256sums = d10f75612da5bcbc26325adecc5d398dcddf216c0dae3406d9a29b9d0b44b112
+	sha256sums = 0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9
+	sha256sums = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
+	sha256sums = 682a9fa3f6864d7f0dbf224f86b129e337bc60286e0d00dffcd710998d521624
+	sha256sums = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
+	sha256sums = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
+	sha256sums = f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0
+	sha256sums = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
+	sha256sums = ec1da009e7c77fcc3e45ff665b30c9390437cd920f2951ccabf3d79e8d5703a9
+	sha256sums = 6181a5dac66a6990aa3baf10a77ae677f372b9068be9ef73abfd37b73fb4c745
+	sha256sums = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
 
-pkgname = handbrake-gtk-git
-	pkgdesc = Multiplatform, multithreaded DVD to MPEG-4/H264/Theora converter (GUI version)
+pkgname = handbrake-git
+	pkgdesc = Multithreaded video transcoder
+	depends = libxml2
+	depends = libass
+	depends = libvorbis
 	depends = opus
-	depends = jansson
-	depends = libsamplerate
-	depends = libx264
+	depends = speex
 	depends = libtheora
 	depends = lame
-	depends = libass
-	depends = gtk3
+	depends = x264
+	depends = jansson
+	depends = libvpx
 	depends = libva
-	depends = speex
-	optdepends = gst-plugins-bad: For Preview Window
-	optdepends = gst-plugins-good: For Preview Window
-	optdepends = gst-plugins-ugly: For Preview Window
-	optdepends = gst-libav: For Preview Window
-	provides = handbrake-gtk
-	provides = handbrake
-	conflicts = handbrake-gtk
-	conflicts = handbrake
+	depends = numactl
+	depends = gst-plugins-base
+	depends = gtk3
+	depends = librsvg
+	depends = libgudev
+	optdepends = gst-plugins-good: for video previews
+	optdepends = gst-libav: for video previews
+	optdepends = libdvdcss: for decoding encrypted DVDs
 
 pkgname = handbrake-cli-git
-	pkgdesc = Multiplatform, multithreaded DVD to MPEG-4/H264/Theora converter (CLI version)
+	pkgdesc = Multithreaded video transcoder (CLI)
+	depends = libxml2
+	depends = libass
+	depends = libvorbis
 	depends = opus
-	depends = jansson
-	depends = libsamplerate
-	depends = libx264
+	depends = speex
 	depends = libtheora
 	depends = lame
-	depends = libass
+	depends = x264
+	depends = jansson
+	depends = libvpx
 	depends = libva
-	depends = speex
-	provides = handbrake-cli
-	conflicts = handbrake-cli
+	depends = numactl
+	optdepends = libdvdcss: for decoding encrypted DVDs
 
diff --git a/PKGBUILD b/PKGBUILD
index 09fcee13eb13..364682c9aa95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,72 @@
+# Maintainer: 
 # Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: jiribb <jiribb@gmail.com>
 # Contributor: David Spicer <azleifel at googlemail dot com>
 # Contributor: Andrew Brouwers
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgbase=handbrake-git
-pkgname=('handbrake-gtk-git' 'handbrake-cli-git')
-epoch=1
-pkgver=1.2.0.r377.ga5590df40
-pkgrel=1
+pkgname=(handbrake-git handbrake-cli-git)
+pkgver=1.3.0.r95.gc8e4c8c34
+pkgrel=3
 pkgdesc="Multiplatform, multithreaded DVD to MPEG-4/H264/Theora converter"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://handbrake.fr/"
-license=('GPL')
-source=("git+https://github.com/HandBrake/HandBrake.git"
-	'https://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.5.tar.gz'
-	'https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.0.tar.bz2'
-	'https://download.handbrake.fr/handbrake/contrib/libbluray-1.0.1.tar.bz2'
-	'https://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.3.tar.bz2'
-	'https://download.handbrake.fr/handbrake/contrib/libvpx-1.6.1.tar.bz2'
-	'https://download.handbrake.fr/handbrake/contrib/x265_2.8.tar.gz'
-	'https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.3.tar.bz2')
-makedepends=('git' 'cmake' 'intltool' 'python2' 'gettext' 'paxtest' 'lame' 'opus' 'jansson' 'libvorbis' 'libx264' 'libass' 'gtk3' 'libnotify' 'dbus-glib' 'libsamplerate' 'libtheora' 'nasm' 'numactl')
+license=(GPL)
+source=("${pkgname%-git}::git+https://github.com/HandBrake/HandBrake.git"
+        'https://download.handbrake.fr/handbrake/contrib/AMF-1.4.9.tar.gz'
+        'https://download.handbrake.fr/handbrake/contrib/dav1d-0.5.1.tar.bz2'
+        'https://download.handbrake.fr/handbrake/contrib/fdk-aac-2.0.1.tar.gz'
+        'https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.2.1.tar.bz2'
+    	'https://download.handbrake.fr/handbrake/contrib/libbluray-1.1.2.tar.bz2'
+	    'https://download.handbrake.fr/handbrake/contrib/libdvdnav-6.0.1.tar.bz2'
+	    'https://download.handbrake.fr/handbrake/contrib/libdvdread-6.0.2.tar.bz2'
+	    'https://download.handbrake.fr/handbrake/contrib/libvpx-1.7.0.tar.gz'
+	    'https://download.handbrake.fr/handbrake/contrib/mfx_dispatch-c200d83.tar.gz'
+	    'https://download.handbrake.fr/handbrake/contrib/nv-codec-headers-9.0.18.1.tar.gz'
+	    'https://download.handbrake.fr/handbrake/contrib/x265_3.2.1.tar.gz')
+_commondeps=(libxml2 libass libvorbis opus speex libtheora lame
+             x264 jansson libvpx libva numactl)
+_guideps=(gst-plugins-base gtk3 librsvg libgudev)
+makedepends=(git intltool python nasm wget cmake meson
+             "${_commondeps[@]}" "${_guideps[@]}")
+optdepends=('intel-media-server-studio: for QSV'
+            'nvidia-utils: for nvenc')
 sha256sums=('SKIP'
-            '2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7'
-            '318a39d906c9107d49766c63787798dd078d2a36e6670a9dfeda3c55be4573b8'
-            '0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a'
-            '5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d'
-            '1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819'
-            '6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863'
-            '321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b')
-noextract=('fdk-aac-0.1.5.tar.gz'
-	   'ffmpeg-4.0.tar.bz2'
-	   'libdvdnav-5.0.3.tar.bz2'
-	   'x265_2.8.tar.gz'
-	   'libdvdread-5.0.3.tar.bz2'
-	   'libvpx-1.6.1.tar.bz2')
-_gitname="HandBrake"
+            'd10f75612da5bcbc26325adecc5d398dcddf216c0dae3406d9a29b9d0b44b112'
+            '0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9'
+            'a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6'
+            '682a9fa3f6864d7f0dbf224f86b129e337bc60286e0d00dffcd710998d521624'
+            'a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42'
+            'e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733'
+            'f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0'
+            '1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238'
+            'ec1da009e7c77fcc3e45ff665b30c9390437cd920f2951ccabf3d79e8d5703a9'
+            '6181a5dac66a6990aa3baf10a77ae677f372b9068be9ef73abfd37b73fb4c745'
+            'fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc')
+
+noextract=(
+    'AMF-1.4.9.tar.gz'
+    'dav1d-0.5.1.tar.bz2'
+    'fdk-aac-2.0.1.tar.gz'
+    'ffmpeg-4.2.1.tar.bz2'
+    'libbluray-1.1.2.tar.bz2'
+    'libdvdnav-6.0.1.tar.bz2'
+    'libdvdread-6.0.2.tar.bz2'
+    'libvpx-1.7.0.tar.gz'
+    'mfx_dispatch-c200d83.tar.gz'
+    'nv-codec-headers-9.0.18.1.tar.gz'
+    'x265_3.2.1.tar.gz'
+    )
 
 pkgver() {
-  cd $_gitname
+  cd "${pkgname%-git}"
   git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd $_gitname
-
-  # python2 substitutions
-  sed -i -e '1c#! /usr/bin/python2' "gtk/src/makedeps.py"
-  sed -i -e '1c#! /usr/bin/python2' "make/configure.py"
+  cd "${pkgname%-git}"
   
   [ -d download ] || mkdir download
   for _tarball in ${noextract[@]}; do
@@ -57,45 +74,40 @@ prepare() {
   done
 }
 
-build() {
-  cd $_gitname
-
-  ./configure --launch --build="build" --prefix=/usr --enable-fdk \
-	      --disable-gtk-update-checks --launch-jobs=0 \
-	      --enable-x265 --force --enable-nvenc --enable-qsv
+ build() {
+  cd "${pkgname%-git}"
 
-  # Create build-specific temporary directory for ffmpeg
-  install -d -m755 "build/build_tmp"
+  ./configure \
+    --prefix=/usr \
+    --disable-gtk-update-checks \
+    --enable-x265 \
+    --enable-numa \
+    --enable-fdk-aac \
+    --enable-nvenc \
+    --enable-qsv \
+    --enable-vce
 
-  make -C "build" TMPDIR="$srcdir/$_gitname/build/build_tmp"
-  /usr/lib/paxtest/execstack -c "$srcdir/$_gitname/build/HandBrakeCLI"
-  /usr/lib/paxtest/execstack -c "$srcdir/$_gitname/build/gtk/src/ghb"
+  make -C build
 }
 
-package_handbrake-gtk-git() {
-  pkgdesc="Multiplatform, multithreaded DVD to MPEG-4/H264/Theora converter (GUI version)"
-  depends=('opus' 'jansson' 'libsamplerate' 'libx264' 'libtheora' 'lame' 'libass' 'gtk3'
-	   'libva' 'speex')
-  optdepends=('gst-plugins-bad: For Preview Window'
-              'gst-plugins-good: For Preview Window'
-              'gst-plugins-ugly: For Preview Window'
-              'gst-libav: For Preview Window')
-  provides=('handbrake-gtk' 'handbrake')
-  conflicts=('handbrake-gtk' 'handbrake')
+package_handbrake-git() {
+  pkgdesc="Multithreaded video transcoder"
+  depends=("${_commondeps[@]}" "${_guideps[@]}")
+  optdepends=('gst-plugins-good: for video previews'
+              'gst-libav: for video previews'
+              'libdvdcss: for decoding encrypted DVDs')
 
-  cd $_gitname
-  make -C "build" DESTDIR="$pkgdir/" install
+  cd "$srcdir/handbrake/build"
 
-  rm -f "$pkgdir/usr/bin/HandBrakeCLI"
-
-  # icon-theme.cache will be rebuilt on install
-  rm -f "$pkgdir/usr/share/icons/hicolor/icon-theme.cache"
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/bin/HandBrakeCLI"
 }
 
 package_handbrake-cli-git() {
-  pkgdesc="Multiplatform, multithreaded DVD to MPEG-4/H264/Theora converter (CLI version)"
-  depends=('opus' 'jansson' 'libsamplerate' 'libx264' 'libtheora' 'lame' 'libass' 'libva' 'speex')
-  provides=('handbrake-cli')
-  conflicts=('handbrake-cli')
-  install -D -m755 "$srcdir"/$_gitname/build/HandBrakeCLI "$pkgdir"/usr/bin/HandBrakeCLI
+  pkgdesc="Multithreaded video transcoder (CLI)"
+  depends=("${_commondeps[@]}")
+  optdepends=('libdvdcss: for decoding encrypted DVDs')
+
+  cd "$srcdir/handbrake/build"
+  install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
 }
author	FabioLolix	2019-12-26 00:10:59 +0100
committer	FabioLolix	2019-12-26 00:10:59 +0100
commit	e3bc20de494ec6f72ce92c014bcfcbb3ef01536e (patch)
tree	95fdfeed56c03af9153e768fd1bd162e399f7974
parent	f05770297e5c55d1e5f651c58e482e04a51eaceb (diff)
download	aur-e3bc20de494ec6f72ce92c014bcfcbb3ef01536e.tar.gz