taglib: Update to 2.1.1

* fix-finding-cppunit.patch: looks like it's no longer needed, cppunit has a .pc file
* various cleanups

mingw-w64-taglib/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=taglib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.1
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats (mingw-w64)"
 arch=('any')
@@ -22,14 +22,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-source=(https://taglib.github.io/releases/${_realname}-${pkgver}.tar.gz
-        fix-finding-cppunit.patch)
-sha256sums=('95b788b39eaebab41f7e6d1c1d05ceee01a5d1225e4b6d11ed8976e96ba90b0c'
-            '460e2dd83e6233145e4980a4c63a400e9e8297980e3cfae910dadefa2475e7d0')
+source=(https://taglib.github.io/releases/${_realname}-${pkgver}.tar.gz)
+sha256sums=('3716d31f7c83cbf17b67c8cf44dd82b2a2f17e6780472287a16823e70305ddba')
 
 prepare() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-finding-cppunit.patch
+  cd "${_realname}-${pkgver}"
 }
 
 build() {
@@ -38,7 +35,7 @@ build() {
   cd "${srcdir}/build-shared-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
+  cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DBUILD_SHARED_LIBS=ON \
@@ -46,32 +43,32 @@ build() {
     -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
     ../${_realname}-${pkgver}
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build .
 
   msg "Build static version"
   mkdir -p "${srcdir}/build-static-${MSYSTEM}"
   cd "${srcdir}/build-static-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
+  cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DBUILD_SHARED_LIBS=OFF \
     -DBUILD_BINDINGS=ON \
     ../${_realname}-${pkgver}
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build .
 }
 
 check() {
-    cd "${srcdir}/build-static-${MSYSTEM}"
-    ${MINGW_PREFIX}/bin/ctest . || warning "Tests failed"
+  cd "${srcdir}/build-static-${MSYSTEM}"
+  ctest . || warning "Tests failed"
 }
 
 package() {
   cd "${srcdir}/build-static-${MSYSTEM}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+  DESTDIR="${pkgdir}" cmake --install .
 
   cd "${srcdir}/build-shared-${MSYSTEM}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+  DESTDIR="${pkgdir}" cmake --install .
 }

mingw-w64-taglib/fix-finding-cppunit.patch

@@ -1,33 +0,0 @@
---- taglib-1.11.1/cmake/modules/FindCppUnit.cmake       2017-05-20 10:28:07.926637100 +0200
-+++ taglib-1.11.1/cmake/modules/FindCppUnit2.cmake      2016-10-24 05:03:23.000000000 +0200
-@@ -11,7 +11,7 @@
-   SET(CPPUNIT_MIN_VERSION 1.12.0)
- endif(NOT CPPUNIT_MIN_VERSION)
-
--FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config )
-+FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE pkg-config )
-
- IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-@@ -24,9 +24,9 @@
-     SET(CPPUNIT_LIBRARIES)
-
-     IF(CPPUNIT_CONFIG_EXECUTABLE)
--        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
--        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
--        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-+        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --cflags cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_CFLAGS)
-+        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --libs cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_LIBRARIES)
-+        EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --modversion cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-         STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}")
-     ELSE(CPPUNIT_CONFIG_EXECUTABLE)
-         # in case win32 needs to find it the old way?
-@@ -50,7 +50,7 @@
-   endif(NOT CppUnit_FIND_QUIETLY)
-
-   IF(CPPUNIT_CONFIG_EXECUTABLE)
--    EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-+    EXEC_PROGRAM(${CPPUNIT_CONFIG_EXECUTABLE} ARGS --modversion cppunit RETURN_VALUE _return_VALUE OUTPUT_VARIABLE CPPUNIT_INSTALLED_VERSION)
-   ENDIF(CPPUNIT_CONFIG_EXECUTABLE)
-
-   macro_ensure_version( ${CPPUNIT_MIN_VERSION} ${CPPUNIT_INSTALLED_VERSION} CPPUNIT_INSTALLED_VERSION_OK )