Update libdcp to 1.8.13

Includes an ugly fix for customized libopenjpeg.
Patched libopenjp is linked in statically.

2 files changed, 45 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45b513685a3a..af237ff5f60a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = libdcp
 	pkgdesc = A small C++ library which can create and read Digital Cinema Packages using JPEG2000 and WAV files
-	pkgver = 1.6.17
+	pkgver = 1.8.13
 	pkgrel = 1
 	url = https://carlh.net/libdcp
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = python2
+	makedepends = git
+	makedepends = cmake
+	makedepends = python
 	makedepends = boost>=1.72.0
-	makedepends = python2
 	makedepends = gcc
 	makedepends = pkg-config
-	depends = openssl
 	depends = libxml++2.6
 	depends = xmlsec
 	depends = imagemagick
-	depends = openjpeg2
-	depends = libcxml>=0.16.1
+	depends = libcxml>=0.17.3
 	depends = libsigc++>=2.0
 	depends = boost-libs>=1.72.0
-	depends = libasdcp-cth>=0.1.3
-	source = https://carlh.net/downloads/libdcp/libdcp-1.6.17.tar.bz2
-	sha512sums = b5902f6f43ab4bd17d03766d611be4c1a5801a48f39330eb41c2c23fe0a3570c720efad52d07f360b5af73fc83d69402418be1fb551c541bd74380efe8b0157e
+	depends = libasdcp-cth>=0.1.6
+	source = libdcp-1.8.13::git+git://git.carlh.net/git/libdcp.git#tag=v1.8.13
+	source = openjpeg-carl::git://git.carlh.net/git/openjpeg.git#branch=carl-2
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = libdcp
-
diff --git a/PKGBUILD b/PKGBUILD
index 1443bbcc7097..76645e592725 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,53 @@
 # Maintainer: Markus Kalb <mk@filmkreis.tu-darmstadt.de>
+# Maintainer: Benjamin Radel <aur@radel.tk>
 # Contributor: Stefan Karner <stefan.karner@student.tuwien.ac.at>
 pkgname=libdcp
-pkgver=1.6.17
+pkgver=1.8.13
 pkgrel=1
 pkgdesc="A small C++ library which can create and read Digital Cinema Packages using JPEG2000 and WAV files"
 arch=('i686' 'x86_64')
 url="https://carlh.net/libdcp"
 license=('GPL')
-depends=('openssl' 'libxml++2.6' 'xmlsec' 'imagemagick' 'openjpeg2' 'libcxml>=0.16.1' 'libsigc++>=2.0' 'boost-libs>=1.72.0' 'libasdcp-cth>=0.1.3')
-makedepends=('python2' 'boost>=1.72.0' 'python2' 'gcc' 'pkg-config')
-source=("https://carlh.net/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2"  )
-sha512sums=('b5902f6f43ab4bd17d03766d611be4c1a5801a48f39330eb41c2c23fe0a3570c720efad52d07f360b5af73fc83d69402418be1fb551c541bd74380efe8b0157e')
+depends=('libxml++2.6' 'xmlsec' 'imagemagick' 'libcxml>=0.17.3' 'libsigc++>=2.0' 'boost-libs>=1.72.0' 'libasdcp-cth>=0.1.6')
+makedepends=('git' 'cmake' 'python' 'boost>=1.72.0' 'gcc' 'pkg-config')
+source=("${pkgname}-${pkgver}::git+git://git.carlh.net/git/${pkgname}.git#tag=v${pkgver}"  
+        "openjpeg-carl::git://git.carlh.net/git/openjpeg.git#branch=carl-2")
+sha256sums=('SKIP'
+            'SKIP')
+
+prepare() {
+  ### Ugly fix for custom openjpeg ###
+  _openjpeg_builddir=$srcdir/openjpeg-build
+  cd $srcdir/openjpeg-carl
+  CFLAGS+=" -fPIC"
+  cmake -B $_openjpeg_builddir  -DCMAKE_BUILD_TYPE=None -DBUILD_PKGCONFIG_FILES=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$srcdir/openjpeg-install -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS"
+  cmake --build $_openjpeg_builddir
+  cd $_openjpeg_builddir
+  make install
+  cd $srcdir/openjpeg-install
+  ### Remove shared libs (why are they built anyway?) ###
+  find . -type l -name '*.so*' -exec rm {} \;
+  find . -type f -name '*.so*' -exec rm {} \;
+  rm -r bin
+  ### Rename pkgconf-file to avoid conflict with system openjpeg ###
+  mv lib/pkgconfig/libopenjp2.pc lib/pkgconfig/libopenjp2-carl.pc
+
+  ### Configure libdcp ###
+  cd "$srcdir/${pkgname}-${pkgver}"
+  ### Patch wscript to use static openjpeg-carl ###
+  sed -i 's/libopenjp2/libopenjp2-carl/' wscript
+  PKG_CONFIG_PATH=$srcdir/openjpeg-install/lib/pkgconfig \
+  python waf configure --prefix=/usr
+}
 
 build() {
-  CXXFLAGS="$CXXFLAGS -std=c++11"
   cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 waf configure --prefix=/usr
-  python2 waf build
+  python waf build
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 waf install --destdir=$pkgdir
+  python waf install --destdir=$pkgdir
   cd "${pkgdir}"
   if [ -d usr/lib64   ]
     then