From 754eb30fecc05e1b9905ebfff4fff07bfd2c7883 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Tue, 20 Jan 2015 16:23:26 +0300
Subject: [PATCH] openjpeg: Build static library too.

---
 mingw-w64-openjpeg/PKGBUILD | 62 +++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/mingw-w64-openjpeg/PKGBUILD b/mingw-w64-openjpeg/PKGBUILD
index 234fa6c9a0..26186eae08 100644
--- a/mingw-w64-openjpeg/PKGBUILD
+++ b/mingw-w64-openjpeg/PKGBUILD
@@ -1,25 +1,27 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=openjpeg
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source JPEG 2000 codec (mingw-w64)"
 arch=('any')
 url="http://www.openjpeg.org"
 license=("BSD")
-depends=("${MINGW_PACKAGE_PREFIX}-lcms2" "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-zlib")
+depends=("${MINGW_PACKAGE_PREFIX}-lcms2"
+         "${MINGW_PACKAGE_PREFIX}-libtiff"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("dos2unix"
             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-gcc"
             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 options=('staticlibs' 'strip')
 source=(http://sourceforge.net/projects/openjpeg.mirror/files/${_realname}-${pkgver}.tar.gz
-    "cdecl.patch"
-    "openjpeg-1.5.1_tiff-pkgconfig.patch"
-    mingw-install-pkgconfig-files.patch
-    versioned-dlls-mingw.patch)
+        "cdecl.patch"
+        "openjpeg-1.5.1_tiff-pkgconfig.patch"
+        "mingw-install-pkgconfig-files.patch"
+        "versioned-dlls-mingw.patch")
 
 md5sums=('c41772c30fb1c272358b3707233134a1'
          '673edf457f9b4f3fdc9a083e1857a76a'
@@ -41,36 +43,50 @@ prepare() {
 }
 
 build() {
-  mkdir -p ${pkgdir}${MINGW_PREFIX}
-  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
-  export PREFIX_WIN=`pwd -W`
-  popd > /dev/null
-  
-  pushd ${MINGW_PREFIX} > /dev/null
-  export PREFIX_DEPS=`pwd -W`
-  popd > /dev/null
-
-  [[ -d $srcdir/build-${MINGW_CHOST} ]] && rm -rf $srcdir/build-${MINGW_CHOST}
-  mkdir $srcdir/build-${MINGW_CHOST}
-  cd $srcdir/build-${MINGW_CHOST}
+  msg "Build shared version..."
+  [[ -d $srcdir/build-shared-${MINGW_CHOST} ]] && rm -rf $srcdir/build-shared-${MINGW_CHOST}
+  mkdir $srcdir/build-shared-${MINGW_CHOST}
+  cd $srcdir/build-shared-${MINGW_CHOST}
   
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX=${PREFIX_WIN} \
+    -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING:BOOL=ON \
-    -DCMAKE_SYSTEM_PREFIX_PATH=${PREFIX_DEPS} \
+    -DCMAKE_SYSTEM_PREFIX_PATH=${MINGW_PREFIX} \
     -DOPENJPEG_INSTALL_SUBDIR="openjpeg/${ver}" \
     -DBUILD_MJ2=ON \
     -DBUILD_JPWL=ON \
     -DBUILD_JPIP=ON \
     ../${_realname}-$pkgver
   make
+
+  msg "Build static version..."
+  [[ -d $srcdir/build-static-${MINGW_CHOST} ]] && rm -rf $srcdir/build-static-${MINGW_CHOST}
+  mkdir $srcdir/build-static-${MINGW_CHOST}
+  cd $srcdir/build-static-${MINGW_CHOST}
+  
+  ${MINGW_PREFIX}/bin/cmake \
+    -G"MSYS Makefiles" \
+    -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING:BOOL=OFF \
+    -DCMAKE_SYSTEM_PREFIX_PATH=${MINGW_PREFIX} \
+    -DOPENJPEG_INSTALL_SUBDIR="openjpeg/${ver}" \
+    -DBUILD_MJ2=ON \
+    -DBUILD_JPWL=ON \
+    -DBUILD_JPIP=OFF \
+    -DBUILD_SHARED_LIBS=OFF \
+    ../${_realname}-$pkgver
+  make
 }
 
 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make install # DESTDIR="$pkgdir"
+  cd "$srcdir/build-static-${MINGW_CHOST}"
+  make install
+  
+  cd "$srcdir/build-shared-${MINGW_CHOST}"
+  make install
 
   mkdir -p ${pkgdir}${MINGW_PREFIX}
   pushd ${pkgdir}${MINGW_PREFIX} > /dev/null