updated to 2.5.0

4 files changed, 8 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbcb58ab986f..51ed10580014 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-openjpeg2
-	pkgdesc = An open source JPEG 2000 codec, version 2.4.0 (mingw-w64)
-	pkgver = 2.4.0
+	pkgdesc = An open source JPEG 2000 codec, version 2.5.0 (mingw-w64)
+	pkgver = 2.5.0
 	pkgrel = 1
 	url = https://www.openjpeg.org
 	arch = any
@@ -11,12 +11,9 @@ pkgbase = mingw-w64-openjpeg2
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = openjpeg-2.4.0.tar.gz::https://github.com/uclouvain/openjpeg/archive/v2.4.0.tar.gz
-	source = 0001-fix-install-for-dlls.all.patch
+	source = openjpeg-2.5.0.tar.gz::https://github.com/uclouvain/openjpeg/archive/v2.5.0.tar.gz
 	source = 0003-versioned-dlls.mingw.patch
-	sha256sums = 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
-	sha256sums = 3f3bde353ca3432f157258164c5e3c345af82ca3a9d5a68f815c3030b01cbc32
-	sha256sums = 4d8d0310d24e7ec0a54cf71c06ff85831e37841046e13744e58f53b87e691560
+	sha256sums = 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
+	sha256sums = a966dc4aeb9b0b768d4cb411a3bce792c84913b3be403c25efa8f8daa8b13cc8
 
 pkgname = mingw-w64-openjpeg2
-
diff --git a/0001-fix-install-for-dlls.all.patch b/0001-fix-install-for-dlls.all.patch
deleted file mode 100644
index 2626e1cad364..000000000000
--- a/0001-fix-install-for-dlls.all.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- openjpeg-2.1.2/src/lib/openmj2/CMakeLists.txt.orig	2016-10-01 08:10:06.022398600 -0400
-+++ openjpeg-2.1.2/src/lib/openmj2/CMakeLists.txt	2016-10-01 08:17:44.735110000 -0400
-@@ -53,7 +53,9 @@
- # Install library
- install(TARGETS ${OPENMJ2_LIBRARY_NAME}
-   EXPORT OpenMJ2Targets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-   COMPONENT Libraries
- )
- 
---- openjpeg-2.1.2/src/lib/openjp3d/CMakeLists.txt.orig	2016-10-01 08:10:06.029399900 -0400
-+++ openjpeg-2.1.2/src/lib/openjp3d/CMakeLists.txt	2016-10-01 08:30:34.655082300 -0400
-@@ -34,7 +34,9 @@
- # Install library
- install(TARGETS ${OPENJP3D_LIBRARY_NAME}
-   EXPORT OpenJP3DTargets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-   COMPONENT Libraries
- )
- 
diff --git a/0003-versioned-dlls.mingw.patch b/0003-versioned-dlls.mingw.patch
index 5f9b7758a000..0878993b45b3 100644
--- a/0003-versioned-dlls.mingw.patch
+++ b/0003-versioned-dlls.mingw.patch
@@ -9,17 +9,6 @@
  if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
    target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
  endif()
---- openjpeg-2.1.2/src/lib/openjp3d/CMakeLists.txt.orig	2016-10-01 08:59:49.819661900 -0400
-+++ openjpeg-2.1.2/src/lib/openjp3d/CMakeLists.txt	2016-10-01 09:33:11.456919300 -0400
-@@ -26,7 +26,7 @@
- if(UNIX)
-   target_link_libraries(${OPENJP3D_LIBRARY_NAME} m)
- endif()
--set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-+set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjp3d RUNTIME_OUTPUT_NAME openjp3d-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjp3d)
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
-   target_compile_options(${OPENJP3D_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
- endif()
 --- openjpeg-2.1.2/src/lib/openjpip/CMakeLists.txt.orig	2016-10-01 08:31:32.305170000 -0400
 +++ openjpeg-2.1.2/src/lib/openjpip/CMakeLists.txt	2016-10-01 08:40:01.492903300 -0400
 @@ -65,7 +65,7 @@
@@ -31,25 +20,3 @@
  if(WIN32)
    # add Winsock on windows+mingw
    target_link_libraries(openjpip ws2_32)
---- openjpeg-2.1.2/src/lib/openjpwl/CMakeLists.txt.orig	2016-10-01 08:59:49.830163000 -0400
-+++ openjpeg-2.1.2/src/lib/openjpwl/CMakeLists.txt	2016-10-01 09:38:06.899451900 -0400
-@@ -50,7 +50,7 @@
-   target_link_libraries(openjpwl m)
- endif()
- set_target_properties(openjpwl
--  PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-+  PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjpwl RUNTIME_OUTPUT_NAME openjpwl-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjpwl)
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
-   target_compile_options(openjpwl PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
- endif()
---- openjpeg-2.1.2/src/lib/openmj2/CMakeLists.txt.orig	2016-10-01 08:59:49.839164400 -0400
-+++ openjpeg-2.1.2/src/lib/openmj2/CMakeLists.txt	2016-10-01 09:44:10.251707400 -0400
-@@ -45,7 +45,7 @@
- if(UNIX)
-   target_link_libraries(${OPENMJ2_LIBRARY_NAME} m)
- endif()
--set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-+set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openmj2 RUNTIME_OUTPUT_NAME openmj2-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openmj2)
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
-   target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
- endif()
diff --git a/PKGBUILD b/PKGBUILD
index 6842763da631..c740d857afdc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-openjpeg2
-pkgver=2.4.0
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="An open source JPEG 2000 codec, version ${pkgver} (mingw-w64)"
 arch=('any')
@@ -15,16 +15,13 @@ depends=('mingw-w64-libpng'
 makedepends=('mingw-w64-cmake')
 options=('!strip' 'staticlibs' '!buildflags')
 source=("openjpeg-${pkgver}.tar.gz::https://github.com/uclouvain/openjpeg/archive/v${pkgver}.tar.gz"
-        "0001-fix-install-for-dlls.all.patch"
         "0003-versioned-dlls.mingw.patch")
-sha256sums=('8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d'
-            '3f3bde353ca3432f157258164c5e3c345af82ca3a9d5a68f815c3030b01cbc32'
-            '4d8d0310d24e7ec0a54cf71c06ff85831e37841046e13744e58f53b87e691560')
+sha256sums=('0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a'
+            'a966dc4aeb9b0b768d4cb411a3bce792c84913b3be403c25efa8f8daa8b13cc8')
 
 prepare() {
   cd openjpeg-${pkgver}
   sed -i '/add_subdirectory(thirdparty)/d' CMakeLists.txt
-  patch -p1 -i "${srcdir}"/0001-fix-install-for-dlls.all.patch
   patch -p1 -i "${srcdir}"/0003-versioned-dlls.mingw.patch
 }