new option: nvdec

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 926775cabd8e..7cd0c0d92f68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = handbrake-git
 	pkgdesc = Multithreaded video transcoder. Enabled: x265, nvenc, fdk-aac, qsv, vce, numa, hardened. Last stable branch
-	pkgver = 1.6.0.r10.g788aa707c
+	pkgver = 1.6.1.r48.g15dd97b9d
 	pkgrel = 1
 	url = https://handbrake.fr/
 	arch = i686
@@ -13,6 +13,8 @@ pkgbase = handbrake-git
 	makedepends = wget
 	makedepends = cmake
 	makedepends = meson
+	makedepends = llvm
+	makedepends = clang
 	makedepends = x264
 	makedepends = libxml2
 	makedepends = libass
@@ -21,6 +23,7 @@ pkgbase = handbrake-git
 	makedepends = speex
 	makedepends = libtheora
 	makedepends = lame
+	makedepends = libjpeg-turbo
 	makedepends = libx264.so
 	makedepends = jansson
 	makedepends = libvpx
@@ -28,11 +31,11 @@ pkgbase = handbrake-git
 	makedepends = numactl
 	makedepends = gst-plugins-base
 	makedepends = gtk3
-	makedepends = librsvg
 	makedepends = libgudev
 	optdepends = libdvdcss: for decoding encrypted DVDs
 	optdepends = intel-media-sdk: for enabling Intel QSV
-	optdepends = nvidia-utils: for enabling Nvidia nvenc
+	optdepends = nvidia-utils: for Nvidia users, enable Nvidia nvenc
+	optdepends = cuda: for Nvidia users, enable Nvidia nvdec
 	noextract = AMF-1.4.24.tar.gz
 	noextract = dav1d-1.0.0.tar.bz2
 	noextract = fdk-aac-2.0.2.tar.gz
@@ -88,6 +91,7 @@ pkgname = handbrake-git
 	depends = speex
 	depends = libtheora
 	depends = lame
+	depends = libjpeg-turbo
 	depends = libx264.so
 	depends = jansson
 	depends = libvpx
@@ -95,11 +99,11 @@ pkgname = handbrake-git
 	depends = numactl
 	depends = gst-plugins-base
 	depends = gtk3
-	depends = librsvg
 	depends = libgudev
 	optdepends = libdvdcss: for decoding encrypted DVDs
 	optdepends = intel-media-sdk: for enabling Intel QSV
-	optdepends = nvidia-utils: for enabling Nvidia nvenc
+	optdepends = nvidia-utils: for Nvidia users, enable Nvidia nvenc
+	optdepends = cuda: for Nvidia users, enable Nvidia nvdec
 	optdepends = gst-plugins-good: for video previews
 	optdepends = gst-libav: for video previews
 	provides = handbrake
@@ -114,6 +118,7 @@ pkgname = handbrake-cli-git
 	depends = speex
 	depends = libtheora
 	depends = lame
+	depends = libjpeg-turbo
 	depends = libx264.so
 	depends = jansson
 	depends = libvpx
diff --git a/PKGBUILD b/PKGBUILD
index 8f56e804b1aa..e50c0cab4b36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=handbrake-git
 pkgname=(handbrake-git handbrake-cli-git)
-pkgver=1.6.0.r10.g788aa707c
+pkgver=1.6.1.r48.g15dd97b9d
 pkgrel=1
 pkgdesc="Multithreaded video transcoder. Enabled: x265, nvenc, fdk-aac, qsv, vce, numa, hardened. Last stable branch"
 arch=(i686 x86_64)
@@ -30,15 +30,16 @@ source=("${pkgname%-git}::git+https://github.com/HandBrake/HandBrake.git#branch=
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/SVT-AV1-v1.4.1.tar.gz'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20221130-12747.tar.gz'
         'https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.4.tar.gz')
-_commondeps=(libxml2 libass libvorbis opus speex libtheora lame
+_commondeps=(libxml2 libass libvorbis opus speex libtheora lame libjpeg-turbo
              libx264.so jansson libvpx libva numactl)
-_guideps=(gst-plugins-base gtk3 librsvg libgudev)
-makedepends=(git intltool python nasm wget cmake meson
+_guideps=(gst-plugins-base gtk3 libgudev)
+makedepends=(git intltool python nasm wget cmake meson llvm clang
              x264
              "${_commondeps[@]}" "${_guideps[@]}")
 optdepends=('libdvdcss: for decoding encrypted DVDs'
             'intel-media-sdk: for enabling Intel QSV'
-            'nvidia-utils: for enabling Nvidia nvenc')
+            'nvidia-utils: for Nvidia users, enable Nvidia nvenc'
+            'cuda: for Nvidia users, enable Nvidia nvdec')
 sha256sums=('SKIP'
             '07d325da97a5a3cb58d83c54b2ce1148dc84dc9bb3971b0c30ff4cc16e159194'
             '4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f'
@@ -79,7 +80,7 @@ pkgver() {
 
 prepare() {
   cd "${pkgname%-git}"
-  
+
   [ -d download ] || mkdir download
   for _tarball in ${noextract[@]}; do
     cp ../${_tarball} download/
@@ -96,6 +97,7 @@ prepare() {
     --enable-x265 \
     --enable-numa \
     --enable-fdk-aac \
+    --enable-nvdec \
     --enable-nvenc \
     --enable-qsv \
     --enable-vce
@@ -107,7 +109,7 @@ package_handbrake-git() {
   pkgdesc="Multithreaded video transcoder"
   depends=("${_commondeps[@]}" "${_guideps[@]}")
   optdepends+=('gst-plugins-good: for video previews'
-              'gst-libav: for video previews')
+               'gst-libav: for video previews')
   provides=(handbrake)
   conflicts=(handbrake)