Revert "Merge pull request #10514 from Bond-009/skia3"

This reverts commit 0bac1eab98, reversing changes made to 4df1003029. Causes segfaults on startup.
Bump version to 10.8.12
2026-01-16 08:08:16 +00:00 · 2023-11-05 11:47:36 -05:00 · 2023-11-04 14:42:59 -04:00 · 2023-11-04 14:36:05 -04:00 · 2023-11-04 14:16:10 -04:00 · 2023-11-05 01:09:07 +08:00
15 changed files with 41 additions and 20 deletions
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -36,7 +36,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.8.11</VersionPrefix>
+    <VersionPrefix>10.8.12</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -244,7 +244,8 @@ namespace Jellyfin.Api.Controllers
                .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

            if (includeItemTypes.Length == 1
-                && includeItemTypes[0] == BaseItemKind.BoxSet)
+                && (includeItemTypes[0] == BaseItemKind.Playlist
+                    || includeItemTypes[0] == BaseItemKind.BoxSet))
            {
                parentId = null;
            }
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -18,7 +18,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.8.11</VersionPrefix>
+    <VersionPrefix>10.8.12</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.8.11</VersionPrefix>
+    <VersionPrefix>10.8.12</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.8.11</VersionPrefix>
+    <VersionPrefix>10.8.12</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -627,14 +627,20 @@ namespace MediaBrowser.Controller.MediaEncoding
        private string GetVaapiDeviceArgs(string renderNodePath, string driver, string kernelDriver, string alias)
        {
            alias ??= VaapiAlias;
-            renderNodePath = renderNodePath ?? "/dev/dri/renderD128";
-            var options = string.IsNullOrEmpty(driver)
-                ? renderNodePath
-                : ",driver=" + driver + (string.IsNullOrEmpty(kernelDriver) ? string.Empty : ",kernel_driver=" + kernelDriver);
+
+            // 'renderNodePath' has higher priority than 'kernelDriver'
+            var driverOpts = string.IsNullOrEmpty(renderNodePath)
+                ? (string.IsNullOrEmpty(kernelDriver) ? string.Empty : ",kernel_driver=" + kernelDriver)
+                : renderNodePath;
+
+            // 'driver' behaves similarly to env LIBVA_DRIVER_NAME
+            driverOpts += string.IsNullOrEmpty(driver) ? string.Empty : ",driver=" + driver;
+
+            var options = string.IsNullOrEmpty(driverOpts) ? string.Empty : ":" + driverOpts;

            return string.Format(
                CultureInfo.InvariantCulture,
-                " -init_hw_device vaapi={0}:{1}",
+                " -init_hw_device vaapi={0}{1}",
                alias,
                options);
        }
@@ -739,14 +745,14 @@ namespace MediaBrowser.Controller.MediaEncoding

                if (_mediaEncoder.IsVaapiDeviceInteliHD)
                {
-                    args.Append(GetVaapiDeviceArgs(null, "iHD", null, VaapiAlias));
+                    args.Append(GetVaapiDeviceArgs(options.VaapiDevice, "iHD", null, VaapiAlias));
                }
                else if (_mediaEncoder.IsVaapiDeviceInteli965)
                {
                    // Only override i965 since it has lower priority than iHD in libva lookup.
                    Environment.SetEnvironmentVariable("LIBVA_DRIVER_NAME", "i965");
                    Environment.SetEnvironmentVariable("LIBVA_DRIVER_NAME_JELLYFIN", "i965");
-                    args.Append(GetVaapiDeviceArgs(null, "i965", null, VaapiAlias));
+                    args.Append(GetVaapiDeviceArgs(options.VaapiDevice, "i965", null, VaapiAlias));
                }
                else
                {
@@ -2070,7 +2076,7 @@ namespace MediaBrowser.Controller.MediaEncoding
            var outputScaleFactor = GetVideoBitrateScaleFactor(outputVideoCodec);

            // Don't scale the real bitrate lower than the requested bitrate
-            var scaleFactor = Math.Min(outputScaleFactor / inputScaleFactor, 1);
+            var scaleFactor = Math.Max(outputScaleFactor / inputScaleFactor, 1);

            if (bitrate <= 500000)
            {
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>10.8.11</VersionPrefix>
+    <VersionPrefix>10.8.12</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("10.8.11")]
-[assembly: AssemblyFileVersion("10.8.11")]
+[assembly: AssemblyVersion("10.8.12")]
+[assembly: AssemblyFileVersion("10.8.12")]
--- a/build.yaml
+++ b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.8.11"
+version: "10.8.12"
 packages:
  - debian.amd64
  - debian.arm64
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jellyfin-server (10.8.12-1) unstable; urgency=medium
+
+  * New upstream version 10.8.12; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.12
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Sat, 04 Nov 2023 14:42:37 -0400
+
 jellyfin-server (10.8.11-1) unstable; urgency=medium

  * New upstream version 10.8.11; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.11
--- a/debian/conf/jellyfin
+++ b/debian/conf/jellyfin
@@ -27,6 +27,9 @@ JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh"
 # ffmpeg binary paths, overriding the system values
 JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg"

+# Disable glibc dynamic heap adjustment
+MALLOC_TRIM_THRESHOLD_=131072
+
 # [OPTIONAL] run Jellyfin as a headless service
 #JELLYFIN_SERVICE_OPT="--service"

--- a/debian/metapackage/jellyfin
+++ b/debian/metapackage/jellyfin
@@ -5,7 +5,7 @@ Homepage: https://jellyfin.org
 Standards-Version: 3.9.2

 Package: jellyfin
-Version: 10.8.11
+Version: 10.8.12
 Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
 Depends: jellyfin-server, jellyfin-web
 Description: Provides the Jellyfin Free Software Media System
--- a/fedora/jellyfin.env
+++ b/fedora/jellyfin.env
@@ -26,6 +26,9 @@ JELLYFIN_CACHE_DIR="/var/cache/jellyfin"
 # In-App service control
 JELLYFIN_RESTART_OPT="--restartpath=/usr/libexec/jellyfin/restart.sh"

+# Disable glibc dynamic heap adjustment
+MALLOC_TRIM_THRESHOLD_=131072
+
 # [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values
 #JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg"

--- a/fedora/jellyfin.spec
+++ b/fedora/jellyfin.spec
@@ -7,7 +7,7 @@
 %endif

 Name:           jellyfin
-Version:        10.8.11
+Version:        10.8.12
 Release:        1%{?dist}
 Summary:        The Free Software Media System
 License:        GPLv2
@@ -179,6 +179,8 @@ fi
 %systemd_postun_with_restart jellyfin.service

 %changelog
+* Sat Nov 04 2023 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.8.12; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.12
 * Sat Sep 23 2023 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.8.11; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.11
 * Sun Apr 23 2023 Jellyfin Packaging Team <packaging@jellyfin.org>
--- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
+++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
@@ -13,7 +13,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Extensions</PackageId>
-    <VersionPrefix>10.8.11</VersionPrefix>
+    <VersionPrefix>10.8.12</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
Author	SHA1	Message	Date
Joshua M. Boniface	a173d01139	Revert "Merge pull request #10514 from Bond-009/skia3" This reverts commit `0bac1eab98`, reversing changes made to `4df1003029`. Causes segfaults on startup.	2023-11-05 11:47:36 -05:00
Joshua M. Boniface	3e7fad55de	Bump version to 10.8.12	2023-11-04 14:42:59 -04:00
Joshua M. Boniface	8cd685a4e9	Merge pull request #10528 from nyanmisaka/backport-10451 Fix mismatched intel VAAPI UMD/KMD - Backport #10451	2023-11-04 14:36:05 -04:00
Joshua M. Boniface	9d565bbb83	Merge pull request #10454 from Shadowghost/env Add MALLOC_TRIM_THRESHOLD_ to default ENV	2023-11-04 14:16:10 -04:00
nyanmisaka	ab855af95e	Fix mismatched intel VAAPI UMD/KMD introduced by pull request #10451 Signed-off-by: nyanmisaka <nst799610810@gmail.com>	2023-11-05 01:09:07 +08:00
Claus Vium	0bac1eab98	Merge pull request #10514 from Bond-009/skia3 Update SkiaSharp (v2.88.6) and BlurHashSharp (v1.3.1)	2023-11-02 08:58:34 +01:00
Bond_009	97c2ba0115	Update SkiaSharp (v2.88.6) and BlurHashSharp (v1.3.1)	2023-11-01 23:47:04 +01:00
Cody Robibero	4df1003029	Merge pull request #10487 from thornbill/backport-9485 Fix scaleFactor limit - Backport #9738	2023-10-28 08:44:56 -06:00
Oliver Weyhmüller	3269ce56ca	Fix scaleFactor limitation to 1 introduced by pull request #9485	2023-10-28 01:02:27 -04:00
Claus Vium	ce8eddd484	Merge pull request #10406 from thornbill/fix-playlists Fix playlist listings	2023-10-27 09:47:11 +02:00
Shadowghost	5e2872509a	Add MALLOC_TRIM_THRESHOLD_=131072 to default ENV	2023-10-22 17:55:36 +02:00
Bill Thornton	d3f4dcf6f6	Revert "Don't ignore parentId for playlists" This reverts commit `98c6c34fbb`.	2023-10-15 02:16:27 -04:00