ffmpeg: add options for more subtitle decoding formats (#340587)

pkgs/by-name/zv/zvbi/package.nix

@@ -0,0 +1,57 @@
+{
+  autoreconfHook,
+  fetchFromGitHub,
+  gitUpdater,
+  lib,
+  libiconv,
+  stdenv,
+  testers,
+  validatePkgConfig,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zvbi";
+  version = "0.2.42";
+
+  src = fetchFromGitHub {
+    owner = "zapping-vbi";
+    repo = "zvbi";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-IeSGscgz51IndX6Xbu8Kw8GcJ9MLXXFhV+4LvnVkrLE=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    validatePkgConfig
+  ];
+
+  buildInputs = lib.optional stdenv.isDarwin libiconv;
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "Vertical Blanking Interval (VBI) utilities";
+    homepage = "https://github.com/zapping-vbi/zvbi";
+    changelog = "https://github.com/zapping-vbi/zvbi/blob/v${finalAttrs.version}/ChangeLog";
+    pkgConfigModules = [ "zvbi-0.2" ];
+    license = with lib.licenses; [
+      bsd2
+      bsd3
+      gpl2
+      gpl2Plus
+      lgpl21Plus
+      lgpl2Plus
+      mit
+    ];
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+})

pkgs/development/libraries/ffmpeg/generic.nix

@@ -37,6 +37,7 @@
 , withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding
 , withAom ? withHeadlessDeps # AV1 reference encoder
 , withAppKit ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AppKit framework
+, withAribb24 ? withFullDeps # ARIB text and caption decoding
 , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
 , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering
 , withAudioToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AudioToolbox
@@ -144,6 +145,7 @@
 , withZimg ? withHeadlessDeps
 , withZlib ? withHeadlessDeps
 , withZmq ? withFullDeps # Message passing
+, withZvbi ? withFullDeps # Teletext support
 
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
@@ -226,6 +228,7 @@
 , alsa-lib
 , amf
 , amf-headers
+, aribb24
 , avisynthplus
 , bzip2
 , celt
@@ -328,6 +331,7 @@
 , zeromq4
 , zimg
 , zlib
+, zvbi
 /*
  *  Darwin frameworks
  */
@@ -557,6 +561,7 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withAmf "amf")
     (enableFeature withAom "libaom")
     (enableFeature withAppKit "appkit")
+    (enableFeature withAribb24 "libaribb24")
   ] ++ optionals (versionAtLeast version "6.1") [
     (enableFeature withAribcaption "libaribcaption")
   ] ++ [
@@ -687,6 +692,7 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withZimg "libzimg")
     (enableFeature withZlib "zlib")
     (enableFeature withZmq "libzmq")
+    (enableFeature withZvbi "libzvbi")
     /*
      * Developer flags
      */
@@ -730,6 +736,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withAmf [ amf-headers ]
   ++ optionals withAom [ libaom ]
   ++ optionals withAppKit [ AppKit ]
+  ++ optionals withAribb24 [ aribb24 ]
   ++ optionals withAribcaption [ libaribcaption ]
   ++ optionals withAss [ libass ]
   ++ optionals withAudioToolbox [ AudioToolbox ]
@@ -826,6 +833,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withZimg [ zimg ]
   ++ optionals withZlib [ zlib ]
   ++ optionals withZmq [ zeromq4 ]
+  ++ optionals withZvbi [ zvbi ]
   ;
 
   buildFlags = [ "all" ]