4.1.0.13

8 files changed, 138 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3d5383ace05..9fd2d5241455 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,61 @@
 pkgbase = emby-server-beta
 	pkgdesc = Bring together your videos, music, photos, and live television
 	pkgver = 4.1.0.13
-	pkgrel = 1
-	url = http://emby.media
-	install = emby-server.install
+	pkgrel = 2
+	url = https://emby.media
 	arch = any
 	license = custom
+	makedepends = ffnvcodec-headers
+	makedepends = nasm
+	depends = alsa-lib
+	depends = aom
 	depends = dotnet-runtime
-	depends = ffmpeg4.0
+	depends = fontconfig
+	depends = fribidi
+	depends = gmp
+	depends = gnutls
+	depends = lame
+	depends = libass.so
+	depends = libdrm
+	depends = libfreetype.so
+	depends = libjpeg-turbo
+	depends = libpng
+	depends = libtheora
+	depends = libva-drm.so
+	depends = libva.so
+	depends = libva-x11.so
+	depends = libvorbisenc.so
+	depends = libvorbis.so
+	depends = libwebp
+	depends = libx11
+	depends = libx264.so
+	depends = opus
 	depends = skia-sharp60
 	depends = sqlite
+	depends = zlib
+	depends = zvbi
 	provides = emby-server
 	conflicts = emby-server
+	noextract = license.docx
 	backup = etc/conf.d/emby-server
 	source = https://github.com/MediaBrowser/Emby.Releases/releases/download/4.1.0.13/embyserver-netcore_4.1.0.13.zip
+	source = https://mediabrowser.github.io/embytools/ffmpeg-2018_12_01.tar.gz
+	source = https://mediabrowser.github.io/embytools/ffdetect_4.0.2_x64.tar.xz
 	source = emby-server
-	source = emby-migrate-database
 	source = emby-server.conf
 	source = emby-server.service
 	source = emby-server.sysusers
 	source = emby-server.tmpfiles
+	source = license.docx
 	sha256sums = 4623f13f23c3865ee01839e2031bce5ad668173d96cafb4dcda7254548f77d8f
-	sha256sums = 1f04c5dff2e1534bff101917a556295d63aae26c233446b252890ad58221e513
-	sha256sums = e44692b24d69aef8568c6e68088e5a28e42584868a8936abcab9211c236c2a6b
-	sha256sums = e6676f75bb12ba2b88da130be1272abb0e332f40e9fa043182a865e3d74a38fb
-	sha256sums = c3caa13be8c010ad1730103f585293cdd46a7fe510af2effb2c8a9e9289566cb
+	sha256sums = 1129e1bfb7fc4090cdd6e055d57b0cd90c9881f0db8b9ceb80fdd145de4ffc71
+	sha256sums = c25eea4ace3824c7172e0b7cab57cc2baa459004680fed5fa645355205fe2c51
+	sha256sums = e2185a5f4810726cb57fcc6d9bdbde1854069f08f163be58cb3cef1154b8e2a7
+	sha256sums = 5e3470f834808babe7d60b8d86f462e7945c3617499539e5af45eb55d7b87b23
+	sha256sums = efdaabd3002fee13a6831e90fd700dea4d7c6c954ede00da6f28c1eada33ad8c
 	sha256sums = f7fa33949757ffc587ecf82496dc35ebc8c8e5c98b882b31dc40a24263d3921a
 	sha256sums = 16ead857a1756e3e8cfc3e70f481d14d791a262b79733065a4f7371f21a97abe
+	sha256sums = a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6
 
 pkgname = emby-server-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 923d721ddd23..2166c6cfbf59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,44 +5,116 @@
 
 pkgname=emby-server-beta
 pkgver=4.1.0.13
-pkgrel=1
+pkgrel=2
+_ffmpeg_ver=2018_12_01
+_ffdetect_ver=4.0.2
 pkgdesc='Bring together your videos, music, photos, and live television'
 arch=('any')
-url='http://emby.media'
+url='https://emby.media'
 license=('custom')
-depends=('dotnet-runtime' 'ffmpeg4.0' 'skia-sharp60' 
-'sqlite')
-install='emby-server.install'
+depends=('alsa-lib'
+         'aom'
+         'dotnet-runtime'
+         'fontconfig'
+         'fribidi'
+         'gmp'
+         'gnutls'
+         'lame'
+         'libass.so'
+         'libdrm'
+         'libfreetype.so'
+         'libjpeg-turbo'
+         'libpng'
+         'libtheora'
+         'libva-drm.so'
+         'libva.so'
+         'libva-x11.so'
+         'libvorbisenc.so'
+         'libvorbis.so'
+         'libwebp'
+         'libx11'
+         'libx264.so'
+         'opus'
+         'skia-sharp60'
+         'sqlite'
+         'zlib'
+         'zvbi')
+makedepends=('ffnvcodec-headers'
+             'nasm')
 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"
         'emby-server'
-        'emby-migrate-database'
         'emby-server.conf'
         'emby-server.service'
         'emby-server.sysusers'
-        'emby-server.tmpfiles')
+        'emby-server.tmpfiles'
+        'license.docx')
+noextract=(license.docx)
 backup=('etc/conf.d/emby-server')
 sha256sums=('4623f13f23c3865ee01839e2031bce5ad668173d96cafb4dcda7254548f77d8f'
-            '1f04c5dff2e1534bff101917a556295d63aae26c233446b252890ad58221e513'
-            'e44692b24d69aef8568c6e68088e5a28e42584868a8936abcab9211c236c2a6b'
-            'e6676f75bb12ba2b88da130be1272abb0e332f40e9fa043182a865e3d74a38fb'
-            'c3caa13be8c010ad1730103f585293cdd46a7fe510af2effb2c8a9e9289566cb'
+            '1129e1bfb7fc4090cdd6e055d57b0cd90c9881f0db8b9ceb80fdd145de4ffc71'
+            'c25eea4ace3824c7172e0b7cab57cc2baa459004680fed5fa645355205fe2c51'
+            'e2185a5f4810726cb57fcc6d9bdbde1854069f08f163be58cb3cef1154b8e2a7'
+            '5e3470f834808babe7d60b8d86f462e7945c3617499539e5af45eb55d7b87b23'
+            'efdaabd3002fee13a6831e90fd700dea4d7c6c954ede00da6f28c1eada33ad8c'
             'f7fa33949757ffc587ecf82496dc35ebc8c8e5c98b882b31dc40a24263d3921a'
-            '16ead857a1756e3e8cfc3e70f481d14d791a262b79733065a4f7371f21a97abe')
+            '16ead857a1756e3e8cfc3e70f481d14d791a262b79733065a4f7371f21a97abe'
+            'a6d7ea65dcb06392479a85e1a10a7aeb872d803da6f784f6935fcd4ee63008c6')
 
 prepare() {
   rm -rf system/{electron,runtimes}
 }
 
+build() {
+  cd ffmpeg-${_ffmpeg_ver}
+
+  ./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-libmp3lame \
+    --enable-libopus \
+    --enable-libtheora \
+    --enable-libvorbis \
+    --enable-libwebp \
+    --enable-libx264 \
+    --enable-libzvbi \
+    --enable-version3 \
+    --enable-nvdec \
+    --enable-nvenc \
+    --enable-static \
+    --enable-vaapi
+  make
+}
+
 package() {
-  install -dm 755 "${pkgdir}"/{etc/conf.d,usr/{bin,lib/{systemd/system,sysusers.d,tmpfiles.d}}}
+  install -dm 755 "${pkgdir}"/usr/lib
   cp -dr --no-preserve='ownership' system "${pkgdir}"/usr/lib/emby-server
   ln -s ../libSkiaSharp.so.60.0.0 "${pkgdir}"/usr/lib/emby-server/libSkiaSharp.so
-  install -m 755 emby-server "${pkgdir}"/usr/bin/
-  install -m 755 emby-migrate-database "${pkgdir}"/usr/bin/
-  install -m 644 emby-server.service "${pkgdir}"/usr/lib/systemd/system/
-  install -m 644 emby-server.sysusers "${pkgdir}"/usr/lib/sysusers.d/emby-server.conf
-  install -m 644 emby-server.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/emby-server.conf
-  install -m 644 emby-server.conf "${pkgdir}"/etc/conf.d/emby-server
+  install -Dm 755 emby-server -t "${pkgdir}"/usr/bin/
+  install -Dm 755 bin/ffdetect "${pkgdir}"/usr/bin/ffdetect-emby
+  install -Dm 755 ffmpeg-${_ffmpeg_ver}/ffmpeg "${pkgdir}"/usr/bin/ffmpeg-emby
+  install -Dm 755 ffmpeg-${_ffmpeg_ver}/ffprobe "${pkgdir}"/usr/bin/ffprobe-emby
+  install -Dm 644 emby-server.service -t "${pkgdir}"/usr/lib/systemd/system/
+  install -Dm 644 emby-server.sysusers "${pkgdir}"/usr/lib/sysusers.d/emby-server.conf
+  install -Dm 644 emby-server.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/emby-server.conf
+  install -Dm 644 emby-server.conf "${pkgdir}"/etc/conf.d/emby-server
+  install -Dm 644 license.docx -t "${pkgdir}"/usr/share/licenses/emby-server/
 }
diff --git a/emby-migrate-database b/emby-migrate-database
deleted file mode 100644
index 369fa235fdcb..000000000000
--- a/emby-migrate-database
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-USER='emby'
-GROUP='emby'
-
-usage() {
-  echo 'Usage: emby-migrate-database {-u user} {-g group} old_path_full new_path_full'
-  echo 'Default user: emby'
-  echo 'Default group: emby'
-}
-
-migrate() {
-  if [[ $1 && $2 ]]; then
-    if [[ -f $1/data/library.db ]]; then
-      if [[ ! -e $2 ]]; then
-        mkdir -p $2
-      fi
-      if [[ -d $2 ]]; then
-        if [[ -z $(ls $2) ]]; then
-          cp -r $1/* $2/
-          sqlite3 $2/data/library.db "UPDATE TypedBaseItems SET data = CAST(REPLACE(CAST(data AS TEXT), '$1', '$2') AS BLOB);"
-          chown $USER:$GROUP -R $2
-          echo "Migration complete. You can now delete $1."
-        else
-          echo "$2 is not empty. Aborting."
-        fi
-      else
-        echo "$2 is not a directory. Aborting."
-      fi
-    else
-      echo "$1 does not contain an emby database. Aborting."
-    fi
-  else
-    usage
-  fi
-}
-
-if [[ $1 == '--help' ]]; then
-  usage
-else
-  while getopts 'u:g:' opt; do
-    case $opt in
-      u)
-        USER=$OPTARG
-        ;;
-      g)
-        GROUP=$OPTARG
-        ;;
-      \?)
-        usage
-        ;;
-    esac
-  done
-  shift $((OPTIND-1))
-  migrate $@
-fi
\ No newline at end of file
diff --git a/emby-server b/emby-server
index 2b4605599786..07c7102eb993 100644
--- a/emby-server
+++ b/emby-server
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-export LD_LIBRARY_PATH='/usr/lib/skia-sharp58'
-
 exec dotnet /usr/lib/emby-server/EmbyServer.dll \
   -programdata $PROGRAM_DATA \
+  -ffdetect $FFDETECT \
   -ffmpeg $FFMPEG \
-  -ffprobe $FFPROBE
\ No newline at end of file
+  -ffprobe $FFPROBE
+  -restartexitcode 3
\ No newline at end of file
diff --git a/emby-server.conf b/emby-server.conf
index a4c1e6a1945e..af52d1cfacb8 100644
--- a/emby-server.conf
+++ b/emby-server.conf
@@ -1,3 +1,5 @@
-FFMPEG=/usr/bin/ffmpeg
-FFPROBE=/usr/bin/ffprobe
-PROGRAM_DATA=/var/lib/emby
\ No newline at end of file
+FFDETECT=/usr/bin/ffdetect-emby
+FFMPEG=/usr/bin/ffmpeg-emby
+FFPROBE=/usr/bin/ffprobe-emby
+PROGRAM_DATA=/var/lib/emby
+LIBVA_DRIVERS_PATH=/usr/lib/dri
\ No newline at end of file
diff --git a/emby-server.install b/emby-server.install
deleted file mode 100644
index 41b10ee8f580..000000000000
--- a/emby-server.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-cat <<EOF
-
-Emby is not compatible with the 10-bit version of libx264. Please stick to the
-8-bit version if you plan on using emby's transcoding features.
-
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/emby-server.service b/emby-server.service
index 85e4617edf3f..6743002d5b12 100644
--- a/emby-server.service
+++ b/emby-server.service
@@ -5,9 +5,9 @@ Description=Emby brings together your videos, music, photos, and live television
 EnvironmentFile=/etc/conf.d/emby-server
 WorkingDirectory=/usr/lib/emby-server
 ExecStart=/usr/bin/emby-server
+RestartForceExitStatus=3
 User=emby
 Group=emby
-Restart=on-abnormal
 
 [Unit]
 After=network.target
diff --git a/license.docx b/license.docx
new file mode 100644
index 000000000000..081ab7a28e9e
--- /dev/null
+++ b/license.docx