4.8.0.29

3 files changed, 25 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aeb65341cde1..5fede4b2d25a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,11 @@
 pkgbase = emby-server-beta
 	pkgdesc = Bring together your videos, music, photos, and live television
 	pkgver = 4.8.0.29
-	pkgrel = 1
+	pkgrel = 2
 	url = https://emby.media
 	install = emby-server.install
 	arch = x86_64
 	license = custom
-	makedepends = ffnvcodec-headers
-	makedepends = nasm
-	makedepends = zstd
 	depends = alsa-lib
 	depends = aom
 	depends = aspnet-runtime-6.0
@@ -40,28 +37,26 @@ pkgbase = emby-server-beta
 	depends = libx265.so
 	depends = ocl-icd
 	depends = opus
+	depends = skia-sharp
 	depends = sqlite
-	depends = zlib
 	depends = zvbi
+	depends = zlib
 	optdepends = intel-media-sdk: Intel QuickSync support (requires Emby Premiere)
 	optdepends = nvidia-utils: Nvidia NVDEC/NVENC support (requires Emby Premiere)
 	provides = emby-server
 	conflicts = emby-server
 	noextract = license.docx
-	noextract = emby-ffmpeg-bin-${_ffmpeg_ver}-1-x86_64.pkg.tar.zst
 	backup = etc/conf.d/emby-server
 	source = https://github.com/MediaBrowser/Emby.Releases/releases/download/4.8.0.29/embyserver-netcore_4.8.0.29.zip
-	source = https://mediabrowser.github.io/embytools/emby-ffmpeg-bin-2022_05_07-1-x86_64.pkg.tar.zst
-	source = https://mediabrowser.github.io/embytools/libskiasharp-2.80.2-x64.tar.xz
+	source = https://mediabrowser.github.io/embytools/ffmpeg-2023_03_08-x64.tar.xz
 	source = emby-server
 	source = emby-server.conf
 	source = emby-server.service
 	source = license.docx
-	sha256sums = 2b4cc4b8eac7200aa771f70f69e672d597488b8d4016023129b895cef5ed242c
-	sha256sums = cfa7c7dedd99990ea2b7d2e4228c53d25061caf5fce87a79ce29c4a6ffd27ff2
-	sha256sums = 7202499c296f1f1b80619e10322fceff2068e5e3ed36a3f96d3ae4c2427978bd
+	sha256sums = 1f89060d1b31946f04963072e53ac625c6a47c125474e3d837fb6198cc5411be
+	sha256sums = 4db44f783278eaacda5554c6b8b20a0cbcb2f7a07dacab1019fdbee9c9f69f57
 	sha256sums = 0351d6e9118853e3aa275d62b67dce4444b3d85130b05fb889b2069f364f47ca
-	sha256sums = d1a805284d8a1329f6f6e736423be747d8951c5a9600fbb79c13a6f9be7149c0
+	sha256sums = 497f3e291f1be40eb2108e4b417026f91520a43f6d601648b1c9983865470dd3
 	sha256sums = a7f2e38d2d196984d1c1632c851215aea9072b3af998d10a6b68477ad886ea14
 	sha256sums = a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6
 
diff --git a/PKGBUILD b/PKGBUILD
index 12d4dad9c2a3..3b9ed99e1282 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,8 @@
 
 pkgname=emby-server-beta
 pkgver=4.8.0.29
-pkgrel=1
-_ffmpeg_ver=2022_05_07
-_ffdetect_ver=2022_05_07
-_skiasharp_ver=2.80.2
+pkgrel=2
+_ffmpeg_ver=2023_03_08
 pkgdesc='Bring together your videos, music, photos, and live television'
 arch=('x86_64')
 url='https://emby.media'
@@ -27,7 +25,7 @@ depends=('alsa-lib'
          'lame'
          'libass.so'
          'libchromaprint.so'
-	 'libdav1d.so'         
+         'libdav1d.so'         
          'libdrm'
          'libfreetype.so'
          'libjpeg-turbo'
@@ -44,94 +42,43 @@ depends=('alsa-lib'
          'libx265.so'
          'ocl-icd'
          'opus'
+         'skia-sharp'
          'sqlite'
-         'zlib'
-         'zvbi')
-makedepends=('ffnvcodec-headers'
-             'nasm'
-             'zstd')
+         'zvbi'
+         'zlib')
+makedepends=()
 optdepends=('intel-media-sdk: Intel QuickSync support (requires Emby Premiere)'
             'nvidia-utils: Nvidia NVDEC/NVENC support (requires Emby Premiere)')
 provides=('emby-server')
 conflicts=('emby-server')
 source=("https://github.com/MediaBrowser/Emby.Releases/releases/download/${pkgver}/embyserver-netcore_${pkgver}.zip"
-#        "https://mediabrowser.github.io/embytools/ffmpeg-${_ffmpeg_ver}.tar.gz"
-#        "https://mediabrowser.github.io/embytools/ffdetect-${_ffdetect_ver}-x64.tar.xz"
-        "https://mediabrowser.github.io/embytools/emby-ffmpeg-bin-${_ffmpeg_ver}-1-x86_64.pkg.tar.zst"
-        "https://mediabrowser.github.io/embytools/libskiasharp-${_skiasharp_ver}-x64.tar.xz"
+        "https://mediabrowser.github.io/embytools/ffmpeg-${_ffmpeg_ver}-x64.tar.xz"
         'emby-server'
         'emby-server.conf'
         'emby-server.service'
         'license.docx')
-noextract=('license.docx'
-           'emby-ffmpeg-bin-${_ffmpeg_ver}-1-x86_64.pkg.tar.zst')
-
+noextract=('license.docx')
 backup=('etc/conf.d/emby-server')
 install=emby-server.install
-sha256sums=('2b4cc4b8eac7200aa771f70f69e672d597488b8d4016023129b895cef5ed242c'
-            'cfa7c7dedd99990ea2b7d2e4228c53d25061caf5fce87a79ce29c4a6ffd27ff2'
-            '7202499c296f1f1b80619e10322fceff2068e5e3ed36a3f96d3ae4c2427978bd'
+sha256sums=('1f89060d1b31946f04963072e53ac625c6a47c125474e3d837fb6198cc5411be'
+            '4db44f783278eaacda5554c6b8b20a0cbcb2f7a07dacab1019fdbee9c9f69f57'
             '0351d6e9118853e3aa275d62b67dce4444b3d85130b05fb889b2069f364f47ca'
-            'd1a805284d8a1329f6f6e736423be747d8951c5a9600fbb79c13a6f9be7149c0'
+            '497f3e291f1be40eb2108e4b417026f91520a43f6d601648b1c9983865470dd3'
             'a7f2e38d2d196984d1c1632c851215aea9072b3af998d10a6b68477ad886ea14'
             'a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6')
 
 prepare() {
-  tar --use-compress-program=unzstd -xvf emby-ffmpeg-bin-${_ffmpeg_ver}-1-x86_64.pkg.tar.zst
   rm -rf system/{electron,runtimes/{osx,tizen*,win*}}
 }
 
-#build() {
-#  cd ffmpeg-${_ffmpeg_ver}_*
-#  export PKG_CONFIG_PATH=/usr/lib/ffnvcodec8.1/pkgconfig
-#
-#  ./configure \
-#    --disable-doc \
-#    --disable-ffplay \
-#    --disable-shared \
-#    --disable-vdpau \
-#    --disable-libxcb \
-#    --disable-lzma \
-#    --disable-sdl2 \
-#    --disable-xlib \
-#    --enable-fontconfig \
-#    --enable-gmp \
-#    --enable-gnutls \
-#    --enable-gpl \
-#    --enable-libaom \
-#    --enable-libass \
-#    --enable-libdrm \
-#    --enable-libfreetype \
-#    --enable-libfribidi \
-#    --enable-libmfx \
-#    --enable-libmp3lame \
-#    --enable-libopus \
-#    --enable-libtheora \
-#    --enable-libvorbis \
-#    --enable-libwebp \
-#    --enable-libx264 \
-#    --enable-libx265 \
-#    --enable-libzvbi \
-#    --enable-lto \
-#    --enable-nvdec \
-#    --enable-nvenc \
-#    --enable-static \
-#    --enable-vaapi \
-#    --enable-version3
-#  make
-#}
-
 package() {
   install -dm 755 "${pkgdir}"/usr/lib
   cp -dr --no-preserve='ownership' system "${pkgdir}"/usr/lib/emby-server
-#  ln -s ../libSkiaSharp.so.80.2.0 "${pkgdir}"/usr/lib/emby-server/libSkiaSharp.so
   install -Dm 755 emby-server -t "${pkgdir}"/usr/bin/
-  install -Dm 755 opt/emby-server/bin/ffdetect "${pkgdir}"/usr/bin/ffdetect-emby
-  install -Dm 755 opt/emby-server/bin/ffmpeg "${pkgdir}"/usr/bin/ffmpeg-emby
-  install -Dm 755 opt/emby-server/bin/ffprobe "${pkgdir}"/usr/bin/ffprobe-emby
-  install -Dm 755 lib/libSkiaSharp.so* -t "${pkgdir}"/usr/lib/emby-server/
   install -Dm 644 emby-server.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm 644 emby-server.conf "${pkgdir}"/etc/conf.d/emby-server
   install -Dm 644 license.docx -t "${pkgdir}"/usr/share/licenses/$pkgname/license.docx
-  cp -dr --no-preserve='ownership' opt/emby-server/licenses -t "${pkgdir}"/usr/share/licenses/$pkgname
+
+  install -dm 755 "${pkgdir}/opt/emby-server/bin"
+  cp -dr --no-preserve='ownership' bin "${pkgdir}/opt/emby-server"
 }
diff --git a/emby-server.conf b/emby-server.conf
index 3332766d65f2..768d242d9839 100644
--- a/emby-server.conf
+++ b/emby-server.conf
@@ -1,5 +1,5 @@
-FFDETECT=/usr/bin/ffdetect-emby
-FFMPEG=/usr/bin/ffmpeg-emby
-FFPROBE=/usr/bin/ffprobe-emby
+FFDETECT=/opt/emby-server/bin/ffdetect
+FFMPEG=/opt/emby-server/bin/ffmpeg
+FFPROBE=/opt/emby-server/bin/ffprobe
 PROGRAM_DATA=/var/lib/emby
 LIBVA_DRIVERS_PATH=/usr/lib/dri