Update to 6.1.0

2 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c4b7ac6d38f..7cd03d61284a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Sep 14 20:10:48 UTC 2016
+# Mon Nov 28 21:50:00 UTC 2016
 pkgbase = mingw-w64-tagparser
 	pkgdesc = C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (mingw-w64)
-	pkgver = 6.0.0
+	pkgver = 6.1.0
 	pkgrel = 1
 	url = https://github.com/Martchus/tagparser
 	arch = any
@@ -17,8 +17,8 @@ pkgbase = mingw-w64-tagparser
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = tagparser-6.0.0.tar.gz::https://github.com/Martchus/tagparser/archive/v6.0.0.tar.gz
-	sha256sums = 0d4bb99ec71a2d11bb9b9ae766e082d0092f82b7d2c7b4d6d760eca9386afbb4
+	source = tagparser-6.1.0.tar.gz::https://github.com/Martchus/tagparser/archive/v6.1.0.tar.gz
+	sha256sums = da10bfca307e1bb473c106fb4914c6ee9d3290780f9393428af939161921b9f2
 
 pkgname = mingw-w64-tagparser
 
diff --git a/PKGBUILD b/PKGBUILD
index c64498911107..7678fdfc521f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=tagparser
 pkgname=mingw-w64-tagparser
 _name=${pkgname#mingw-w64-}
-pkgver=6.0.0
+pkgver=6.1.0
 pkgrel=1
 arch=('any')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (mingw-w64)'
@@ -15,35 +15,28 @@ depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-zlib')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('0d4bb99ec71a2d11bb9b9ae766e082d0092f82b7d2c7b4d6d760eca9386afbb4')
+source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('da10bfca307e1bb473c106fb4914c6ee9d3290780f9393428af939161921b9f2')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-[[ $NO_STATIC_LIBS ]] || _configurations+=('static: -DENABLE_STATIC_LIBS:BOOL=ON -DDISABLE_SHARED_LIBS:BOOL=ON')
-[[ $NO_SHARED_LIBS ]] || _configurations+=('shared: -DENABLE_STATIC_LIBS:BOOL=OFF -DDISABLE_SHARED_LIBS:BOOL=OFF')
+[[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'
+[[ $NO_SHARED_LIBS ]] && _configurations+=' -DDISABLE_SHARED_LIBS:BOOL=ON'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  export CXXFLAGS='-O0'
   for _arch in ${_architectures}; do
-    for _config in "${_configurations[@]}"; do
-      msg2 "Building ${_config%%: *} version for ${_arch}"
-      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
-      ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
-      make
-      popd
-    done
+    mkdir -p "build-${_arch}" && pushd "build-${_arch}"
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_configurations} ../
+    make
+    popd
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    for _config in "${_configurations[@]}"; do
-      msg2 "Packaging ${_config%%: *} version for ${_arch}"
-      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
-      make DESTDIR="${pkgdir}" install-mingw-w64-strip
-      popd
-    done
+    mkdir -p "build-${_arch}" && pushd "build-${_arch}"
+    make DESTDIR="${pkgdir}" install-mingw-w64-strip
+    popd
   done
 }