Merge pull request #7018 from dofuuz/libsndfile-1.0.30

libsndfile: Update to 1.0.30

mingw-w64-libsndfile/001-cmake-build-fixes.patch

@@ -1,38 +0,0 @@
---- libsndfile-1.0.29/CMakeLists.txt.orig	2020-08-26 19:06:05.255127700 +0200
-+++ libsndfile-1.0.29/CMakeLists.txt	2020-08-26 18:57:22.158126800 +0200
-@@ -66,7 +66,7 @@
- 	set (CPU_CLIPS_POSITIVE FALSE)
- 	set (CPU_CLIPS_NEGATIVE FALSE)
- endif ()
--cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll (canonical name), sndfile.dll otherwise" OFF "WIN32;NOT MINGW;BUILD_SHARED_LIBS" OFF)
-+cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll (canonical name), sndfile.dll otherwise" ON "WIN32;BUILD_SHARED_LIBS" OFF)
- 
- set (HAVE_EXTERNAL_XIPH_LIBS ${ENABLE_EXTERNAL_LIBS})
- set (HAVE_SQLITE3 ${BUILD_REGTEST})
-@@ -86,7 +86,7 @@
- add_feature_info (ENABLE_CPU_CLIP ENABLE_CPU_CLIP "Enable tricky cpu specific clipper")
- add_feature_info (ENABLE_BOW_DOCS ENABLE_BOW_DOCS "enable black-on-white html docs")
- add_feature_info (ENABLE_PACKAGE_CONFIG ENABLE_PACKAGE_CONFIG "generate and install package config file")
--if (WIN32 AND (NOT MINGW) AND BUILD_SHARED_LIBS)
-+if (WIN32 AND BUILD_SHARED_LIBS)
- 	add_feature_info (ENABLE_COMPATIBLE_LIBSNDFILE_NAME ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll (canonical name), sndfile.dll otherwise")
- endif ()
- 
-@@ -314,7 +314,7 @@
- 
- if (ENABLE_COMPATIBLE_LIBSNDFILE_NAME)
- 	set_target_properties (sndfile PROPERTIES
--		RUNTIME_OUTPUT_NAME "libsndfile-1"
-+		RUNTIME_OUTPUT_NAME "sndfile-1"
- 		)
- endif ()
- 
-@@ -656,7 +656,7 @@
- 
- endif ()
- 
--if (UNIX)
-+if (UNIX OR MINGW)
- 	set (man_MANS
- 		man/sndfile-info.1
- 		man/sndfile-play.1

mingw-w64-libsndfile/PKGBUILD

@@ -3,12 +3,12 @@
 _realname=libsndfile
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.0.29
-pkgrel=2
+pkgver=1.0.30
+pkgrel=1
 pkgdesc="A C library for reading and writing files containing sampled sound (mingw-w64)"
 arch=('any')
 url="http://www.mega-nerd.com/libsndfile"
-license=('LGPL')
+license=('LGPL2.1')
 depends=("${MINGW_PACKAGE_PREFIX}-flac"
          "${MINGW_PACKAGE_PREFIX}-libogg"
          "${MINGW_PACKAGE_PREFIX}-libvorbis"
@@ -17,16 +17,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 options=('staticlibs' 'strip')
-source=("https://github.com/erikd/libsndfile/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.bz2"
-        "001-cmake-build-fixes.patch")
-sha256sums=('2ba20d44817c8176f097ab25eff44ef0aeec9e00973def5a7174c5ae0764b22f'
-            'cecda39c0a00ba9c0236fc97fb30e43048106189b1d824d8302a429dff67771e')
-
-prepare() {
-  cd ${srcdir}/${_realname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}"/001-cmake-build-fixes.patch
-}
+source=("https://github.com/erikd/libsndfile/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.bz2")
+sha256sums=('ec898634766595438142c76cf3bdd46b77305d4a295dd16b29d024122d7a4b3f')
 
 build() {
   declare -a _extra_config
@@ -60,6 +52,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     "${_extra_config[@]}" \
     -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_COMPATIBLE_LIBSNDFILE_NAME=ON \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake --build ./