January 2024 - crux-commits

ports/contrib (3.7): swayr: 0.27.1 -> 0.27.3
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit 90f952fa53bb3e316f1e4a4a2452999463ac16b6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 20:09:15 2024 +0100 swayr: 0.27.1 -> 0.27.3 diff --git a/swayr/.signature b/swayr/.signature index 53c85e0a5..4e11f392f 100644 --- a/swayr/.signature +++ b/swayr/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30l6jVlyKtiVLtN7t6wC+eHtNLZLI8WpuTrPSS2b0oUjHgjGaYR6TMBcrDZeh62iYFmhfmEtxIndhTPupxzF/gM= -SHA256 (Pkgfile) = b5eef14597c3b45071b0bec0128546c7fac590ae68cff3aa3bb52a27987a1f28 +RWSagIOpLGJF35nFSEZvlJeaawBeMks6v3MtJxqU/locULzJV7GqWmyN/QnS7SqVBRYSslUJxUq5CNJomfH/13dIpOAULE6xmgc= +SHA256 (Pkgfile) = f5a67b31c4b4813d7287a282e65da9ec5f4fb5342881469222e1652383517ec5 SHA256 (.footprint) = 787fa9714fc9c7b81545303008be790bb8c9d01fbaf8315b2ef3feb792889160 -SHA256 (swayr-0.27.1.tar.gz) = 769b58c73b5acd0a04f3bc835906102012ef919ab6f8f943e0b9d07a4b191381 +SHA256 (swayr-0.27.3.tar.gz) = ff8fe0a97213cbf1a99922b6a1ff8e46f17bb9bf13941c0679efdd6416a51166 diff --git a/swayr/Pkgfile b/swayr/Pkgfile index cd50427bb..914e52d66 100644 --- a/swayr/Pkgfile +++ b/swayr/Pkgfile @@ -4,10 +4,10 @@ # Depends on: rust name=swayr -version=0.27.1 +version=0.27.3 release=1 # https://git.sr.ht/~tsdh/swayr/refs -_commit=4978d36aea7d0672ee255d183f84be5f1670890b +_commit=f0fabc4bacdc5d663500c601c99b15a6b54438bf source=(https://git.sr.ht/~tsdh/swayr/archive/$_commit.tar.gz) renames=($name-$version.tar.gz)

1 0

ports/contrib (3.7): ncmpcpp: rebuilt for taglib 2.0
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit 1c7a7fdcbd1d6fa033a758f99302904c1c5eff06 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 16:19:09 2024 +0100 ncmpcpp: rebuilt for taglib 2.0 diff --git a/ncmpcpp/.signature b/ncmpcpp/.signature index cd51769d5..93b7a4c7e 100644 --- a/ncmpcpp/.signature +++ b/ncmpcpp/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yMAwTeWaV+4KkyH9tz6/OC8qArntV64sqPRVq6qE5QDYemNrws5EbLo02aWxE5hBJQo+KnmwA5yN/u7u5gEigc= -SHA256 (Pkgfile) = 125d5ae6b8830b7b861b92bd04db28811c1c3575bd794f54f087e9fa458983d1 +RWSagIOpLGJF34ab/EP+iVaGL1QsX32Riy3FDjcSkDV6WgmyVtELIi7L7Q9At3iGqvTpYe2Y3RTCNXmbVdcDFpqzBgawA3/dhwQ= +SHA256 (Pkgfile) = 655d4eb065a4cc177d07a8f3d99300490478be99dce1314b35db3586a545df79 SHA256 (.footprint) = 106b3c28574a9591fa92d0c5c8ee8e0bc78a394a48840175cb2ab8f71b7b0ceb SHA256 (ncmpcpp-0.9.2.tar.gz) = 9321275e26ad4308448e661bb879b96d446b203cf57b3591db17b186387a7847 +SHA256 (taglib.patch) = 90faf21a408fce5fea6fa9f9239fcd50f708ce272afb4694c82078fa4cd2e7f1 diff --git a/ncmpcpp/Pkgfile b/ncmpcpp/Pkgfile index 107a1802b..290d1ed84 100644 --- a/ncmpcpp/Pkgfile +++ b/ncmpcpp/Pkgfile @@ -7,13 +7,17 @@ name=ncmpcpp version=0.9.2 release=2 -source=(https://github.com/arybczak/$name/archive/$version/$name-$version.tar.gz) +source=(https://github.com/arybczak/$name/archive/$version/$name-$version.tar.gz + taglib.patch) build() { cd $name-$version - [[ -e /usr/lib/pkgconfig/fftw3.pc ]] && PKGMK_NCMPCPP+=' --with-fftw --enable-visualizer' - [[ -e /usr/lib/pkgconfig/taglib.pc ]] && PKGMK_NCMPCPP+=' --with-taglib' + prt-get isinst fftw && PKGMK_NCMPCPP+=' --with-fftw --enable-visualizer' + prt-get isinst taglib && PKGMK_NCMPCPP+=' --with-taglib' + + patch -Np1 -i $SRC/taglib.patch + ./autogen.sh ./configure $PKGMK_NCMPCPP \ --prefix=/usr \ diff --git a/ncmpcpp/taglib.patch b/ncmpcpp/taglib.patch new file mode 100644 index 000000000..51f3f2543 --- /dev/null +++ b/ncmpcpp/taglib.patch @@ -0,0 +1,47 @@ +--- ncmpcpp-0.9.2/src/tags.cpp.old 2024-01-28 16:15:20.612778227 +0100 ++++ ncmpcpp-0.9.2/src/tags.cpp 2024-01-28 16:15:30.945741026 +0100 +@@ -40,6 +40,8 @@ + #include "utility/string.h" + #include "utility/wide_string.h" + ++#include <taglib/taglib.h> ++ + namespace { + + TagLib::StringList tagList(const MPD::MutableSong &s, MPD::Song::GetFunction f) +@@ -122,12 +124,20 @@ + tag->setArtist(ToWString(s.getArtist())); + tag->setAlbum(ToWString(s.getAlbum())); + try { +- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate())); ++ #if (TAGLIB_MAJOR_VERSION >= 2) ++ tag->setYear(boost::lexical_cast<unsigned int>(s.getDate())); ++ #else ++ tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate())); ++ #endif + } catch (boost::bad_lexical_cast &) { + std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n"; + } + try { +- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack())); ++ #if (TAGLIB_MAJOR_VERSION >= 2) ++ tag->setTrack(boost::lexical_cast<unsigned int>(s.getTrack())); ++ #else ++ tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack())); ++ #endif + } catch (boost::bad_lexical_cast &) { + std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n"; + } +@@ -294,7 +304,11 @@ + { + writeID3v2Tags(s, mpeg_file->ID3v2Tag(true)); + // write id3v2.4 tags only +- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false)) ++ #if (TAGLIB_MAJOR_VERSION >= 2) ++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, TagLib::File::StripNone, TagLib::ID3v2::Version::v4, TagLib::File::DuplicateTags::DoNotDuplicate)) ++ #else ++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false)) ++ #endif + return false; + // do not call generic save() as it will duplicate tags + saved = true;

1 0

ports/opt (3.7): c-ares: 1.25.0 -> 1.26.0
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit a85ec54a179b1a9ec763241fa2237bb3e21d3569 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 10:11:17 2024 +0100 c-ares: 1.25.0 -> 1.26.0 diff --git a/c-ares/.footprint b/c-ares/.footprint index 4847043fb..9369950ce 100644 --- a/c-ares/.footprint +++ b/c-ares/.footprint @@ -18,8 +18,8 @@ drwxr-xr-x root/root usr/lib/cmake/c-ares/ -rw-r--r-- root/root usr/lib/cmake/c-ares/c-ares-targets-release.cmake -rw-r--r-- root/root usr/lib/cmake/c-ares/c-ares-targets.cmake lrwxrwxrwx root/root usr/lib/libcares.so -> libcares.so.2 -lrwxrwxrwx root/root usr/lib/libcares.so.2 -> libcares.so.2.10.1 --rwxr-xr-x root/root usr/lib/libcares.so.2.10.1 +lrwxrwxrwx root/root usr/lib/libcares.so.2 -> libcares.so.2.11.0 +-rwxr-xr-x root/root usr/lib/libcares.so.2.11.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libcares.pc drwxr-xr-x root/root usr/share/ diff --git a/c-ares/.signature b/c-ares/.signature index 59aad43db..d387fe51c 100644 --- a/c-ares/.signature +++ b/c-ares/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/V3UuXMGqq9sGaEox2fh7halCfK2//F+kP+qe5Q3sqHKfelt881ADV5gXtut40eL8Vio97sNVIFfuO3SHRLY0wk= -SHA256 (Pkgfile) = 06b6176189e0a7349ff1e02bf39dde83c997757c74e3b8ea385a80016d74db57 -SHA256 (.footprint) = 89ab25a47fea866cae5baabe0d21c4cdd93c3588552e100378b9a0528ed12de7 -SHA256 (c-ares-1.25.0.tar.gz) = 71832b93a48f5ff579c505f4869120c14e57b783275367207f1a98314aa724e5 +RWSE3ohX2g5d/be8gy1kl+OzOEFrIve/ufv9V/4oMc/B9eB03ov96OtBTYYUHq5BZ3rZlC+oW4ySkOaaX+ccaj/7S5+iWAc8yw0= +SHA256 (Pkgfile) = 12ef64dd109835441704a5fcb37195a61328a858e889fcd4aff47cd0636d5f53 +SHA256 (.footprint) = a8024feebe2cceb8d46e34c5f6d0edff842332738d9e69ee4bdfcc1749f49f01 +SHA256 (c-ares-1.26.0.tar.gz) = bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 diff --git a/c-ares/Pkgfile b/c-ares/Pkgfile index bf58ba546..7564f8861 100644 --- a/c-ares/Pkgfile +++ b/c-ares/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tim Biermann, tbier at posteo dot de name=c-ares -version=1.25.0 +version=1.26.0 release=1 source=(https://c-ares.haxx.se/download/$name-$version.tar.gz)

1 0

ports/opt (3.7): libidn2: 2.3.4 -> 2.3.7
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit 7d028f14f936a5f8bf2688d226a51fc6c5fc55e6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 10:10:56 2024 +0100 libidn2: 2.3.4 -> 2.3.7 diff --git a/libidn2/.footprint b/libidn2/.footprint index 2944b2f4a..d3e84fe73 100644 --- a/libidn2/.footprint +++ b/libidn2/.footprint @@ -6,9 +6,9 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libidn2.a -rwxr-xr-x root/root usr/lib/libidn2.la -lrwxrwxrwx root/root usr/lib/libidn2.so -> libidn2.so.0.3.8 -lrwxrwxrwx root/root usr/lib/libidn2.so.0 -> libidn2.so.0.3.8 --rwxr-xr-x root/root usr/lib/libidn2.so.0.3.8 +lrwxrwxrwx root/root usr/lib/libidn2.so -> libidn2.so.0.4.0 +lrwxrwxrwx root/root usr/lib/libidn2.so.0 -> libidn2.so.0.4.0 +-rwxr-xr-x root/root usr/lib/libidn2.so.0.4.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libidn2.pc drwxr-xr-x root/root usr/share/ diff --git a/libidn2/.signature b/libidn2/.signature index 178842869..289c1ffee 100644 --- a/libidn2/.signature +++ b/libidn2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dHI5yIFjv29xvaKOQ+8JGZ27pIxHgrj/1pBacEGEpBz/Q3c3G7FYJNZpcpWNMO97J+xKBTuhkFDkx4xUHeVGAY= -SHA256 (Pkgfile) = 3b52c841758a5adb69eeb3d916247c626481b9b2d714acc1449fd02685634529 -SHA256 (.footprint) = 33bd31a89a7f5886c147ac943b64ff28aa7d214e5c251f7bba0147bd274c8d5f -SHA256 (libidn2-2.3.4.tar.gz) = 93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f +RWSE3ohX2g5d/SAcha/+fDJXXyNFnEZXD9GF/CuLwrqmjO0q15s5lZpJgi6rCyNuQG3mfqCzZ1zFX6Nz+wnFlI5xesrch7Rpfwk= +SHA256 (Pkgfile) = 680afaf122efc50598eda74889abf08ac2d9d10e8fd4e8af8154a30c9a8c69d3 +SHA256 (.footprint) = 031c18f981beba746151927c9ea50f68d6176044cf5ac313b605dbf0efec2dc4 +SHA256 (libidn2-2.3.7.tar.gz) = 4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64 diff --git a/libidn2/Pkgfile b/libidn2/Pkgfile index eb3b20c69..82e611b8a 100644 --- a/libidn2/Pkgfile +++ b/libidn2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libunistring name=libidn2 -version=2.3.4 +version=2.3.7 release=1 source=(https://ftp.gnu.org/gnu/libidn/$name-$version.tar.gz)

1 0

ports/opt (3.7): orc: 0.4.35 -> 0.4.36
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit 43de58c6d31cfae6d9d5ccb444560350efce7b30 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 10:10:38 2024 +0100 orc: 0.4.35 -> 0.4.36 diff --git a/orc/.footprint b/orc/.footprint index 5cce58ced..01c78b663 100644 --- a/orc/.footprint +++ b/orc/.footprint @@ -45,11 +45,11 @@ drwxr-xr-x root/root usr/include/orc-0.4/orc/ -rw-r--r-- root/root usr/include/orc-0.4/orc/orcx86insn.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/liborc-0.4.so -> liborc-0.4.so.0 -lrwxrwxrwx root/root usr/lib/liborc-0.4.so.0 -> liborc-0.4.so.0.35.0 --rwxr-xr-x root/root usr/lib/liborc-0.4.so.0.35.0 +lrwxrwxrwx root/root usr/lib/liborc-0.4.so.0 -> liborc-0.4.so.0.36.0 +-rwxr-xr-x root/root usr/lib/liborc-0.4.so.0.36.0 lrwxrwxrwx root/root usr/lib/liborc-test-0.4.so -> liborc-test-0.4.so.0 -lrwxrwxrwx root/root usr/lib/liborc-test-0.4.so.0 -> liborc-test-0.4.so.0.35.0 --rwxr-xr-x root/root usr/lib/liborc-test-0.4.so.0.35.0 +lrwxrwxrwx root/root usr/lib/liborc-test-0.4.so.0 -> liborc-test-0.4.so.0.36.0 +-rwxr-xr-x root/root usr/lib/liborc-test-0.4.so.0.36.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/orc-0.4.pc -rw-r--r-- root/root usr/lib/pkgconfig/orc-test-0.4.pc diff --git a/orc/.signature b/orc/.signature index 8f14e428d..02bff9fac 100644 --- a/orc/.signature +++ b/orc/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/T3DcjYumeKSX24RqF6q6WvPkrFtgnGEAE8iOZ4BjEmmgaPBSiAzWe9BFwQRICz9hPGzt4Ixpf66H8NczQ2dbgc= -SHA256 (Pkgfile) = 20b5dde56184cf9da8e3126d21868385c4719f46969bd45d2cd17fb9ea4bf5ab -SHA256 (.footprint) = cf17b440ce0f5845a15c1c7a03242aa60a2749d5d74dad018d46cc04fa58360e -SHA256 (orc-0.4.35.tar.xz) = 718cdb60db0d5f7d4fc8eb955cd0f149e0ecc78dcd5abdc6ce3be95221b793b9 +RWSE3ohX2g5d/V81JQx+37Hgx768oYvtJ9T4pCQH52OGUtfN3gJssCAyPGVq+GF0GryU9cvOHUlEDgbKYN7k4uMoJupyhKEPMAA= +SHA256 (Pkgfile) = 51e0902b4b192d6d2748cf805eef7709319ff62e57b21aa4e516d71d90f0b2d1 +SHA256 (.footprint) = 0582edbeb9a2cb4c08b275018ce414cd7f318cb4b630ce7dd1b3f4e34d2ea671 +SHA256 (orc-0.4.36.tar.xz) = 83b074cb67317d58bef1e8d0cc862f7ae8a77a45bbff056a1f987c6488b2f5fd diff --git a/orc/Pkgfile b/orc/Pkgfile index cf5b977f0..48f884805 100644 --- a/orc/Pkgfile +++ b/orc/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tim Biermann, tbier at posteo dot de name=orc -version=0.4.35 +version=0.4.36 release=1 source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)

1 0

ports/opt (3.7): unrar: 7.0.5 -> 7.0.6
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit 8a7e8a31f4bb66e5beb81b220873e03144badf91 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 10:09:51 2024 +0100 unrar: 7.0.5 -> 7.0.6 diff --git a/unrar/.signature b/unrar/.signature index 5824e3720..af0028173 100644 --- a/unrar/.signature +++ b/unrar/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cHCse7IJL2I1fL3XICVrFzghAzeQk39xS7gSYeOScRyxG4aMqs69mEmMmKRI9iG8CaauckAPclKtcNA8t/w1wY= -SHA256 (Pkgfile) = 0726e4cf152be55f0a3b9771872221b2c2bd476c8285325712c8c4f2a7d9a680 +RWSE3ohX2g5d/RqBY3lk7u2sqhQMMtb6CpcSKsg6EUKf4i6/wrXbbrm+D4W/RNHvnBD3r/XMxEtBtf3Yj60S60KKEDQaDFyIQAw= +SHA256 (Pkgfile) = 8b5cbc50610c7a3142bef68c97eed4a1de561a1d91a8cab446a138d99e9941e2 SHA256 (.footprint) = d74185592e6529cf0090c3626f6fb89245c2afdb36aea39882a058f85d4153ea -SHA256 (unrarsrc-7.0.5.tar.gz) = 137308f98427a369c5684041d7ec0ad0d89d53eb5444e0617a206dafe6f44a02 +SHA256 (unrarsrc-7.0.6.tar.gz) = d9c0d1c881603aa2fa38248634bf9c9d63a6a3bdb5fa17dc9358ebf8b61f0cd2 diff --git a/unrar/Pkgfile b/unrar/Pkgfile index 41b163db8..09cf76b24 100644 --- a/unrar/Pkgfile +++ b/unrar/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tim Biermann, tbier at posteo dot de name=unrar -version=7.0.5 +version=7.0.6 release=1 source=(https://www.rarlab.com/rar/${name}src-$version.tar.gz)

1 0

ports/contrib (3.7): texlab: 5.12.2 -> 5.12.3
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit f38a4556d5baa835aabe2918a1bbc352eef3253f Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 10:34:45 2024 +0100 texlab: 5.12.2 -> 5.12.3 diff --git a/texlab/.signature b/texlab/.signature index 012c09ff3..d69c119b2 100644 --- a/texlab/.signature +++ b/texlab/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31gHW3Mcc6vF6HO4ho3lVqygJ5O7CKXta/lUapuQqGUkMkTaDKq9rPSSntePL6HX/SOXG+ozfho9WzBOJ0rE1wE= -SHA256 (Pkgfile) = 87b6071c9f58992fecce6d2c7e86b8ea1eaa175f140c503c5e33042a1aa2cc61 +RWSagIOpLGJF37VaCtvP4URuqelQQ7AWljvs5TvNz8ctXQrH2kyrgWzhcWOcAIY55f5RiqPbo1y1JrJr1H9fuqZRGQccbAmFdwY= +SHA256 (Pkgfile) = 8125c39a9b2a6a1b8ca52dc7277f0f60a736246bef88318f17af904a643605b4 SHA256 (.footprint) = e269bf06cd399613cb5e2df75070c5210b53277a4c1478d41543e6c58a533387 -SHA256 (texlab-5.12.2.tar.gz) = 679d72a73269addcd870d6742b418aed2fb7e256137f360e2cc80271f20f0704 +SHA256 (texlab-5.12.3.tar.gz) = 13bb412563cfae9e7f9bd6199bf029058a59ebc286f9809ce66bcbd43f3f9b92 diff --git a/texlab/Pkgfile b/texlab/Pkgfile index 0da5405ed..114f2f230 100644 --- a/texlab/Pkgfile +++ b/texlab/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=texlab -version=5.12.2 +version=5.12.3 release=1 source=(https://github.com/latex-lsp/texlab/archive/v$version/$name-$versio…

1 0

ports/contrib (3.7): bandwhich: 0.21.1 -> 0.22.2
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit da200dc770c4ed34dc458053a90c934c4ea7ad12 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 13:24:39 2024 +0100 bandwhich: 0.21.1 -> 0.22.2 diff --git a/bandwhich/.signature b/bandwhich/.signature index d8cdb118f..db4fdb1df 100644 --- a/bandwhich/.signature +++ b/bandwhich/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36arqGBklR6kQdsoHt+0f/dzIPQ7ALNV4iXmqJAUDkjyTueGYt2hlRB2yUXpbUo6V1fb4qyCa5Ff1gPZCrt2AAw= -SHA256 (Pkgfile) = 3a572599cc23ba9a46e028504f7f275d48ba8790c63852674fb245575ff07484 +RWSagIOpLGJF39o3dgzCdYUuLbHNUV+gck+iYNUCE1JMYfp2PrGtQRRkgqAsPPf1zsSQ7uk2Mr7MgX7A02rFPYMnAxxvU2FqVgY= +SHA256 (Pkgfile) = ac43f6caf307cf795a8e6b862afa2ca202ef1b24bbccd4ca20174e3b472e1c38 SHA256 (.footprint) = 6401cd9abf02fe6a159364d1ef91be65b6485e68f661aa901dcda8d705cad968 -SHA256 (bandwhich-0.21.1.tar.gz) = 8ba9bf6469834ad498b9fd17f86759a16793b00a6ef44edd6e525ec40adcb0b0 +SHA256 (bandwhich-0.22.2.tar.gz) = 4c41719549e05dbaac1bc84828269e59b2f2032e76ae646da9b9e3b87e5a5fd1 diff --git a/bandwhich/Pkgfile b/bandwhich/Pkgfile index 37612eefd..8311d0ab3 100644 --- a/bandwhich/Pkgfile +++ b/bandwhich/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=bandwhich -version=0.21.1 +version=0.22.2 release=1 source=(https://github.com/imsnif/bandwhich/archive/v$version/$name-$versio… @@ -16,5 +16,6 @@ build() { cargo build --release --manifest-path $name-$version/Cargo.toml install -Dt $PKG/usr/bin $name-$version/target/release/$name - install -Dm 755 $SRC/$name-$version/docs/bandwhich.1 $PKG/usr/share/man/man1/bandwhich.1 + find $name-$version/target/release/ -iname "bandwhich.1" \ + -exec install -Dm755 {} $PKG/usr/share/man/man1/bandwhich.1 \; }

1 0

ports/contrib (3.7): fdupes: 2.2.1 -> 2.3.0
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit cadf83cd514a06b22edc2a5de5fd5f45abf0ba91 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 13:01:20 2024 +0100 fdupes: 2.2.1 -> 2.3.0 diff --git a/fdupes/.signature b/fdupes/.signature index b3156862d..9d56b622b 100644 --- a/fdupes/.signature +++ b/fdupes/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF304GZCKPnHwKky13PlQ3c3A/5uaM6mv+NGz8EDTc98yQZBJ9NzxuIWUmY48vcDqwqQbYwhMfL+t0Zm79/8EQbwU= -SHA256 (Pkgfile) = 3db3f2991f4e3a0f85354190b0f9022110d336297bad0098ad62c734b636b019 +RWSagIOpLGJF3ymAMCAgnFLKetRhqF4DTc/cCmzAHGU9HHtw/T4LU/NxJz8D4c8CXtUVjgKzsgnDEKVKYh/ioKW5jWKS79Gg0gE= +SHA256 (Pkgfile) = 6416fd393695854bbb4e813d47efcfe3021d169c22534e99a3dacfc51b9e54f2 SHA256 (.footprint) = 9e6a0d831a8ee2262a588b5b352953d8b1dad65348c11e289bae92c138c72d6f -SHA256 (fdupes-2.2.1.tar.gz) = 846bb79ca3f0157856aa93ed50b49217feb68e1b35226193b6bc578be0c5698d +SHA256 (fdupes-2.3.0.tar.gz) = 6170d64a7e565ee314cca4dd25a123e60aa1e3febb11e57078bebb9c1da7e019 diff --git a/fdupes/Pkgfile b/fdupes/Pkgfile index 9fca8a591..1c3ae2f92 100644 --- a/fdupes/Pkgfile +++ b/fdupes/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre2 name=fdupes -version=2.2.1 +version=2.3.0 release=1 source=(https://github.com/adrianlopezroche/fdupes/releases/download/v$vers…

1 0

ports/contrib (3.7): kodi-gbm: rebuilt for taglib 2.0
by crux＠crux.nu 28 Jan '24

28 Jan '24

commit d4b983302c4f86185a138c4e48cc5f7ae3f50235 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 28 13:00:24 2024 +0100 kodi-gbm: rebuilt for taglib 2.0 diff --git a/kodi-gbm/.signature b/kodi-gbm/.signature index 161863efe..41ec08984 100644 --- a/kodi-gbm/.signature +++ b/kodi-gbm/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zY/cwKuiybXDzo2RjJiS6J8HVj2aOyKQsHScAQs5PHi5Y/w0m+kNkfXN8PXQlHqigdi5b329mYxicP90nR0/g4= -SHA256 (Pkgfile) = 225da430e6e4d41c8b3b9f479a33516e0678426c4202bde97d9a52ab1f88a9bd +RWSagIOpLGJF3z1y4YswsrANrvmwUpT1LQYTVi5+zEiBsZLqaSAqCjGsQHRPNDppLDLLjkut5+zh7AlPerHbes1Z3b/WzE+gxwA= +SHA256 (Pkgfile) = 585ae594b46012e628b52062a7884ed4aa28ae529b4030e41c583b1d71d5cebd SHA256 (.footprint) = e130bcf8d996eeb4e3a3047bfb990ae29c30040cd31abcb3e9d3c0796c949563 SHA256 (xbmc-20.3-Nexus.tar.gz) = 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d SHA256 (ffmpeg-4.4.1-Nexus-Alpha1.tar.gz) = abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed SHA256 (kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e SHA256 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc SHA256 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 +SHA256 (taglib.patch) = dc77cc0ba8eddef7b75b586b541e00c78db58d002e9928fdde6e9b34e5360cc7 diff --git a/kodi-gbm/Pkgfile b/kodi-gbm/Pkgfile index 85423860f..a99eaba4e 100644 --- a/kodi-gbm/Pkgfile +++ b/kodi-gbm/Pkgfile @@ -6,7 +6,7 @@ name=kodi-gbm version=20.3 -release=1 +release=2 # version variables {{{ _codename=Nexus @@ -20,7 +20,8 @@ source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$vers… https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version/ffmpeg-$_ffmpeg_ver… https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-gbm/}… https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-gbm/}… - https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm…) + https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm… + taglib.patch) # }}} # unpack_source() {{{ unpack_source() { @@ -73,6 +74,8 @@ build() { xbmc-$version-$_codename/tools/depends/native/TexturePacker/src/autogen.sh \ xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh + patch -Np1 -d xbmc-$version-$_codename -i $SRC/taglib.patch + cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ diff --git a/kodi-gbm/taglib.patch b/kodi-gbm/taglib.patch new file mode 100644 index 000000000..49e43315f --- /dev/null +++ b/kodi-gbm/taglib.patch @@ -0,0 +1,337 @@ +diff --git a/xbmc/music/tags/TagLibVFSStream.cpp b/xbmc/music/tags/TagLibVFSStream.cpp +index 1d2b454abbfe3..2008aba187e73 100644 +--- a/xbmc/music/tags/TagLibVFSStream.cpp ++++ b/xbmc/music/tags/TagLibVFSStream.cpp +@@ -11,6 +11,7 @@ + + #include <limits.h> + ++#include <taglib/taglib.h> + #include <taglib/tiostream.h> + + using namespace XFILE; +@@ -90,7 +91,11 @@ void TagLibVFSStream::writeBlock(const ByteVector &data) + * \note This method is slow since it requires rewriting all of the file + * after the insertion point. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++void TagLibVFSStream::insert(const ByteVector& data, TagLib::offset_t start, size_t replace) ++#else + void TagLibVFSStream::insert(const ByteVector &data, TagLib::ulong start, TagLib::ulong replace) ++#endif + { + if (data.size() == replace) + { +@@ -180,7 +185,11 @@ void TagLibVFSStream::insert(const ByteVector &data, TagLib::ulong start, TagLib + * \note This method is slow since it involves rewriting all of the file + * after the removed portion. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++void TagLibVFSStream::removeBlock(TagLib::offset_t start, size_t length) ++#else + void TagLibVFSStream::removeBlock(TagLib::ulong start, TagLib::ulong length) ++#endif + { + TagLib::ulong bufferLength = bufferSize(); + +diff --git a/xbmc/music/tags/TagLibVFSStream.h b/xbmc/music/tags/TagLibVFSStream.h +index d56705535353c..e0030103a5767 100644 +--- a/xbmc/music/tags/TagLibVFSStream.h ++++ b/xbmc/music/tags/TagLibVFSStream.h +@@ -10,6 +10,7 @@ + + #include "filesystem/File.h" + ++#include <taglib/taglib.h> + #include <taglib/tiostream.h> + + namespace MUSIC_INFO +@@ -56,7 +57,13 @@ namespace MUSIC_INFO + * \note This method is slow since it requires rewriting all of the file + * after the insertion point. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ void insert(const TagLib::ByteVector& data, ++ TagLib::offset_t start = 0, ++ size_t replace = 0) override; ++#else + void insert(const TagLib::ByteVector &data, TagLib::ulong start = 0, TagLib::ulong replace = 0) override; ++#endif + + /*! + * Removes a block of the file starting a \a start and continuing for +@@ -65,7 +72,11 @@ namespace MUSIC_INFO + * \note This method is slow since it involves rewriting all of the file + * after the removed portion. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ void removeBlock(TagLib::offset_t start = 0, size_t length = 0) override; ++#else + void removeBlock(TagLib::ulong start = 0, TagLib::ulong length = 0) override; ++#endif + + /*! + * Returns true if the file is read only (or if the file can not be opened). + diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp +index 6eb591a0c4b4f..c1b36318b2e0d 100644 +--- a/xbmc/music/tags/TagLoaderTagLib.cpp ++++ b/xbmc/music/tags/TagLoaderTagLib.cpp +@@ -500,19 +500,19 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& + for (APE::ItemListMap::ConstIterator it = itemListMap.begin(); it != itemListMap.end(); ++it) + { + if (it->first == "ARTIST") +- SetArtist(tag, StringListToVectorString(it->second.toStringList())); ++ SetArtist(tag, StringListToVectorString(it->second.values())); + else if (it->first == "ARTISTSORT") +- SetArtistSort(tag, StringListToVectorString(it->second.toStringList())); ++ SetArtistSort(tag, StringListToVectorString(it->second.values())); + else if (it->first == "ARTISTS") +- SetArtistHints(tag, StringListToVectorString(it->second.toStringList())); ++ SetArtistHints(tag, StringListToVectorString(it->second.values())); + else if (it->first == "ALBUMARTIST" || it->first == "ALBUM ARTIST") +- SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList())); ++ SetAlbumArtist(tag, StringListToVectorString(it->second.values())); + else if (it->first == "ALBUMARTISTSORT") +- SetAlbumArtistSort(tag, StringListToVectorString(it->second.toStringList())); ++ SetAlbumArtistSort(tag, StringListToVectorString(it->second.values())); + else if (it->first == "ALBUMARTISTS" || it->first == "ALBUM ARTISTS") +- SetAlbumArtistHints(tag, StringListToVectorString(it->second.toStringList())); ++ SetAlbumArtistHints(tag, StringListToVectorString(it->second.values())); + else if (it->first == "COMPOSERSORT") +- SetComposerSort(tag, StringListToVectorString(it->second.toStringList())); ++ SetComposerSort(tag, StringListToVectorString(it->second.values())); + else if (it->first == "ALBUM") + tag.SetAlbum(it->second.toString().to8Bit(true)); + else if (it->first == "TITLE") +@@ -528,7 +528,7 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& + else if (it->first == "ORIGINALYEAR") + tag.SetOriginalDate(it->second.toString().to8Bit(true)); + else if (it->first == "GENRE") +- SetGenre(tag, StringListToVectorString(it->second.toStringList())); ++ SetGenre(tag, StringListToVectorString(it->second.values())); + else if (it->first == "MOOD") + tag.SetMood(it->second.toString().to8Bit(true)); + else if (it->first == "COMMENT") +@@ -538,32 +538,32 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& + else if (it->first == "ENCODEDBY") + {} + else if (it->first == "COMPOSER") +- AddArtistRole(tag, "Composer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Composer", StringListToVectorString(it->second.values())); + else if (it->first == "CONDUCTOR") +- AddArtistRole(tag, "Conductor", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Conductor", StringListToVectorString(it->second.values())); + else if (it->first == "BAND") +- AddArtistRole(tag, "Band", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Band", StringListToVectorString(it->second.values())); + else if (it->first == "ENSEMBLE") +- AddArtistRole(tag, "Ensemble", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Ensemble", StringListToVectorString(it->second.values())); + else if (it->first == "LYRICIST") +- AddArtistRole(tag, "Lyricist", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Lyricist", StringListToVectorString(it->second.values())); + else if (it->first == "WRITER") +- AddArtistRole(tag, "Writer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Writer", StringListToVectorString(it->second.values())); + else if ((it->first == "MIXARTIST") || (it->first == "REMIXER")) +- AddArtistRole(tag, "Remixer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Remixer", StringListToVectorString(it->second.values())); + else if (it->first == "ARRANGER") +- AddArtistRole(tag, "Arranger", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Arranger", StringListToVectorString(it->second.values())); + else if (it->first == "ENGINEER") +- AddArtistRole(tag, "Engineer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Engineer", StringListToVectorString(it->second.values())); + else if (it->first == "PRODUCER") +- AddArtistRole(tag, "Producer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Producer", StringListToVectorString(it->second.values())); + else if (it->first == "DJMIXER") +- AddArtistRole(tag, "DJMixer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "DJMixer", StringListToVectorString(it->second.values())); + else if (it->first == "MIXER") +- AddArtistRole(tag, "Mixer", StringListToVectorString(it->second.toStringList())); ++ AddArtistRole(tag, "Mixer", StringListToVectorString(it->second.values())); + else if (it->first == "PERFORMER") + // Picard uses PERFORMER tag as musician credits list formatted "name (instrument)" +- AddArtistInstrument(tag, StringListToVectorString(it->second.toStringList())); ++ AddArtistInstrument(tag, StringListToVectorString(it->second.values())); + else if (it->first == "LABEL") + tag.SetRecordLabel(it->second.toString().to8Bit(true)); + else if (it->first == "COMPILATION") +@@ -579,11 +579,11 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& + else if (it->first == "REPLAYGAIN_ALBUM_PEAK") + replayGainInfo.ParsePeak(ReplayGain::ALBUM, it->second.toString().toCString(true)); + else if (it->first == "MUSICBRAINZ_ARTISTID") +- tag.SetMusicBrainzArtistID(SplitMBID(StringListToVectorString(it->second.toStringList()))); ++ tag.SetMusicBrainzArtistID(SplitMBID(StringListToVectorString(it->second.values()))); + else if (it->first == "MUSICBRAINZ_ALBUMARTISTID") +- tag.SetMusicBrainzAlbumArtistID(SplitMBID(StringListToVectorString(it->second.toStringList()))); ++ tag.SetMusicBrainzAlbumArtistID(SplitMBID(StringListToVectorString(it->second.values()))); + else if (it->first == "MUSICBRAINZ_ALBUMARTIST") +- SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList())); ++ SetAlbumArtist(tag, StringListToVectorString(it->second.values())); + else if (it->first == "MUSICBRAINZ_ALBUMID") + tag.SetMusicBrainzAlbumID(it->second.toString().to8Bit(true)); + else if (it->first == "MUSICBRAINZ_RELEASEGROUPID") +@@ -591,7 +591,7 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& + else if (it->first == "MUSICBRAINZ_TRACKID") + tag.SetMusicBrainzTrackID(it->second.toString().to8Bit(true)); + else if (it->first == "MUSICBRAINZ_ALBUMTYPE") +- SetReleaseType(tag, StringListToVectorString(it->second.toStringList())); ++ SetReleaseType(tag, StringListToVectorString(it->second.values())); + else if (it->first == "BPM") + tag.SetBPM(it->second.toString().toInt()); + else if (it->first == "MUSICBRAINZ_ALBUMSTATUS") +diff --git a/xbmc/music/tags/TagLibVFSStream.cpp b/xbmc/music/tags/TagLibVFSStream.cpp +index 2008aba187e73..c5f9c2473fe13 100644 +--- a/xbmc/music/tags/TagLibVFSStream.cpp ++++ b/xbmc/music/tags/TagLibVFSStream.cpp +@@ -58,9 +58,17 @@ FileName TagLibVFSStream::name() const + /*! + * Reads a block of size \a length at the current get pointer. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ByteVector TagLibVFSStream::readBlock(unsigned long length) ++#else + ByteVector TagLibVFSStream::readBlock(TagLib::ulong length) ++#endif + { ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ ByteVector byteVector(static_cast<unsigned int>(length)); ++#else + ByteVector byteVector(static_cast<TagLib::uint>(length)); ++#endif + ssize_t read = m_file.Read(byteVector.data(), length); + if (read > 0) + byteVector.resize(read); +@@ -119,7 +127,11 @@ void TagLibVFSStream::insert(const ByteVector &data, TagLib::ulong start, TagLib + // First, make sure that we're working with a buffer that is longer than + // the *difference* in the tag sizes. We want to avoid overwriting parts + // that aren't yet in memory, so this is necessary. ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ unsigned long bufferLength = bufferSize(); ++#else + TagLib::ulong bufferLength = bufferSize(); ++#endif + + while (data.size() - replace > bufferLength) + bufferLength += bufferSize(); +@@ -128,7 +140,11 @@ void TagLibVFSStream::insert(const ByteVector &data, TagLib::ulong start, TagLib + long readPosition = start + replace; + long writePosition = start; + ByteVector buffer; ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ ByteVector aboutToOverwrite(static_cast<unsigned int>(bufferLength)); ++#else + ByteVector aboutToOverwrite(static_cast<TagLib::uint>(bufferLength)); ++#endif + + // This is basically a special case of the loop below. Here we're just + // doing the same steps as below, but since we aren't using the same buffer +@@ -163,7 +179,11 @@ void TagLibVFSStream::insert(const ByteVector &data, TagLib::ulong start, TagLib + + // Check to see if we just read the last block. We need to call clear() + // if we did so that the last write succeeds. ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ if (static_cast<unsigned long>(bytesRead) < bufferLength) ++#else + if (TagLib::ulong(bytesRead) < bufferLength) ++#endif + clear(); + + // Seek to the write position and write our buffer. Increment the +@@ -191,14 +211,26 @@ void TagLibVFSStream::removeBlock(TagLib::offset_t start, size_t length) + void TagLibVFSStream::removeBlock(TagLib::ulong start, TagLib::ulong length) + #endif + { ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ unsigned long bufferLength = bufferSize(); ++#else + TagLib::ulong bufferLength = bufferSize(); ++#endif + + long readPosition = start + length; + long writePosition = start; + ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ ByteVector buffer(static_cast<unsigned int>(bufferLength)); ++#else + ByteVector buffer(static_cast<TagLib::uint>(bufferLength)); ++#endif + ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ unsigned long bytesRead = 1; ++#else + TagLib::ulong bytesRead = 1; ++#endif + + while(bytesRead != 0) + { +@@ -207,7 +239,11 @@ void TagLibVFSStream::removeBlock(TagLib::ulong start, TagLib::ulong length) + if (read < 0) + return;// explicit error + ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ bytesRead = static_cast<unsigned long>(read); ++#else + bytesRead = static_cast<TagLib::ulong>(read); ++#endif + readPosition += bytesRead; + + // Check to see if we just read the last block. We need to call clear() +diff --git a/xbmc/music/tags/TagLibVFSStream.h b/xbmc/music/tags/TagLibVFSStream.h +index e0030103a5767..2302c04dd92bd 100644 +--- a/xbmc/music/tags/TagLibVFSStream.h ++++ b/xbmc/music/tags/TagLibVFSStream.h +@@ -37,7 +37,11 @@ namespace MUSIC_INFO + /*! + * Reads a block of size \a length at the current get pointer. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ TagLib::ByteVector readBlock(unsigned long length) override; ++#else + TagLib::ByteVector readBlock(TagLib::ulong length) override; ++#endif + + /*! + * Attempts to write the block \a data at the current get pointer. If the +@@ -121,7 +125,11 @@ namespace MUSIC_INFO + /*! + * Returns the buffer size that is used for internal buffering. + */ ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ static unsigned int bufferSize() { return 1024; } ++#else + static TagLib::uint bufferSize() { return 1024; } ++#endif + + private: + std::string m_strFileName; +diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp +index c1b36318b2e0d..f4f676067a24c 100644 +--- a/xbmc/music/tags/TagLoaderTagLib.cpp ++++ b/xbmc/music/tags/TagLoaderTagLib.cpp +@@ -472,7 +472,11 @@ bool CTagLoaderTagLib::ParseTag(ID3v2::Tag *id3v2, EmbeddedArt *art, MUSIC_INFO: + if (picture) + { + std::string mime = picture->mimeType().to8Bit(true); ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ unsigned int size = picture->picture().size(); ++#else + TagLib::uint size = picture->picture().size(); ++#endif + tag.SetCoverArtInfo(size, mime); + if (art) + art->Set(reinterpret_cast<const uint8_t*>(picture->picture().data()), size, mime); +@@ -789,7 +793,11 @@ bool CTagLoaderTagLib::ParseTag(Ogg::XiphComment *xiph, EmbeddedArt *art, CMusic + std::string mime = pictures[i].mimeType().toCString(); + if (mime.compare(0, 6, "image/") != 0) + continue; ++#if (TAGLIB_MAJOR_VERSION >= 2) ++ unsigned int size = pictures[i].data().size(); ++#else + TagLib::uint size = pictures[i].data().size(); ++#endif + tag.SetCoverArtInfo(size, mime); + if (art) + art->Set(reinterpret_cast<const uint8_t*>(pictures[i].data().data()), size, mime);

1 0