summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchala2016-10-09 15:30:18 -0700
committerSchala2016-10-09 15:30:18 -0700
commit6dd53e5c44b27de5e6ffbef24d5a440c93fc0a1a (patch)
tree157eff7b13f96933daeffa80c88ac2a2146b319c
parent2d75b3d16b8402a5d799f56be55ea0feee4a5153 (diff)
downloadaur-6dd53e5c44b27de5e6ffbef24d5a440c93fc0a1a.tar.gz
patches + don't deviate from native pkg build ops
-rw-r--r--.SRCINFO10
-rw-r--r--0001-fix-install-for-dlls.all.patch26
-rw-r--r--0003-versioned-dlls.mingw.patch55
-rw-r--r--0005-sock-jpip.all.patch21
-rw-r--r--PKGBUILD28
5 files changed, 126 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 666c37cc3d98..66cf0d639eed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Oct 4 21:46:10 UTC 2016
+# Sun Oct 9 22:29:48 UTC 2016
pkgbase = mingw-w64-openjpeg2
pkgdesc = An open source JPEG 2000 codec, version 2.1.2 (mingw-w64)
pkgver = 2.1.2
- pkgrel = 1
+ pkgrel = 2
url = https://www.openjpeg.org
arch = any
license = custom: BSD
@@ -14,7 +14,13 @@ pkgbase = mingw-w64-openjpeg2
options = !strip
options = !buildflags
source = https://github.com/uclouvain/openjpeg/archive/v2.1.2.tar.gz
+ source = 0001-fix-install-for-dlls.all.patch
+ source = 0003-versioned-dlls.mingw.patch
+ source = 0005-sock-jpip.all.patch
md5sums = 40a7bfdcc66280b3c1402a0eb1a27624
+ md5sums = c71b7576d88fdd7613f318297cb0c8be
+ md5sums = f8fd65a4d5b1dfc219b648325d33b389
+ md5sums = f4f5174de862b6803702d6eaa83da4da
pkgname = mingw-w64-openjpeg2
diff --git a/0001-fix-install-for-dlls.all.patch b/0001-fix-install-for-dlls.all.patch
new file mode 100644
index 000000000000..2626e1cad364
--- /dev/null
+++ b/0001-fix-install-for-dlls.all.patch
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 000000000000..f93d3d162ba1
--- /dev/null
+++ b/0003-versioned-dlls.mingw.patch
@@ -0,0 +1,55 @@
+--- openjpeg-2.1.2/src/lib/openjp2/CMakeLists.txt.orig 2016-10-01 08:31:32.273920100 -0400
++++ openjpeg-2.1.2/src/lib/openjp2/CMakeLists.txt 2016-10-01 08:36:28.474703900 -0400
+@@ -85,7 +85,7 @@
+ if(UNIX)
+ target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
+ endif()
+-set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
++set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjp2 RUNTIME_OUTPUT_NAME openjp2-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjp2)
+ if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+ 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(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+ 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 @@
+ if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+ target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
+ endif()
+-target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME})
++set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjpip RUNTIME_OUTPUT_NAME openjp3d-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjpip)
+ 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(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+ 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(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+ target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
+ endif()
diff --git a/0005-sock-jpip.all.patch b/0005-sock-jpip.all.patch
new file mode 100644
index 000000000000..307890aa1ffd
--- /dev/null
+++ b/0005-sock-jpip.all.patch
@@ -0,0 +1,21 @@
+--- openjpeg-2.1.0/src/lib/openjpip/sock_manager.c.orig 2014-04-29 07:15:01.000000000 +0000
++++ openjpeg-2.1.0/src/lib/openjpip/sock_manager.c 2014-07-29 15:35:10.066130700 +0000
+@@ -28,13 +28,17 @@
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#ifdef _WIN32
++#ifdef _MSC_VER
+ #include <windows.h>
+ typedef SSIZE_T ssize_t;
+ #else
+ #include <sys/types.h>
++#ifdef _WIN32
++#include <ws2tcpip.h>
++#else
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#endif
+ #include <unistd.h>
+ #endif
+
diff --git a/PKGBUILD b/PKGBUILD
index f25550f3a26a..d775de2e40f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mingw-w64-openjpeg2
pkgver=2.1.2
-pkgrel=1
+pkgrel=2
arch=(any)
pkgdesc="An open source JPEG 2000 codec, version ${pkgver} (mingw-w64)"
license=("custom: BSD")
@@ -8,11 +8,24 @@ depends=(mingw-w64-libpng mingw-w64-lcms2)
makedepends=(mingw-w64-cmake)
options=(staticlibs !strip !buildflags)
url="https://www.openjpeg.org"
-source=("https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz")
-md5sums=('40a7bfdcc66280b3c1402a0eb1a27624')
+source=("https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz"
+"0001-fix-install-for-dlls.all.patch"
+"0003-versioned-dlls.mingw.patch"
+"0005-sock-jpip.all.patch")
+md5sums=('40a7bfdcc66280b3c1402a0eb1a27624'
+ 'c71b7576d88fdd7613f318297cb0c8be'
+ 'f8fd65a4d5b1dfc219b648325d33b389'
+ 'f4f5174de862b6803702d6eaa83da4da')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+prepare() {
+ cd openjpeg-$pkgver
+ patch -p1 -i ${srcdir}/0001-fix-install-for-dlls.all.patch
+ patch -p1 -i ${srcdir}/0003-versioned-dlls.mingw.patch
+ patch -p1 -i ${srcdir}/0005-sock-jpip.all.patch
+}
+
build() {
cd openjpeg-$pkgver
for _arch in ${_architectures}; do
@@ -23,10 +36,6 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_DOC=OFF \
-DBUILD_TESTING=OFF \
- -DBUILD_CODEC=OFF \
- -DBUILD_JP3D=ON \
- -DBUILD_JPIP=OFF \
- -DBUILD_JPWL=ON \
-DBUILD_SHARED_LIBS=OFF \
..
make
@@ -37,12 +46,7 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_DOC=OFF \
-DBUILD_TESTING=OFF \
- -DBUILD_CODEC=ON \
- -DBUILD_JP3D=ON \
- -DBUILD_JPIP=OFF \
- -DBUILD_JPWL=ON \
-DBUILD_PKGCONFIG_FILES=ON \
- -DBUILD_MJ2=ON \
..
make
popd