mingw-w64-libmng: add new patches

5 files changed, 107 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4195487fdbc4..f1aeb6bfd853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,32 @@
 pkgbase = mingw-w64-libmng
 	pkgdesc = A collection of routines used to create and manipulate MNG format graphics files (mingw-w64)
 	pkgver = 2.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.libmng.com/
 	arch = any
 	license = custom
-	makedepends = mingw-w64-configure
+	makedepends = mingw-w64-cmake
 	depends = mingw-w64-lcms2
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = http://downloads.sourceforge.net/sourceforge/libmng/libmng-2.0.3.tar.xz
-	source = http://downloads.sourceforge.net/sourceforge/libmng/libmng-2.0.3.tar.xz.asc
+	source = https://downloads.sourceforge.net/libmng/libmng-2.0.3.tar.xz
+	source = https://downloads.sourceforge.net/libmng/libmng-2.0.3.tar.xz.asc
 	source = libmng-1.0.9-dont-leak-zlib-streams.diff
 	source = libmng-1.0.10-mingw.patch
 	source = no-undefined.patch
-	sha1sums = 0f141482ffcef6f8cd4413f945a59310ac2e49af
-	sha1sums = SKIP
-	sha1sums = d6f2a94cf77cecb4dcca3ee3029016d921608ad7
-	sha1sums = 1cb7bbeb2cc7ab0c4ba2730510cb91b9fc189d29
-	sha1sums = 29ceb317cb9ffce4a36f7662131feb70502231be
+	source = libmng-2.0.3-cmake-versioning.patch
+	source = fix-mng-version-cmake.patch
+	source = pkg-config-extra-flags.patch
+	validpgpkeys = 8048643BA2C840F4F92A195FF54984BFA16C640F
+	sha256sums = 4a462fdd48d4bc82c1d7a21106c8a18b62f8cc0042454323058e6da0dbb57dd3
+	sha256sums = SKIP
+	sha256sums = e91c1f852fbbcecec40b365bc71c1b15346442018c92b41af0d29d32bfbbb895
+	sha256sums = f21bd32a9e4453e1334aa32faea3a13c6829bb247ffc4a4c48c75c58769c94e3
+	sha256sums = 9ee540e6b375223285db286b0a04fc618d9f8d991bddd6a2ee1001fad16f3584
+	sha256sums = 5981d90392a4c7e7ad52e3720604f8158ac62420eec61f96e98a1b90a47631df
+	sha256sums = f5c66278bceb8a252de265e0024953a364ac778d1e1b7f2c8ed45bc4db70f961
+	sha256sums = 6f64379c773d1b88af85ae9ac78259e1d32501eba39a8139a90d9399d9e70855
 
 pkgname = mingw-w64-libmng
 
diff --git a/PKGBUILD b/PKGBUILD
index ceba12fa7ebc..cf61d128dca6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,53 @@
+# Maintainer: Andrew Sun <adsun701@gmail.com>
+
 pkgname=mingw-w64-libmng
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files (mingw-w64)"
 arch=(any)
 depends=(mingw-w64-lcms2)
-makedepends=(mingw-w64-configure)
+makedepends=(mingw-w64-cmake)
 options=(staticlibs !buildflags !strip)
 license=("custom")
 url="http://www.libmng.com/"
-source=("http://downloads.sourceforge.net/sourceforge/libmng/libmng-${pkgver}.tar.xz"{,.asc}
-"libmng-1.0.9-dont-leak-zlib-streams.diff"
-"libmng-1.0.10-mingw.patch"
-"no-undefined.patch")
-sha1sums=('0f141482ffcef6f8cd4413f945a59310ac2e49af'
-          'SKIP'
-          'd6f2a94cf77cecb4dcca3ee3029016d921608ad7'
-          '1cb7bbeb2cc7ab0c4ba2730510cb91b9fc189d29'
-          '29ceb317cb9ffce4a36f7662131feb70502231be')
+source=("https://downloads.sourceforge.net/libmng/libmng-${pkgver}.tar.xz"{,.asc}
+        "libmng-1.0.9-dont-leak-zlib-streams.diff"
+        "libmng-1.0.10-mingw.patch"
+        "no-undefined.patch"
+        "libmng-2.0.3-cmake-versioning.patch"
+        "fix-mng-version-cmake.patch"
+        "pkg-config-extra-flags.patch")
+sha256sums=('4a462fdd48d4bc82c1d7a21106c8a18b62f8cc0042454323058e6da0dbb57dd3'
+            'SKIP'
+            'e91c1f852fbbcecec40b365bc71c1b15346442018c92b41af0d29d32bfbbb895'
+            'f21bd32a9e4453e1334aa32faea3a13c6829bb247ffc4a4c48c75c58769c94e3'
+            '9ee540e6b375223285db286b0a04fc618d9f8d991bddd6a2ee1001fad16f3584'
+            '5981d90392a4c7e7ad52e3720604f8158ac62420eec61f96e98a1b90a47631df'
+            'f5c66278bceb8a252de265e0024953a364ac778d1e1b7f2c8ed45bc4db70f961'
+            '6f64379c773d1b88af85ae9ac78259e1d32501eba39a8139a90d9399d9e70855')
 validpgpkeys=('8048643BA2C840F4F92A195FF54984BFA16C640F')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-	cd "${srcdir}/libmng-${pkgver}"
-	patch -p0 -i "$srcdir"/libmng-1.0.9-dont-leak-zlib-streams.diff
+  cd "${srcdir}/libmng-${pkgver}"
+  patch -p0 -i "$srcdir"/libmng-1.0.9-dont-leak-zlib-streams.diff
   patch -p1 -i "$srcdir"/libmng-1.0.10-mingw.patch
   patch -p1 -i "$srcdir"/no-undefined.patch
-  make distclean
+  patch -p1 -i "$srcdir"/libmng-2.0.3-cmake-versioning.patch
+  patch -p1 -i "$srcdir"/fix-mng-version-cmake.patch
+  patch -p1 -i "$srcdir"/pkg-config-extra-flags.patch
 }
 
 build() {
   cd "${srcdir}/libmng-${pkgver}"
-  unset LDFLAGS
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-configure
+    ${_arch}-cmake \
+      -DCMAKE_BUILD_TYPE=RELEASE \
+      -DBUILD_SHARED_LIBS=ON \
+      -DBUILD_STATIC_LIBS=ON \
+      ..
     make
     popd
   done
diff --git a/fix-mng-version-cmake.patch b/fix-mng-version-cmake.patch
new file mode 100644
index 000000000000..2b4e4bc88000
--- /dev/null
+++ b/fix-mng-version-cmake.patch
@@ -0,0 +1,7 @@
+--- libmng-2.0.3/CMake/vers.cmake.orig	2013-03-05 15:14:32.000000000 +0400
++++ libmng-2.0.3/CMake/vers.cmake	2015-07-14 14:57:28.455000000 +0300
+@@ -1,3 +1,3 @@
+ SET(MNG_VERSION_MAJOR 2)
+ SET(MNG_VERSION_MINOR 0)
+-SET(MNG_VERSION_PATCH 2)
++SET(MNG_VERSION_PATCH 3)
diff --git a/libmng-2.0.3-cmake-versioning.patch b/libmng-2.0.3-cmake-versioning.patch
new file mode 100644
index 000000000000..6160162afc51
--- /dev/null
+++ b/libmng-2.0.3-cmake-versioning.patch
@@ -0,0 +1,29 @@
+--- libmng-2.0.3/CMakeLists.txt.orig	2015-04-28 15:48:37.037800000 +0300
++++ libmng-2.0.3/CMakeLists.txt	2015-04-28 15:50:35.161000000 +0300
+@@ -423,6 +423,8 @@
+  SET_TARGET_PROPERTIES(${MNG_LIBRARY_NAME}-shared
+   PROPERTIES
+   OUTPUT_NAME ${MNG_LIBRARY_NAME}
++  RUNTIME_OUTPUT_NAME ${MNG_LIBRARY_NAME}-${MNG_VERSION_MAJOR}
++  ARCHIVE_OUTPUT_NAME ${MNG_LIBRARY_NAME}
+   ${MNG_LIBRARY_PROPERTIES} )
+ #
+  INSTALL(TARGETS ${MNG_LIBRARY_NAME}-shared
+@@ -434,7 +436,7 @@
+ #
+ ENDIF(BUILD_SHARED_LIBS)
+ #------------ libmng.pc ---------------
+-IF(UNIX)
++IF(UNIX OR MINGW)
+  SET(MNG_LIBS_PRIVATE "")
+  IF(JPEG_FOUND)
+   SET(MNG_LIBS_PRIVATE "${MNG_LIBS_PRIVATE} -ljpeg")
+@@ -458,7 +458,7 @@
+  INSTALL(FILES  ${CMAKE_CURRENT_BINARY_DIR}/libmng.pc DESTINATION
+     ${MNG_INSTALL_PKGCONFIG_DIR} )
+ 
+-ENDIF(UNIX)
++ENDIF(UNIX OR MINGW)
+ #
+ INSTALL(EXPORT MNG_TARGETS DESTINATION ${MNG_INSTALL_PACKAGE_DIR})
+ #
\ No newline at end of file
diff --git a/pkg-config-extra-flags.patch b/pkg-config-extra-flags.patch
new file mode 100644
index 000000000000..026b86ebfde3
--- /dev/null
+++ b/pkg-config-extra-flags.patch
@@ -0,0 +1,26 @@
+--- libmng-2.0.3/CMake/libmng.pc.cmake.orig	2015-07-14 14:58:28.186600000 +0300
++++ libmng-2.0.3/CMake/libmng.pc.cmake	2015-07-14 14:58:41.977000000 +0300
+@@ -8,4 +8,4 @@
+ Version: @MNG_VERSION@
+ Libs: -L${libdir} -lmng
+ Libs.private: @MNG_LIBS_PRIVATE@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} @MNG_DEFINES@
+--- libmng-2.0.3/CMakeLists.txt.orig	2012-07-29 23:28:11.000000000 +0400
++++ libmng-2.0.3/CMakeLists.txt	2015-07-14 14:59:15.095800000 +0300
+@@ -342,6 +342,7 @@
+ #
+ #------------------ STATIC ---------------------
+ IF(BUILD_STATIC_LIBS)
++ SET(MNG_DEFINES "")
+  ADD_LIBRARY(${MNG_LIBRARY_NAME} STATIC
+   ${TARGET_FILES})
+  #
+@@ -387,6 +388,7 @@
+  IF(WIN32)
+ #-DMNG_BUILD_DLL or -DMNG_DLL or  -DMNG_USE_DLL : cnf. libmng_types.h
+   ADD_DEFINITIONS(-DMNG_BUILD_DLL)
++  SET(MNG_DEFINES "-DMNG_USE_DLL")
+  ENDIF(WIN32)
+ 
+  ADD_LIBRARY(${MNG_LIBRARY_NAME}-shared