Bump version to 1.8.34

- Add upstream fixes for openjpeg2.5, compile issues on Arch, remove
  support for openjpeg1

3 files changed, 19 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c0543b77f2a..8e64ae0fb301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libdcp
 	pkgdesc = A small C++ library which can create and read Digital Cinema Packages using JPEG2000 and WAV files
-	pkgver = 1.8.27
+	pkgver = 1.8.34
 	pkgrel = 1
 	url = https://carlh.net/libdcp
 	arch = i686
@@ -15,13 +15,12 @@ pkgbase = libdcp
 	depends = xmlsec
 	depends = imagemagick
 	depends = openjpeg2>=2.5
-	depends = libcxml>=0.17.3
+	depends = libcxml>=0.17.4
 	depends = libsigc++>=2.0
 	depends = boost-libs>=1.72.0
-	depends = libasdcp-cth>=0.1.6.r18.ga276ed1
-	source = libdcp-1.8.27.tar.gz::https://git.carlh.net/gitweb/?p=libdcp.git;a=snapshot;h=v1.8.27;sf=tgz
-	source = 0001-fix-compile-with-openjp25.patch
-	sha256sums = a51dd14d864fd5356a16b6e43542ef1ef5aced5d2d55ff5b2bcb751ddd170c7c
-	sha256sums = 671046a87eaf567ca94cde72a92497239155d7cb12450ee12b41b2eed13c78fb
+	depends = xerces-c
+	depends = libasdcp-cth>=0.1.6.r20.g825e475
+	source = libdcp-1.8.34::git+git://git.carlh.net/git/libdcp.git#tag=v1.8.34
+	sha256sums = SKIP
 
 pkgname = libdcp
diff --git a/0001-fix-compile-with-openjp25.patch b/0001-fix-compile-with-openjp25.patch
deleted file mode 100644
index 1cc8768962b3..000000000000
--- a/0001-fix-compile-with-openjp25.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/j2k_transcode.cc	2022-05-17 10:07:44.525679224 +0200
-+++ b/src/j2k_transcode.cc	2022-05-17 10:04:18.846330309 +0200
-@@ -46,7 +46,7 @@
- #include <openjpeg.h>
- #include <cmath>
- #include <iostream>
--
-+#include <string>
- 
- using std::min;
- using std::pow;
-@@ -315,10 +315,13 @@
- 	parameters.max_comp_size = parameters.max_cs_size / 1.25;
- 	parameters.tcp_numlayers = 1;
- 	parameters.tcp_mct = 1;
--	parameters.numgbits = fourk ? 2 : 1;
-+	string numgbits = "GUARD_BITS=";
-+	numgbits.append(std::to_string(fourk ? 2 : 1));
-+	const char* extraopt[] { numgbits.data(), nullptr };
- 
- 	/* Setup the encoder parameters using the current image and user parameters */
- 	opj_setup_encoder (encoder, &parameters, xyz->opj_image());
-+	opj_encoder_set_extra_options(encoder, extraopt);
- 
- 	auto stream = opj_stream_default_create (OPJ_FALSE);
- 	if (!stream) {
diff --git a/PKGBUILD b/PKGBUILD
index d2b0fa2a87ca..b6bf39415e43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,28 @@
 # Maintainer: Benjamin Radel <aur@radel.tk>
 # Contributor: Stefan Karner <stefan.karner@student.tuwien.ac.at>
 pkgname=libdcp
-pkgver=1.8.27
+pkgver=1.8.34
 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=('libxml++2.6' 'xmlsec' 'imagemagick' 'openjpeg2>=2.5' 'libcxml>=0.17.3' 'libsigc++>=2.0' 'boost-libs>=1.72.0' 'libasdcp-cth>=0.1.6.r18.ga276ed1')
+depends=('libxml++2.6' 'xmlsec' 'imagemagick' 'openjpeg2>=2.5' 'libcxml>=0.17.4' 'libsigc++>=2.0' 'boost-libs>=1.72.0' 'xerces-c'  'libasdcp-cth>=0.1.6.r20.g825e475')
 makedepends=('git' 'python' 'boost>=1.72.0' 'gcc' 'pkg-config')
-source=("${pkgname}-${pkgver}.tar.gz::https://git.carlh.net/gitweb/?p=${pkgname}.git;a=snapshot;h=v${pkgver};sf=tgz"
-	"0001-fix-compile-with-openjp25.patch")
-sha256sums=('a51dd14d864fd5356a16b6e43542ef1ef5aced5d2d55ff5b2bcb751ddd170c7c'
-            '671046a87eaf567ca94cde72a92497239155d7cb12450ee12b41b2eed13c78fb')
+_cherrypicks=('32360aedc97a0cc9acc1b1c10d2e8351dcacb549'
+	      'b995947a86a583a44bbe667e9bbd031296bf7e88'
+              '2c6d80c295dd3d10c1c9c08dd31758dd1abdf5da')
+source=("${pkgname}-${pkgver}::git+git://git.carlh.net/git/${pkgname}.git#tag=v${pkgver}")
+sha256sums=('SKIP')
 
 prepare() {
-  mv "${srcdir}/${pkgname}-v${pkgver}-"* "${srcdir}/${pkgname}-${pkgver}"
   cd $srcdir/${pkgname}-${pkgver}
-  ### Patch libdcp for openjpeg>2.5 ###
+  ### Cherry pick upstream commits (fixes and such) ###
+  for c in "${_cherrypicks[@]}"; do
+      echo "Applying commit ${c}"
+      git cherry-pick ${c};
+  done
+  ### Apply patches ###
   for p in "${source[@]}"; do
     if [[ "$p" =~ \.patch$ ]]; then
       echo "Applying patch ${p##*/}"