Browse Source

another attempt at fixing nvidia startup (#2506)

* another attempt at fixing nvidia startup

* update dependencies
pull/2507/head
Jason Dove 3 months ago committed by GitHub
parent
commit
d5fd8e7be6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 9
      ErsatzTV.FFmpeg/Capabilities/Nvidia/NvEncSharpRedirector.cs
  2. 2
      ErsatzTV.Infrastructure.MySql/ErsatzTV.Infrastructure.MySql.csproj
  3. 2
      ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj
  4. 4
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  5. 2
      ErsatzTV/ErsatzTV.csproj
  6. 9
      ErsatzTV/Services/RunOnce/PlatformSettingsService.cs

9
ErsatzTV.FFmpeg/Capabilities/Nvidia/NvEncSharpRedirector.cs

@ -7,14 +7,7 @@ public static class NvEncSharpRedirector @@ -7,14 +7,7 @@ public static class NvEncSharpRedirector
{
static NvEncSharpRedirector()
{
try
{
NativeLibrary.SetDllImportResolver(typeof(Lennox.NvEncSharp.LibCuda).Assembly, Resolver);
}
catch (DllNotFoundException)
{
// do nothing
}
NativeLibrary.SetDllImportResolver(typeof(Lennox.NvEncSharp.LibCuda).Assembly, Resolver);
}
private static IntPtr Resolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)

2
ErsatzTV.Infrastructure.MySql/ErsatzTV.Infrastructure.MySql.csproj

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EFCore.BulkExtensions.MySql" Version="8.1.3" />
<PackageReference Include="EFCore.BulkExtensions.MySql" Version="9.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
</ItemGroup>

2
ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj

@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="EFCore.BulkExtensions.Sqlite" Version="9.0.1" />
<PackageReference Include="EFCore.BulkExtensions.Sqlite" Version="9.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
</ItemGroup>

4
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@ -13,8 +13,8 @@ @@ -13,8 +13,8 @@
<PackageReference Include="Blurhash.SkiaSharp" Version="2.0.0" />
<PackageReference Include="CliWrap" Version="3.9.0" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="EFCore.BulkExtensions" Version="9.0.1" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.9" />
<PackageReference Include="EFCore.BulkExtensions" Version="9.0.2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.10" />
<PackageReference Include="Jint" Version="4.4.1" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00017" />
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00017" />

2
ErsatzTV/ErsatzTV.csproj

@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
<PackageReference Include="MudBlazor" Version="8.13.0" />
<PackageReference Include="NaturalSort.Extension" Version="4.4.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.8.10" />
<PackageReference Include="Scalar.AspNetCore" Version="2.8.11" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />

9
ErsatzTV/Services/RunOnce/PlatformSettingsService.cs

@ -17,7 +17,14 @@ public class PlatformSettingsService(IServiceScopeFactory serviceScopeFactory) : @@ -17,7 +17,14 @@ public class PlatformSettingsService(IServiceScopeFactory serviceScopeFactory) :
IRuntimeInfo runtimeInfo = scope.ServiceProvider.GetRequiredService<IRuntimeInfo>();
if (runtimeInfo != null && runtimeInfo.IsOSPlatform(OSPlatform.Linux))
{
NvEncSharpRedirector.Init();
try
{
NvEncSharpRedirector.Init();
}
catch (DllNotFoundException)
{
// do nothing
}
if (Directory.Exists("/dev/dri"))
{

Loading…
Cancel
Save