summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO32
-rw-r--r--[-rwxr-xr-x]PKGBUILD63
-rw-r--r--emby-migrate-database2
-rw-r--r--[-rwxr-xr-x]emby-server7
-rw-r--r--[-rwxr-xr-x]emby-server.conf3
-rw-r--r--[-rwxr-xr-x]emby-server.install25
-rw-r--r--[-rwxr-xr-x]emby-server.service2
-rw-r--r--emby-server.sysusers1
-rw-r--r--emby-server.tmpfiles1
9 files changed, 52 insertions, 84 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fb680b6436e..02546890c70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,30 @@
pkgbase = emby-server-beta
pkgdesc = Bring together your videos, music, photos, and live television
- pkgver = 3.2.35.2
+ pkgver = 3.2.60.15
pkgrel = 1
url = http://emby.media
install = emby-server.install
- arch = i686
- arch = x86_64
+ arch = any
license = GPL2
- makedepends = git
+ depends = dotnet-runtime
depends = ffmpeg
- depends = imagemagick
- depends = mono<5.0.0.0
- depends = referenceassemblies-pcl
+ depends = skia-sharp58
depends = sqlite
- provides = emby-server
- conflicts = emby-server
- conflicts = emby-server-beta-git
- conflicts = emby-server-dev-git
- conflicts = emby-server-git
backup = etc/conf.d/emby-server
- source = emby-server-3.2.35.2.tar.gz::https://github.com/MediaBrowser/Emby/archive/3.2.35.2.tar.gz
+ source = https://github.com/MediaBrowser/Emby/releases/download/3.2.60.15/embyserver-netcore-3.2.60.15.zip
source = emby-server
source = emby-migrate-database
source = emby-server.conf
source = emby-server.service
- sha256sums = SKIP
- sha256sums = 7b1974f7bba8ac4b76e51ef7fe1257d165c7c4abbd0915e192391336048a3d74
- sha256sums = b25bf83a0ab371aff3b13b82f7af71b51bfe6d7e51eb8a8a3dd8f0774ffce6a5
- sha256sums = c9ad78f3e2f0ffcb4ee66bb3e99249fcd283dc9fee17895b9265dc733288b953
- sha256sums = 8a91ea49a1699c820c4a180710072cba1d6d5c10e45df97477ff6a898f4e1d70
+ source = emby-server.sysusers
+ source = emby-server.tmpfiles
+ sha256sums = e7f17ec997fbc9766c35a04fc394ee554fe837566f81c929ce772927db8870ce
+ sha256sums = 1f04c5dff2e1534bff101917a556295d63aae26c233446b252890ad58221e513
+ sha256sums = e44692b24d69aef8568c6e68088e5a28e42584868a8936abcab9211c236c2a6b
+ sha256sums = e6676f75bb12ba2b88da130be1272abb0e332f40e9fa043182a865e3d74a38fb
+ sha256sums = 5b9f22659156b5c788022b367bcabc874f669e8a9cef9fadf07eaf50b1b53419
+ sha256sums = f7fa33949757ffc587ecf82496dc35ebc8c8e5c98b882b31dc40a24263d3921a
+ sha256sums = 16ead857a1756e3e8cfc3e70f481d14d791a262b79733065a4f7371f21a97abe
pkgname = emby-server-beta
diff --git a/PKGBUILD b/PKGBUILD
index b548efb9084..3025b390004 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,44 @@
-# Maintainer: Bjorn Nostvold <bjorn.nostvold@gmail.com>
+# Maintainer: Nicola Hinssen <nicola.hinssen@gmail.com>
+# Contributor: Bjorn Nostvold <bjorn.nostvold@gmail.com>
# Contributor: Maxime Gauduin <alucryd@archlinux.org>
# Contributor: Daniel Seymour <dannyseeless@gmail.com>
pkgname=emby-server-beta
-pkgver=3.2.35.2
+pkgver=3.2.60.15
pkgrel=1
pkgdesc='Bring together your videos, music, photos, and live television'
-arch=('i686' 'x86_64')
+arch=('any')
url='http://emby.media'
license=('GPL2')
-depends=('ffmpeg' 'imagemagick' 'mono<5.0.0.0' 'referenceassemblies-pcl' 'sqlite')
-makedepends=('git')
-provides=('emby-server')
-conflicts=('emby-server' 'emby-server-beta-git' 'emby-server-dev-git' 'emby-server-git')
+depends=('dotnet-runtime' 'ffmpeg' 'skia-sharp58' 'sqlite')
install='emby-server.install'
-source=("emby-server-${pkgver}.tar.gz::https://github.com/MediaBrowser/Emby/archive/${pkgver}.tar.gz"
- "emby-server"
- "emby-migrate-database"
- "emby-server.conf"
- "emby-server.service")
+source=("https://github.com/MediaBrowser/Emby/releases/download/${pkgver}/embyserver-netcore-${pkgver}.zip"
+ 'emby-server'
+ 'emby-migrate-database'
+ 'emby-server.conf'
+ 'emby-server.service'
+ 'emby-server.sysusers'
+ 'emby-server.tmpfiles')
backup=('etc/conf.d/emby-server')
-sha256sums=('SKIP'
- '7b1974f7bba8ac4b76e51ef7fe1257d165c7c4abbd0915e192391336048a3d74'
- 'b25bf83a0ab371aff3b13b82f7af71b51bfe6d7e51eb8a8a3dd8f0774ffce6a5'
- 'c9ad78f3e2f0ffcb4ee66bb3e99249fcd283dc9fee17895b9265dc733288b953'
- '8a91ea49a1699c820c4a180710072cba1d6d5c10e45df97477ff6a898f4e1d70')
+sha256sums=('e7f17ec997fbc9766c35a04fc394ee554fe837566f81c929ce772927db8870ce'
+ '1f04c5dff2e1534bff101917a556295d63aae26c233446b252890ad58221e513'
+ 'e44692b24d69aef8568c6e68088e5a28e42584868a8936abcab9211c236c2a6b'
+ 'e6676f75bb12ba2b88da130be1272abb0e332f40e9fa043182a865e3d74a38fb'
+ '5b9f22659156b5c788022b367bcabc874f669e8a9cef9fadf07eaf50b1b53419'
+ 'f7fa33949757ffc587ecf82496dc35ebc8c8e5c98b882b31dc40a24263d3921a'
+ '16ead857a1756e3e8cfc3e70f481d14d791a262b79733065a4f7371f21a97abe')
prepare() {
- cd Emby-$pkgver
-
- sed 's/libMagickWand-6.Q8.so/libMagickWand-6.Q16HDRI.so/' -i MediaBrowser.Server.Mono/ImageMagickSharp.dll.config
-}
-
-build(){
- cd Emby-$pkgver
-
- xbuild \
- /p:Configuration='Release Mono' \
- /p:Platform='Any CPU' \
- /p:OutputPath="${srcdir}/build" \
- /t:build MediaBrowser.sln
- mono --aot='full' -O='all' ../build/MediaBrowser.Server.Mono.exe
+ rm -rf system/{electron,runtimes}
}
package() {
- install -dm 755 "${pkgdir}"/{etc/conf.d,usr/{bin,lib/systemd/system}}
- cp -dr --no-preserve='ownership' build "${pkgdir}"/usr/lib/emby-server
- find "${pkgdir}" -type f -name *.dylib -delete
+ install -dm 755 "${pkgdir}"/{etc/conf.d,usr/{bin,lib/{systemd/system,sysusers.d,tmpfiles.d}}}
+ cp -dr --no-preserve='ownership' system "${pkgdir}"/usr/lib/emby-server
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 "${pkgdir}"/var/lib/emby
- chown 422:422 -R "${pkgdir}"/var/lib/emby
}
-
-# vim: ts=2 sw=2 et:
diff --git a/emby-migrate-database b/emby-migrate-database
index 3e102124a9c..369fa235fdc 100644
--- a/emby-migrate-database
+++ b/emby-migrate-database
@@ -53,4 +53,4 @@ else
done
shift $((OPTIND-1))
migrate $@
-fi
+fi \ No newline at end of file
diff --git a/emby-server b/emby-server
index 31461d269dc..2b460559978 100755..100644
--- a/emby-server
+++ b/emby-server
@@ -1,3 +1,8 @@
#!/bin/sh
-exec $MONO /usr/lib/emby-server/MediaBrowser.Server.Mono.exe -programdata $PROGRAM_DATA -ffmpeg $FFMPEG -ffprobe $FFPROBE
+export LD_LIBRARY_PATH='/usr/lib/skia-sharp58'
+
+exec dotnet /usr/lib/emby-server/EmbyServer.dll \
+ -programdata $PROGRAM_DATA \
+ -ffmpeg $FFMPEG \
+ -ffprobe $FFPROBE \ No newline at end of file
diff --git a/emby-server.conf b/emby-server.conf
index cbf376e727c..a4c1e6a1945 100755..100644
--- a/emby-server.conf
+++ b/emby-server.conf
@@ -1,4 +1,3 @@
-MONO=/usr/bin/mono
FFMPEG=/usr/bin/ffmpeg
FFPROBE=/usr/bin/ffprobe
-PROGRAM_DATA=/var/lib/emby
+PROGRAM_DATA=/var/lib/emby \ No newline at end of file
diff --git a/emby-server.install b/emby-server.install
index 73c12f3f851..eec67108141 100755..100644
--- a/emby-server.install
+++ b/emby-server.install
@@ -1,31 +1,12 @@
post_install() {
- getent group emby > /dev/null 2>&1 || groupadd -g 422 emby
- getent passwd emby > /dev/null 2>&1 || useradd -c 'Emby Media Server' -u 422 -g emby -d /var/lib/emby -s /usr/bin/nologin emby
- passwd -l emby > /dev/null
-
- if [[ -d '/var/lib/emby-server' ]]; then
-
cat <<EOF
-New installations store the emby database inside '/var/lib/emby' (previously
-'/var/lib/emby-server'). Existing installations are left untouched.
-
-You can play safe and keep your existing setup, or you can adopt the new home
-and move your database using the emby-migrate-database script. Make sure to run
-pacdiff afterwards to merge the configuration changes.
-
- sudo emby-migrate-database /var/lib/emby-server /var/lib/emby
-
-The script can also be used for more advanced database migration.
-Try "emby-migrate-database --help" for additional information.
+Emby is not compatible with the 10-bit versionof libx264. Please stick to the
+8-bit version if you plan on using emby's transcoding features.
EOF
-
- fi
}
post_upgrade() {
post_install
-}
-
-# vim: ts=2 sw=2 et:
+} \ No newline at end of file
diff --git a/emby-server.service b/emby-server.service
index aaf35b161a4..a43d1818ec3 100755..100644
--- a/emby-server.service
+++ b/emby-server.service
@@ -13,4 +13,4 @@ Restart=always
After=network.target
[Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target \ No newline at end of file
diff --git a/emby-server.sysusers b/emby-server.sysusers
new file mode 100644
index 00000000000..9be02c7ffe9
--- /dev/null
+++ b/emby-server.sysusers
@@ -0,0 +1 @@
+u emby - "Emby Media Server" /var/lib/emby
diff --git a/emby-server.tmpfiles b/emby-server.tmpfiles
new file mode 100644
index 00000000000..f973846bbca
--- /dev/null
+++ b/emby-server.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/emby 0755 emby emby - \ No newline at end of file