Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-07 11:57:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-11 22:30:01 -05:00
commit 5f7871ca54
3 changed files with 91 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View file

@ -134,13 +134,20 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\ThirdParty\SQLite3\linux\x86\3.8.2\libsqlite3.so.0.8.6"> <Content Include="..\ThirdParty\SQLite3\linux\x86\3.8.2\libsqlite3.so.0.8.6">
<Link>lib\libsqlite3.so.0.8.6</Link> <Link>sqlite3\linux\lib\libsqlite3.so.0.8.6</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\ThirdParty\SQLite3\linux\x86_64\3.8.2\libsqlite3.so.0.8.6"> <Content Include="..\ThirdParty\SQLite3\linux\x86_64\3.8.2\libsqlite3.so.0.8.6">
<Link>lib64\libsqlite3.so.0.8.6</Link> <Link>sqlite3\linux\lib64\libsqlite3.so.0.8.6</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\ThirdParty\SQLite3\mac\universal\3.8.2\libsqlite3.0.dylib">
<Link>sqlite3\mac\libsqlite3.0.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="System.Data.SQLite.dll.config">
<Link>System.Data.SQLite.dll.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="System.Data.SQLite.dll.config" />
</ItemGroup> </ItemGroup>
</Project> </Project>

5
MediaBrowser.Server.Mono/System.Data.SQLite.dll.config
View file

@ -1,4 +1,5 @@
<configuration> <configuration>
<dllmap dll="sqlite3" target="./lib/libsqlite3.so.0.8.6" os="!windows"/> <dllmap dll="sqlite3" target="./sqlite3/linux/lib/libsqlite3.so.0.8.6" os="linux"/>
<dllmap dll="sqlite3" target="./lib64/libsqlite3.so.0.8.6" os="!windows"/> <dllmap dll="sqlite3" target="./sqlite3/linux/lib64/libsqlite3.so.0.8.6" os="linux"/>
<dllmap dll="sqlite3" target="./sqlite3/mac/libsqlite3.0.dylib" os="osx"/>
</configuration> </configuration>

94
MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
View file

@ -1,4 +1,7 @@
using System; using System;
#if __MonoCS__
using System.Runtime.InteropServices;
#endif
namespace MediaBrowser.ServerApplication.FFMpeg namespace MediaBrowser.ServerApplication.FFMpeg
{ {
@ -35,20 +38,41 @@ namespace MediaBrowser.ServerApplication.FFMpeg
return "7z"; return "7z";
} }
break; break;
#if __MonoCS__
case PlatformID.Unix: case PlatformID.Unix:
case PlatformID.MacOSX: if (IsRunningOnMac())
switch (arg)
{ {
case "Version": switch (arg)
return "20140104"; {
case "FFMpegFilename": case "Version":
return "ffmpeg"; return "20131121";
case "FFProbeFilename": case "FFMpegFilename":
return "ffprobe"; return "ffmpeg";
case "ArchiveType": case "FFProbeFilename":
return "gz"; return "ffprobe";
case "ArchiveType":
return "gz";
}
break;
} }
break; else
{
// Linux
switch (arg)
{
case "Version":
return "20140104";
case "FFMpegFilename":
return "ffmpeg";
case "FFProbeFilename":
return "ffprobe";
case "ArchiveType":
return "gz";
}
break;
}
#endif
} }
return ""; return "";
} }
@ -66,16 +90,54 @@ namespace MediaBrowser.ServerApplication.FFMpeg
"https://www.dropbox.com/s/oghurnp5zh292ry/ffmpeg-20140105-git-70937d9-win32-static.7z?dl=1" "https://www.dropbox.com/s/oghurnp5zh292ry/ffmpeg-20140105-git-70937d9-win32-static.7z?dl=1"
}; };
#if __MonoCS__
case PlatformID.Unix: case PlatformID.Unix:
case PlatformID.MacOSX: if (IsRunningOnMac())
return new[]
{ {
"http://ffmpeg.gusari.org/static/32bit/ffmpeg.static.32bit.2014-01-04.tar.gz", // Mac OS X Intel 64bit
"https://www.dropbox.com/s/b7nkg71sil812hp/ffmpeg.static.32bit.2014-01-04.tar.gz?dl=1" return new[]
}; {
"https://copy.com/ylAUbbQHYE7x/ffall-2.1.1.7z?download=1"
};
}
else
{
// Linux
return new[]
{
"http://ffmpeg.gusari.org/static/32bit/ffmpeg.static.32bit.2014-01-04.tar.gz",
"https://www.dropbox.com/s/b7nkg71sil812hp/ffmpeg.static.32bit.2014-01-04.tar.gz?dl=1"
};
}
#endif
} }
return new string[] {}; return new string[] {};
} }
#if __MonoCS__
// From mono/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
[DllImport ("libc")]
static extern int uname (IntPtr buf);
static bool IsRunningOnMac()
{
IntPtr buf = IntPtr.Zero;
try {
buf = Marshal.AllocHGlobal (8192);
// This is a hacktastic way of getting sysname from uname ()
if (uname (buf) == 0) {
string os = Marshal.PtrToStringAnsi (buf);
if (os == "Darwin")
return true;
}
} catch {
} finally {
if (buf != IntPtr.Zero)
Marshal.FreeHGlobal (buf);
}
return false;
}
#endif
} }
} }