Bump version and revamp.

2 files changed, 56 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a9bde5c54de..ed49346f1b93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-yaml-cpp
 	pkgdesc = YAML parser and emitter in C++, written around the YAML 1.2 spec (mingw-w64)
-	pkgver = 0.6.3
+	pkgver = 0.7.0
 	pkgrel = 1
 	url = https://github.com/jbeder/yaml-cpp
 	arch = any
@@ -11,8 +11,9 @@ pkgbase = mingw-w64-yaml-cpp
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz
-	sha384sums = 26dbb461a02eaf1826c5a033b7cf92d8ac59d4e90e84008588dba1fda0cc03ed61a8c63800ddeaf9d8072118d3a23846
+	source = https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.0.tar.gz
+	source = https://github.com/jbeder/yaml-cpp/pull/1055.patch
+	sha384sums = 5ab7a67ba57b9ee189ee4f9c5822ca834ef246740b43490a060a6b329860f494b6b8f3433bfeaf646e492336b2956e4e
+	sha384sums = f9b268cc42ef92659b0562506265af966272b31232097108d72cf65f89650b6fd36699af504fdff2a12ada9c6fa948ee
 
 pkgname = mingw-w64-yaml-cpp
-
diff --git a/PKGBUILD b/PKGBUILD
index 9f11e73a3d63..be7164bfda8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,67 @@
-# Maintainer: Dario Ostuni <another.code.996@gmail.com>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Dario Ostuni <another.code.996@gmail.com>
 
 _pkgname=yaml-cpp
 pkgname=mingw-w64-${_pkgname}
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
-pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec (mingw-w64)"
-url="https://github.com/jbeder/yaml-cpp"
+pkgdesc='YAML parser and emitter in C++, written around the YAML 1.2 spec (mingw-w64)'
+url="https://github.com/jbeder/${_pkgname}"
 arch=('any')
 license=('MIT')
 depends=('mingw-w64-crt')
 makedepends=('mingw-w64-cmake' 'mingw-w64-gcc')
-source=("https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${pkgver}.tar.gz")
+source=(
+	"https://github.com/jbeder/${_pkgname}/archive/${_pkgname}-${pkgver}.tar.gz"
+	"https://github.com/jbeder/${_pkgname}/pull/1055.patch")
 options=(staticlibs !strip !buildflags)
-sha384sums=('26dbb461a02eaf1826c5a033b7cf92d8ac59d4e90e84008588dba1fda0cc03ed61a8c63800ddeaf9d8072118d3a23846')
+sha384sums=('5ab7a67ba57b9ee189ee4f9c5822ca834ef246740b43490a060a6b329860f494b6b8f3433bfeaf646e492336b2956e4e'
+            'f9b268cc42ef92659b0562506265af966272b31232097108d72cf65f89650b6fd36699af504fdff2a12ada9c6fa948ee')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release
+	-DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' -DCMAKE_C_FLAGS_RELEASE='-O2 -DNDEBUG'
+	-DYAML_CPP_BUILD_TOOLS=OFF )
+_srcdir="${_pkgname}-${_pkgname}-$pkgver"
+
+prepare() {
+	cd "${_srcdir}"
+	
+	# Fix pkgconfig and cmake files install location.
+	patch -p1 -i '../1055.patch'
+	
+	#sed -i 's/add_test(yaml-cpp::test yaml-cpp-tests)/add_test(NAME yaml-cpp::test COMMAND yaml-cpp-tests)/' 'test/CMakeLists.txt'
+	#sed -i 's/build-windows-dll/OFF/' 'test/CMakeLists.txt'
+}
 
 build() {
-    cd $srcdir/${_pkgname}-${_pkgname}-$pkgver
-    unset LDFLAGS
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        ${_arch}-cmake .. -DCMAKE_INSTALL_PREFIX=/usr/${_arch} -DBUILD_SHARED_LIBS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_TESTS=OFF
-        make
-        ${_arch}-cmake .. -DCMAKE_INSTALL_PREFIX=/usr/${_arch} -DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_TESTS=OFF
-        make
-        popd
-    done
+	for _arch in ${_architectures}; do
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}-static" "${_flags[@]}"  \
+			-DYAML_CPP_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr/${_arch}/static"
+		cmake --build "build-${_arch}-static"
+		
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DYAML_CPP_BUILD_TESTS=OFF
+		cmake --build "build-${_arch}"
+	done
 }
 
+#check() {
+#	for _arch in ${_architectures}; do
+#		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DYAML_CPP_BUILD_TESTS=ON
+#		cmake --build "build-${_arch}"
+#		WINEPATH="build-${_arch}:/usr/${_arch}/bin" cmake --build "build-${_arch}" --target test
+#	done
+#}
+
 package() {
-    for _arch in ${_architectures}; do
-        cd "$srcdir/${_pkgname}-${_pkgname}-$pkgver/build-${_arch}"
-        make DESTDIR=$pkgdir install
-        install -Dm644 libyaml-cpp.a $pkgdir/usr/${_arch}/lib/libyaml-cpp.a
-        install -Dm644 yaml-cpp-config.cmake $pkgdir/usr/${_arch}/lib/cmake/${_pkgname}/yaml-cpp-config.cmake
-        install -Dm644 yaml-cpp-config-version.cmake $pkgdir/usr/${_arch}/lib/cmake/${_pkgname}/yaml-cpp-config-version.cmake
-        install -Dm644 yaml-cpp-targets.cmake $pkgdir/usr/${_arch}/lib/cmake/${_pkgname}/yaml-cpp-targets.cmake
-        find "$pkgdir/usr/${_arch}" -name '*.exe' | xargs -rtl1 rm
-        find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip --strip-unneeded
-        find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
-    done
+	for _arch in ${_architectures}; do
+		DESTDIR="${pkgdir}" cmake --install "build-${_arch}-static"
+		rm -rf "$pkgdir/usr/${_arch}/static/include/yaml-cpp"
+		ln -s "../../include/yaml-cpp" "$pkgdir/usr/${_arch}/static/include/yaml-cpp"
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/static/lib/*.a
+		
+		DESTDIR="${pkgdir}" cmake --install "build-${_arch}"
+		${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+	done
 }