libmusicbrainz: libmusicbrainz_3 -> libmusicbrainz_5; libmusicbrainz: 5.1.0 -> 5.1.0-unstable-2025-07-12 (#443319)

This commit is contained in:
K900
2025-09-16 05:10:23 +00:00
committed by GitHub
11 changed files with 58 additions and 136 deletions
+2 -2
View File
@@ -16,7 +16,7 @@
withLame ? false,
lame,
withMusicbrainz ? false,
libmusicbrainz5,
libmusicbrainz,
withTaglib ? true,
taglib_1,
@@ -129,7 +129,7 @@ let
{
names = [ "MUSICBRAINZ" ];
enable = withMusicbrainz;
pkgs = [ libmusicbrainz5 ];
pkgs = [ libmusicbrainz ];
}
{
names = [ "ONLINE_SERVICES" ];
+2 -2
View File
@@ -8,7 +8,7 @@
ffmpeg-headless,
libcdio,
libcdio-paranoia,
libmusicbrainz5,
libmusicbrainz,
curl,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
ffmpeg-headless
libcdio
libcdio-paranoia
libmusicbrainz5
libmusicbrainz
curl
];
@@ -0,0 +1,46 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
neon,
libdiscid,
libxml2,
pkg-config,
}:
stdenv.mkDerivation {
pname = "libmusicbrainz";
version = "5.1.0-unstable-2025-07-12";
src = fetchFromGitHub {
owner = "metabrainz";
repo = "libmusicbrainz";
rev = "4efbed3afae11ef68281816088d7cf3d0f704dfe";
hash = "sha256-2nMm+vm/uOT7AzTQIvfpmBsNYApZF0mekDEgt7tC6fw=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
neon
libdiscid
libxml2
];
meta = {
homepage = "http://musicbrainz.org/doc/libmusicbrainz";
description = "MusicBrainz Client Library";
longDescription = ''
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.
'';
platforms = lib.platforms.all;
license = lib.licenses.lgpl21Plus;
};
}
+2 -2
View File
@@ -10,7 +10,7 @@
cjs,
gtksourceview4,
gobject-introspection,
libmusicbrainz5,
libmusicbrainz,
webkitgtk_4_1,
clutter-gtk,
clutter-gst,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
cjs
gtksourceview4
libmusicbrainz5
libmusicbrainz
webkitgtk_4_1
clutter-gtk
clutter-gst
+2 -2
View File
@@ -14,7 +14,7 @@
gnome,
adwaita-icon-theme,
gst_all_1,
libmusicbrainz5,
libmusicbrainz,
libdiscid,
isocodes,
gsettings-desktop-schemas,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libcanberra-gtk3
adwaita-icon-theme
gsettings-desktop-schemas
libmusicbrainz5
libmusicbrainz
libdiscid
isocodes
gst_all_1.gstreamer
@@ -1,58 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
neon,
libdiscid,
libxml2,
pkg-config,
}:
stdenv.mkDerivation rec {
version = "5.1.0";
pname = "libmusicbrainz";
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
neon
libdiscid
libxml2
];
src = fetchFromGitHub {
owner = "metabrainz";
repo = "libmusicbrainz";
sha256 = "0ah9kaf3g3iv1cps2vs1hs33nfbjfx1xscpjgxr1cg28p4ri6jhq";
rev = "release-${version}";
};
patches = [
# Fix build with libxml2 2.12
(fetchpatch {
url = "https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7.patch";
hash = "sha256-4VxTohLpjUNnNZGIoRpBjUz71mLP3blg4oFL7itnJnY=";
})
(fetchpatch {
url = "https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02.patch";
hash = "sha256-hKYY4BJLh/Real3NugLwzc4gPBQ3NB/F63iI/aV8Wh8=";
})
];
dontUseCmakeBuildDir = true;
meta = with lib; {
homepage = "http://musicbrainz.org/doc/libmusicbrainz";
description = "MusicBrainz Client Library (5.x version)";
longDescription = ''
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
platforms = platforms.all;
license = licenses.lgpl21;
};
}
@@ -1,40 +0,0 @@
{
lib,
stdenv,
fetchurl,
cmake,
neon,
libdiscid,
}:
stdenv.mkDerivation rec {
pname = "libmusicbrainz";
version = "3.0.3";
nativeBuildInputs = [ cmake ];
buildInputs = [
neon
libdiscid
];
src = fetchurl {
url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz";
sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
};
patches = [
# Fix spacing around string literal for modern clang
./v3-darwin.patch
];
meta = with lib; {
homepage = "http://musicbrainz.org/doc/libmusicbrainz";
description = "MusicBrainz Client Library (3.x version)";
longDescription = ''
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
platforms = platforms.all;
license = licenses.lgpl21;
};
}
@@ -1,22 +0,0 @@
diff --git a/src/webservice.cpp b/src/webservice.cpp
index 3a36167..df14812 100644
--- a/src/webservice.cpp
+++ b/src/webservice.cpp
@@ -184,7 +184,7 @@ WebService::get(const std::string &entity,
if (!sess)
throw WebServiceError("ne_session_create() failed.");
ne_set_server_auth(sess, httpAuth, this);
- ne_set_useragent(sess, PACKAGE"/"VERSION);
+ ne_set_useragent(sess, PACKAGE "/" VERSION);
// Use proxy server
if (!d->proxyHost.empty()) {
@@ -269,7 +269,7 @@ WebService::post(const std::string &entity,
if (!sess)
throw WebServiceError("ne_session_create() failed.");
ne_set_server_auth(sess, httpAuth, this);
- ne_set_useragent(sess, PACKAGE"/"VERSION);
+ ne_set_useragent(sess, PACKAGE "/" VERSION);
// Use proxy server
if (!d->proxyHost.empty()) {
+2 -2
View File
@@ -1,9 +1,9 @@
{
mkKdeDerivation,
libmusicbrainz5,
libmusicbrainz,
}:
mkKdeDerivation {
pname = "libkcddb";
extraBuildInputs = [ libmusicbrainz5 ];
extraBuildInputs = [ libmusicbrainz ];
}
+2
View File
@@ -1314,6 +1314,8 @@ mapAliases {
libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
-6
View File
@@ -8183,12 +8183,6 @@ with pkgs;
libmicrohttpd = libmicrohttpd_1_0;
libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
libmusicbrainz = libmusicbrainz3;
libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
libpeas = callPackage ../development/libraries/libpeas { };