From e67f09ae9ee871023ebc3be4e0255acf2fb03eb8 Mon Sep 17 00:00:00 2001 From: casey langen Date: Wed, 21 Dec 2022 21:44:30 -0800 Subject: [PATCH] Fix vendor'd taglib on macOS --- script/relink-dynamic-libraries.js | 18 ++++++++++-------- script/stage-vendor-libraries.sh | 1 + src/plugins/taglib_plugin/CMakeLists.txt | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/script/relink-dynamic-libraries.js b/script/relink-dynamic-libraries.js index b968f739a..e42c65ff8 100644 --- a/script/relink-dynamic-libraries.js +++ b/script/relink-dynamic-libraries.js @@ -27,17 +27,18 @@ const libraries = [ 'libavcodec-musikcube.59.dylib', 'libavformat-musikcube.59.dylib', 'libavutil-musikcube.57.dylib', - 'libswresample-musikcube.4.dylib', 'libcrypto.1.1.dylib', - 'libssl.1.1.dylib', 'libcurl.4.dylib', 'libmicrohttpd.12.dylib', 'libmp3lame.0.dylib', 'libogg.0.dylib', + 'libopenmpt.0.dylib', + 'libopus.0.dylib', + 'libssl.1.1.dylib', + 'libswresample-musikcube.4.dylib', + 'libtag.1.19.0.dylib', 'libvorbis.0.dylib', 'libvorbisenc.2.dylib', - 'libopus.0.dylib', - 'libopenmpt.0.dylib', ]; /* after updating libraries, re-establish symlinks */ @@ -45,17 +46,18 @@ const symlinks = [ ['libavcodec-musikcube.59.dylib', 'libavcodec-musikcube.dylib'], ['libavformat-musikcube.59.dylib', 'libavformat-musikcube.dylib'], ['libavutil-musikcube.57.dylib', 'libavutil-musikcube.dylib'], - ['libswresample-musikcube.4.dylib', 'libswresample-musikcube.dylib'], ['libcrypto.1.1.dylib', 'libcrypto.dylib'], - ['libssl.1.1.dylib', 'libssl.dylib'], ['libcurl.4.dylib', 'libcurl.dylib'], ['libmicrohttpd.12.dylib', 'libmicrohttpd.dylib'], ['libmp3lame.0.dylib', 'libmp3lame.dylib'], ['libogg.0.dylib', 'libogg.dylib'], + ['libopenmpt.0.dylib', 'libopenmpt.dylib'], + ['libopus.0.dylib', 'libopus.dylib'], + ['libssl.1.1.dylib', 'libssl.dylib'], + ['libswresample-musikcube.4.dylib', 'libswresample-musikcube.dylib'], + ['libtag.1.19.0.dylib', 'libtag.dylib'], ['libvorbis.0.dylib', 'libvorbis.dylib'], ['libvorbisenc.2.dylib', 'libvorbisenc.dylib'], - ['libopus.0.dylib', 'libopus.dylib'], - ['libopenmpt.0.dylib', 'libopenmpt.dylib'], ]; const path = process.argv[2]; diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index 67875d45d..d62b56ab8 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -23,6 +23,7 @@ if [[ "$PLATFORM" == 'Darwin' ]]; then cp vendor/bin/lib/libmicrohttpd.12.dylib ./bin/lib cp vendor/bin/lib/libmp3lame.0.dylib ./bin/lib cp vendor/bin/lib/libopenmpt.0.dylib ./bin/lib + cp vendor/bin/lib/libtag.1.19.0.dylib ./bin/lib mkdir -p ./bin/share/terminfo cp -rfp $(brew --prefix)/Cellar/ncurses/6.3/share/terminfo/* ./bin/share/terminfo diff --git a/src/plugins/taglib_plugin/CMakeLists.txt b/src/plugins/taglib_plugin/CMakeLists.txt index 24e404b5e..29d37d6f4 100644 --- a/src/plugins/taglib_plugin/CMakeLists.txt +++ b/src/plugins/taglib_plugin/CMakeLists.txt @@ -15,3 +15,4 @@ endif() message(STATUS "[taglibmetadatareader] using ${LIBTAG}") target_link_libraries(taglibreader ${LIBTAG} ${LIBZ}) +add_vendor_includes(taglibreader) \ No newline at end of file