Remove taglib bundling for Unix platforms; now it's either vendored, or

distro-provided.

.cmake/GeneratePackage.cmake

@@ -41,15 +41,10 @@ if (${GENERATE_DEB} MATCHES "true" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
     endif()
 
     set(DEPENDENCIES "libmicrohttpd${DEB_MICROHTTPD_VERSION}, libcurl${DEB_LIBCURL_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libncursesw${DEB_NCURSES_VERSION}, libasound2, libpulse0, pulseaudio, libmp3lame0, libev4, libopenmpt0, libssl1.1")
-    set(DEPENDENCIES "${DEPENDENCIES}, libavcodec-extra, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample${DEB_SWRESAMPLE_VERSION}")
-
-    if (${ENABLE_BUNDLED_TAGLIB} MATCHES "false")
-      set(DEPENDENCIES "${DEPENDENCIES}, libtag1v5")
-    endif()
+    set(DEPENDENCIES "${DEPENDENCIES}, libtag1v5, libavcodec-extra, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample${DEB_SWRESAMPLE_VERSION}")
 
     set(CPACK_PACKAGE_FILE_NAME "musikcube_${musikcube_VERSION}_${DEB_PLATFORM}_${DEB_DISTRO}_${DEB_ARCHITECTURE}")
     set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEPENDENCIES})
-
     set(CPACK_RPM_PACKAGE_REQUIRES "libogg, libvorbis, ffmpeg-libs, ncurses, zlib, alsa-lib, pulseaudio-libs, openssl, libcurl, libmicrohttpd, lame, libev, taglib, libopenmpt")
   endif()
 

CMakeLists.txt

@@ -24,7 +24,6 @@ include(ConfigureBsdPaths)
 include(AddDarwinSystemLibs)
 include(AddLinuxSystemLibs)
 include(ConfigureCurses)
-include(ConfigureTaglib)
 include(ConfigureCompilerFlags)
 include(FindVendorLibrary)
 

src/plugins/taglib_plugin/CMakeLists.txt

@@ -9,27 +9,6 @@ find_library(LIBZ z)
 
 if (${BUILD_STANDALONE} MATCHES "true")
   find_vendor_library(LIBTAG tag)
-elseif (NOT ${ENABLE_BUNDLED_TAGLIB} MATCHES "false")
-  message(STATUS "[taglibmetadatareader] using bundled taglib = true")
-  message(STATUS "[taglibmetadatareader] CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
-
-  include(ExternalProject)
-
-  ExternalProject_Add(taglib
-    SOURCE_DIR
-      "${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11"
-    BUILD_IN_SOURCE 0
-    DOWNLOAD_COMMAND ""
-    UPDATE_COMMAND ""
-    CMAKE_ARGS
-      "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
-      "-DCMAKE_INSTALL_PREFIX=${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/"
-    INSTALL_COMMAND
-      make install)
-
-  include_directories("${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/include")
-  add_dependencies(taglibreader taglib)
-  set(LIBTAG "${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/lib/libtag.a")
 else()
   find_library(LIBTAG tag)
 endif()