From 17037d293ae5e94ae2709db6701d7bc70e91480d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 11 Feb 2025 13:04:19 +0100 Subject: [PATCH] taglib: 1.13.1 -> 2.0.2, taglib_1: init at 1.13.1 --- pkgs/applications/audio/ardour/7.nix | 4 +- .../applications/audio/clementine/default.nix | 4 +- .../audio/soundkonverter/default.nix | 4 +- .../obs-studio/plugins/obs-tuna/default.nix | 2 - pkgs/by-name/ca/cantata/package.nix | 4 +- pkgs/by-name/ea/easytag/package.nix | 4 +- pkgs/by-name/lo/loudgain/package.nix | 4 +- pkgs/by-name/ta/taglib/package.nix | 14 ++--- pkgs/by-name/ta/taglib_1/package.nix | 58 +++++++++++++++++++ pkgs/by-name/ta/taglib_extras/package.nix | 12 +++- pkgs/by-name/vl/vlc/package.nix | 4 +- .../deepin/apps/deepin-music/default.nix | 4 +- .../deepin/core/dde-grand-search/default.nix | 4 +- .../services/lomiri-thumbnailer/default.nix | 9 +++ .../lomiri/services/mediascanner2/default.nix | 8 +++ .../compilers/chicken/5/overrides.nix | 4 +- .../ocaml-modules/taglib/default.nix | 4 +- .../python-modules/pytaglib/default.nix | 4 +- .../ruby-modules/gem-config/default.nix | 4 +- pkgs/top-level/ocaml-packages.nix | 2 +- 20 files changed, 120 insertions(+), 37 deletions(-) create mode 100644 pkgs/by-name/ta/taglib_1/package.nix diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index 66be0adf0de9..0830ff4ddf54 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -52,7 +52,7 @@ soundtouch, sratom, suil, - taglib, + taglib_1, vamp-plugin-sdk, wafHook, xjadeo, @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { soundtouch sratom suil - taglib + taglib_1 vamp-plugin-sdk ] ++ lib.optionals videoSupport [ diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 2422511f1275..d3a39fa521d9 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -11,7 +11,7 @@ qtbase, qtx11extras, qttools, - taglib, + taglib_1, fftw, glew, qjson, @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { qtx11extras qttools sqlite - taglib + taglib_1 alsa-lib ] # gst_plugins needed for setup-hooks diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 1155ba492ddf..60e175984780 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -19,7 +19,7 @@ kxmlgui, qtbase, phonon, - taglib, + taglib_1, # optional backends withCD ? true, cdparanoia, @@ -131,7 +131,7 @@ mkDerivation rec { qtbase phonon ]; - buildInputs = [ taglib ] ++ runtimeDeps; + buildInputs = [ taglib_1 ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 78087e4ed446..7aa5e936ef35 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -6,7 +6,6 @@ cmake, zlib, curl, - taglib, dbus, pkg-config, qtbase, @@ -27,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { qtbase zlib curl - taglib dbus ]; diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix index 7bb809dae7ee..cb96570ca55b 100644 --- a/pkgs/by-name/ca/cantata/package.nix +++ b/pkgs/by-name/ca/cantata/package.nix @@ -19,7 +19,7 @@ libmusicbrainz5, withTaglib ? true, - taglib, + taglib_1, taglib_extras, withHttpStream ? true, withReplaygain ? true, @@ -139,7 +139,7 @@ let ]; enable = withTaglib; pkgs = [ - taglib + taglib_1 taglib_extras ]; } diff --git a/pkgs/by-name/ea/easytag/package.nix b/pkgs/by-name/ea/easytag/package.nix index d90735294d44..9978861a6873 100644 --- a/pkgs/by-name/ea/easytag/package.nix +++ b/pkgs/by-name/ea/easytag/package.nix @@ -8,7 +8,7 @@ glib, libid3tag, id3lib, - taglib, + taglib_1, libvorbis, libogg, opusfile, @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { glib libid3tag id3lib - taglib + taglib_1 libvorbis libogg opusfile diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix index 85480eccdbdf..0a29ea0e7e3d 100644 --- a/pkgs/by-name/lo/loudgain/package.nix +++ b/pkgs/by-name/lo/loudgain/package.nix @@ -7,7 +7,7 @@ ffmpeg, libebur128, libresample, - taglib, + taglib_1, zlib, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ffmpeg libebur128 libresample - taglib + taglib_1 zlib ]; diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix index 865ee774ddee..1f93bf749102 100644 --- a/pkgs/by-name/ta/taglib/package.nix +++ b/pkgs/by-name/ta/taglib/package.nix @@ -3,33 +3,33 @@ stdenv, fetchFromGitHub, cmake, + utf8cpp, zlib, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "taglib"; - version = "1.13.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; rev = "v${finalAttrs.version}"; - hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; + hash = "sha256-3cJwCo2nUSRYkk8H8dzyg7UswNPhjfhyQ704Fn9yNV8="; }; strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; + buildInputs = [ + zlib + utf8cpp + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - # Workaround unconditional ${prefix} until upstream is fixed: - # https://github.com/taglib/taglib/issues/1098 - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/ta/taglib_1/package.nix b/pkgs/by-name/ta/taglib_1/package.nix new file mode 100644 index 000000000000..865ee774ddee --- /dev/null +++ b/pkgs/by-name/ta/taglib_1/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "taglib"; + version = "1.13.1"; + + src = fetchFromGitHub { + owner = "taglib"; + repo = "taglib"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + # Workaround unconditional ${prefix} until upstream is fixed: + # https://github.com/taglib/taglib/issues/1098 + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + homepage = "https://taglib.org/"; + description = "Library for reading and editing audio file metadata"; + mainProgram = "taglib-config"; + longDescription = '' + TagLib is a library for reading and editing the meta-data of several + popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 + files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, + Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. + ''; + license = with lib.licenses; [ + lgpl21Only + mpl11 + ]; + maintainers = with lib.maintainers; [ ttuegel ]; + pkgConfigModules = [ + "taglib" + "taglib_c" + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ta/taglib_extras/package.nix b/pkgs/by-name/ta/taglib_extras/package.nix index 163f9afe3805..03af392d0c0d 100644 --- a/pkgs/by-name/ta/taglib_extras/package.nix +++ b/pkgs/by-name/ta/taglib_extras/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cmake, taglib, zlib, @@ -11,9 +12,18 @@ stdenv.mkDerivation rec { pname = "taglib-extras"; version = "1.0.1"; src = fetchurl { - url = "https://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/${version}/src/${pname}-${version}.tar.gz"; + url = "https://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; + + patches = [ + (fetchurl { + name = "2001-taglib-extras-Fix-taglib-2.x-compat.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/taglib-2.0.diff?h=taglib-extras&id=5826657b841b138c501e0633d1c9333fe9197b00"; + hash = "sha256-yhme2KcIS5SPXz+mx/R2OiLV57WHz6WW8LJtYab4h5I="; + }) + ]; + buildInputs = [ taglib ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 4b9269bf4b90..f286972bf63d 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -81,7 +81,7 @@ srt, stdenv, systemd, - taglib, + taglib_1, unzip, wayland, wayland-protocols, @@ -194,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { speex srt systemd - taglib + taglib_1 xcbutilkeysyms wayland-scanner # only required for configure script zlib diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 95cd7cf4664d..11482fe170d2 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -12,7 +12,7 @@ ffmpeg_6, libvlc, qt6Packages, - taglib, + taglib_1, SDL2, gst_all_1, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { qt6Packages.qtmultimedia ffmpeg_6 libvlc - taglib + taglib_1 SDL2 ] ++ (with gst_all_1; [ diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 89e22adcd0fe..66fe532c9f0c 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -11,7 +11,7 @@ deepin-pdfium, qt5integration, qt5platform-plugins, - taglib, + taglib_1, ffmpeg, ffmpegthumbnailer, pcre, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { deepin-pdfium qt5integration qt5platform-plugins - taglib + taglib_1 ffmpeg ffmpegthumbnailer pcre diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index a9cb0b7da1d9..b07f8a7c3c79 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, nixosTests, testers, @@ -48,6 +49,14 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ + # Fix compat with taglib 2.x + # Remove when version > 3.0.4 + (fetchpatch { + name = "0001-lomiri-thumbnailer-Fix-taglib-2.x-compat.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/b7f1055e36cd6e33314bb9f6648f93e977a33267.patch"; + hash = "sha256-9RHtxqsgdMkgIyswaeL5yS6+o/YvzT+HgRD8KL/RfNM="; + }) + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release ./1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch ./1002-Re-enable-documentation.patch diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 86172e2774c6..1467119fb204 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -52,6 +52,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch"; hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4="; }) + + # Fix taglib 2.x compat + # Remove when version > 0.117 + (fetchpatch { + name = "0002-mediascanner2-Fix-taglib-2.x-compat.patch"; + url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/0ce744ecb32abb39516d1b9f98d47c3e86690158.patch"; + hash = "sha256-hz/EB83yNoxhxkEcg7ZMezknpKajhH1BNkYD3wrf/eY="; + }) ]; postPatch = '' diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 5af2874d3394..92b1104d9039 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -188,10 +188,10 @@ in old: (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) // (addToCscOptions "-L -lncurses" old); taglib = old: - (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) + (addToBuildInputs [ pkgs.zlib pkgs.taglib_1 ] old) // ( # needed for tablib-config to be in PATH - addToNativeBuildInputs pkgs.taglib old + addToNativeBuildInputs pkgs.taglib_1 old ); uuid-lib = addToBuildInputs pkgs.libuuid; webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; diff --git a/pkgs/development/ocaml-modules/taglib/default.nix b/pkgs/development/ocaml-modules/taglib/default.nix index 58bfb599272a..ca0a47a356b0 100644 --- a/pkgs/development/ocaml-modules/taglib/default.nix +++ b/pkgs/development/ocaml-modules/taglib/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, dune-configurator, pkg-config, - taglib, + taglib_1, zlib, }: @@ -24,7 +24,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - taglib + taglib_1 zlib ]; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index a05c94958e6b..9a490952ec02 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - taglib, + taglib_1, cython, pytestCheckHook, pythonOlder, @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ cython - taglib + taglib_1 ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 86feb7df0703..85c14b2731d8 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk3, lerc, buildRubyGem , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz +, file, libvirt, glib, vips, taglib_1, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook3, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml @@ -848,7 +848,7 @@ in }; taglib-ruby = attrs: { - buildInputs = [ taglib ]; + buildInputs = [ taglib_1 ]; }; timfel-krb5-auth = attrs: { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7c216103317c..c01100df295b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1834,7 +1834,7 @@ let ### T ### taglib = callPackage ../development/ocaml-modules/taglib { - inherit (pkgs) taglib; + inherit (pkgs) taglib_1; }; tar = callPackage ../development/ocaml-modules/tar { };