summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Use-TagLibSharp-Nuget-package.patch71
-rw-r--r--PKGBUILD15
3 files changed, 81 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e3788d8b6671..4e29ce8c5e52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jellyfin
pkgdesc = The Free Software Media System
pkgver = 10.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jellyfin/jellyfin
arch = i686
arch = x86_64
@@ -14,19 +14,19 @@ pkgbase = jellyfin
depends = sqlite
backup = etc/conf.d/jellyfin
source = jellyfin-10.1.0.tar.gz::https://github.com/jellyfin/jellyfin/archive/v10.1.0.tar.gz
- source = taglib-sharp-60e7588b53868a2b37dd0bc92868b740da2eeded.tar.gz::https://github.com/mono/taglib-sharp/archive/60e7588b53868a2b37dd0bc92868b740da2eeded.tar.gz
source = jellyfin-web-094c1deae91c51b8bbf8ebb16a55758af110f04d.tar.gz::https://github.com/jellyfin/jellyfin-web/archive/094c1deae91c51b8bbf8ebb16a55758af110f04d.tar.gz
source = jellyfin.conf
source = jellyfin.service
source = jellyfin.sysusers
source = jellyfin.tmpfiles
+ source = 0001-Use-TagLibSharp-Nuget-package.patch
sha512sums = 4203b5c4412b3f0684740a9707c13b1096ca329cc705a87c40b5718a6c034a422d8a69424bbf1d765dc01fd716bfdaf633ef8be4784e7a36bf8d3c5206a6e5e3
- sha512sums = 4571d2bec9fc9585283103fa6b7e3ed2f369df9fdb429e379904e9f3c63864b534d8179c03675dea62dd16550e2f091ad1b7abb6207c096cf464b2dcfb572224
sha512sums = 2e054ea0df918df098fc03500a5a9b0eb2c2cad94bbf72dbc96464cd724b1c642c21b7cbfa775b160b799406cfc05da31e711116ab881b8ceb2a7ece04885130
sha512sums = 3a4178268be34d6735c0f86d1300158a17d05cdeaca14807db382aa03e91e8901997f273064a8a7e3f0ccfe7e7c83a32cfd4a95c431678477a79ab12b127ba2f
sha512sums = 3ff147dba3625d91d5f3f7e030c473b8d03171cd33693af2e8f3aad852d4914b93bdff678e2c4365a34db94622c3f3bb21c42388abe3c387750fca0dfc5cc372
sha512sums = 6fc2638e6ec4b1ee0240e17815c91107b694e5fde72c1bc7956c83067bbeacb632de899b86837e47a0ec04288131b15c20746373b45e0669c8976069a55d627a
sha512sums = 20ff19a4697a93fccdf0dfeae74ab49d74fbe5dbe242e4f169c4d4af0955750befc9abd276d9f07f685793dd5ef69d7908761ff934ae3b47b3c3108a7de56438
+ sha512sums = 04d6b59560aeb26c450635b3605a864f69a585e329d3120746f67aad129d76ac4000fd872303fd3f560170abf97f602e79ffd0bc416190032c5be28de5c7f87b
pkgname = jellyfin
diff --git a/0001-Use-TagLibSharp-Nuget-package.patch b/0001-Use-TagLibSharp-Nuget-package.patch
new file mode 100644
index 000000000000..0a11e92e2173
--- /dev/null
+++ b/0001-Use-TagLibSharp-Nuget-package.patch
@@ -0,0 +1,71 @@
+From bc8a0eeead8721951250edade1047073030d1246 Mon Sep 17 00:00:00 2001
+From: Andrew Rabert <ar@nullsum.net>
+Date: Mon, 21 Jan 2019 19:22:08 -0500
+Subject: [PATCH] Use TagLibSharp Nuget package
+
+---
+ .gitmodules | 3 ---
+ Emby.Photos/Emby.Photos.csproj | 5 ++++-
+ MediaBrowser.sln | 6 ------
+ 3 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/.gitmodules b/.gitmodules
+index 7aeb94dfc..c10f5905c 100644
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -1,6 +1,3 @@
+-[submodule "ThirdParty/taglib-sharp"]
+- path = ThirdParty/taglib-sharp
+- url = https://github.com/mono/taglib-sharp.git
+ [submodule "MediaBrowser.WebDashboard/jellyfin-web"]
+ path = MediaBrowser.WebDashboard/jellyfin-web
+ url = https://github.com/jellyfin/jellyfin-web.git
+diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
+index e6b445202..c9830abc5 100644
+--- a/Emby.Photos/Emby.Photos.csproj
++++ b/Emby.Photos/Emby.Photos.csproj
+@@ -3,13 +3,16 @@
+ <ItemGroup>
+ <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+ <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+- <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Compile Include="..\SharedVersion.cs" />
+ </ItemGroup>
+
++ <ItemGroup>
++ <PackageReference Include="TagLibSharp" Version="2.2.0-beta" />
++ </ItemGroup>
++
+ <PropertyGroup>
+ <TargetFramework>netstandard2.0</TargetFramework>
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+diff --git a/MediaBrowser.sln b/MediaBrowser.sln
+index 0f0c24a25..dfaa2601f 100644
+--- a/MediaBrowser.sln
++++ b/MediaBrowser.sln
+@@ -42,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Notifications", "Emby.
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Naming", "Emby.Naming\Emby.Naming.csproj", "{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}"
+ EndProject
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "taglib-sharp", "ThirdParty\taglib-sharp\src\taglib-sharp.csproj", "{D45FC504-D06B-41A0-A220-C20B7E8F1304}"
+-EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj", "{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}"
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IsoMounter", "Emby.IsoMounting\IsoMounter\IsoMounter.csproj", "{9BA471D2-6DB9-4DBF-B3A0-9FB3171F94A6}"
+@@ -144,10 +142,6 @@ Global
+ {E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.Build.0 = Release|Any CPU
+- {D45FC504-D06B-41A0-A220-C20B7E8F1304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+- {D45FC504-D06B-41A0-A220-C20B7E8F1304}.Debug|Any CPU.Build.0 = Debug|Any CPU
+- {D45FC504-D06B-41A0-A220-C20B7E8F1304}.Release|Any CPU.ActiveCfg = Release|Any CPU
+- {D45FC504-D06B-41A0-A220-C20B7E8F1304}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+--
+2.20.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 4fa2490b0d4d..e550c1d32428 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,9 @@
pkgname=jellyfin
pkgver=10.1.0
-# Check at https://github.com/jellyfin/jellyfin/tree/v**PKGVER**/ThirdParty
-_taglib_sharp_commit=60e7588b53868a2b37dd0bc92868b740da2eeded
# Check at https://github.com/jellyfin/jellyfin/tree/v**PKGVER**/MediaBrowser.WebDashboard
_jellyfin_web_commit=094c1deae91c51b8bbf8ebb16a55758af110f04d
-pkgrel=1
+pkgrel=2
pkgdesc='The Free Software Media System'
arch=('i686' 'x86_64' 'armv6h')
url='https://github.com/jellyfin/jellyfin'
@@ -16,26 +14,27 @@ license=('GPL2')
depends=('dotnet-runtime' 'ffmpeg' 'imagemagick' 'sqlite')
makedepends=('dotnet-sdk')
source=("$pkgname-$pkgver.tar.gz::https://github.com/jellyfin/jellyfin/archive/v$pkgver.tar.gz"
- "taglib-sharp-$_taglib_sharp_commit.tar.gz::https://github.com/mono/taglib-sharp/archive/$_taglib_sharp_commit.tar.gz"
"jellyfin-web-$_jellyfin_web_commit.tar.gz::https://github.com/jellyfin/jellyfin-web/archive/$_jellyfin_web_commit.tar.gz"
'jellyfin.conf'
'jellyfin.service'
'jellyfin.sysusers'
- 'jellyfin.tmpfiles')
+ 'jellyfin.tmpfiles'
+ '0001-Use-TagLibSharp-Nuget-package.patch')
backup=('etc/conf.d/jellyfin')
sha512sums=('4203b5c4412b3f0684740a9707c13b1096ca329cc705a87c40b5718a6c034a422d8a69424bbf1d765dc01fd716bfdaf633ef8be4784e7a36bf8d3c5206a6e5e3'
- '4571d2bec9fc9585283103fa6b7e3ed2f369df9fdb429e379904e9f3c63864b534d8179c03675dea62dd16550e2f091ad1b7abb6207c096cf464b2dcfb572224'
'2e054ea0df918df098fc03500a5a9b0eb2c2cad94bbf72dbc96464cd724b1c642c21b7cbfa775b160b799406cfc05da31e711116ab881b8ceb2a7ece04885130'
'3a4178268be34d6735c0f86d1300158a17d05cdeaca14807db382aa03e91e8901997f273064a8a7e3f0ccfe7e7c83a32cfd4a95c431678477a79ab12b127ba2f'
'3ff147dba3625d91d5f3f7e030c473b8d03171cd33693af2e8f3aad852d4914b93bdff678e2c4365a34db94622c3f3bb21c42388abe3c387750fca0dfc5cc372'
'6fc2638e6ec4b1ee0240e17815c91107b694e5fde72c1bc7956c83067bbeacb632de899b86837e47a0ec04288131b15c20746373b45e0669c8976069a55d627a'
- '20ff19a4697a93fccdf0dfeae74ab49d74fbe5dbe242e4f169c4d4af0955750befc9abd276d9f07f685793dd5ef69d7908761ff934ae3b47b3c3108a7de56438')
+ '20ff19a4697a93fccdf0dfeae74ab49d74fbe5dbe242e4f169c4d4af0955750befc9abd276d9f07f685793dd5ef69d7908761ff934ae3b47b3c3108a7de56438'
+ '04d6b59560aeb26c450635b3605a864f69a585e329d3120746f67aad129d76ac4000fd872303fd3f560170abf97f602e79ffd0bc416190032c5be28de5c7f87b')
prepare() {
cd $pkgname-$pkgver
- cp -r "$srcdir"/taglib-sharp-$_taglib_sharp_commit/. ThirdParty/taglib-sharp
cp -r "$srcdir"/jellyfin-web-$_jellyfin_web_commit/. MediaBrowser.WebDashboard/jellyfin-web
+
+ patch -Np1 -i ../0001-Use-TagLibSharp-Nuget-package.patch
}
build(){