diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-set-version.patch | 25 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | arch--boost-1.78.patch | 12 |
4 files changed, 57 insertions, 37 deletions
@@ -1,24 +1,24 @@ pkgbase = dcpomatic pkgdesc = A free, open-source program to generate Digital Cinema Packages (DCPs) from videos or images - pkgver = 2.14.57 + pkgver = 2.16.10 pkgrel = 1 url = https://dcpomatic.com/ arch = i686 arch = x86_64 - makedepends = python2 + makedepends = python + makedepends = which makedepends = boost>=1.78.0 depends = pangomm>=1.4 depends = xorgproto - depends = libsub>=1.4.24 - depends = libcxml>=0.16.1 - depends = libdcp>=1.6.17 + depends = libsub>=1.6.13 + depends = libcxml>=0.17.3 + depends = libdcp>=1.8.13 depends = ffmpeg>=4.0.2 depends = glib2 depends = imagemagick depends = libssh - depends = wxgtk2>=3.0.4 + depends = wxgtk3>=3.0.4 depends = wxgtk-common - depends = libquickmail>=0.1.29 depends = libzip depends = xz depends = libsndfile @@ -26,9 +26,11 @@ pkgbase = dcpomatic depends = pangomm depends = rtaudio depends = x264 - source = dcpomatic-2.14.57.tar.bz2::https://dcpomatic.com/dl.php?id=source&version=2.14.57 - source = arch--boost-1.78.patch - sha256sums = f78b61ed9599bd4356cc6f16ea2b581285ffa8bfd778fd83427560b6be870489 - sha256sums = 49f7e47fa714d348a2fd9830e89ddf9334908284433a72e9d56c8375958b748b + depends = openssl + depends = leqm-nrt>=0.0.2 + source = dcpomatic-2.16.10.tar.bz2::https://dcpomatic.com/dl.php?id=source&version=2.16.10 + source = 0001-set-version.patch + sha256sums = 6cdccc69b0171220ae644c13fcfdad18d1957c9407ce370901627689cec670b9 + sha256sums = 21f83b2b6850a6fb717ff2815f53148b68efa83882c89e664c721d737afb0040 pkgname = dcpomatic diff --git a/0001-set-version.patch b/0001-set-version.patch new file mode 100644 index 000000000000..47e7da1677c2 --- /dev/null +++ b/0001-set-version.patch @@ -0,0 +1,25 @@ +diff --git a/wscript b/wscript +index e30727c..3f0ae47 100644 +--- a/wscript ++++ b/wscript +@@ -38,19 +38,7 @@ APPNAME = 'dcpomatic' + libdcp_version = '1.8.13' + libsub_version = '1.6.13' + +-this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] +-last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] +- +-# Python 2/3 compatibility; I don't really understand what's going on here +-if not isinstance(this_version, str): +- this_version = this_version.decode('utf-8') +-if not isinstance(last_version, str): +- last_version = last_version.decode('utf-8') +- +-if this_version == '' or this_version == 'merged-to-main': +- VERSION = '%sdevel' % last_version[1:].strip() +-else: +- VERSION = this_version[1:].strip() ++VERSION = 'XXXXXX' + + def options(opt): + opt.load('compiler_cxx') @@ -1,41 +1,46 @@ # Maintainer: Markus Kalb <mk@filmkreis.tu-darmstadt.de> +# Maintainer: Benjamin Radel <aur@radel.tk> # Contributor: Stefan Karner <stefan.karner@student.tuwien.ac.at> pkgname=dcpomatic -pkgver=2.14.57 +pkgver=2.16.10 pkgrel=1 pkgdesc="A free, open-source program to generate Digital Cinema Packages (DCPs) from videos or images" arch=('i686' 'x86_64') url="https://dcpomatic.com/" # CXXFLAGS="$CXXFLAGS -I/usr/include/openjpeg-1.5/ -std=c++11" -depends=('pangomm>=1.4' 'xorgproto' 'libsub>=1.4.24' 'libcxml>=0.16.1' 'libdcp>=1.6.17' 'ffmpeg>=4.0.2' 'glib2' 'imagemagick' 'libssh' 'wxgtk2>=3.0.4' 'wxgtk-common' 'libquickmail>=0.1.29' 'libzip' 'xz' 'libsndfile' 'libsamplerate' 'pangomm' 'rtaudio' 'x264') -makedepends=('python2' 'boost>=1.78.0' ) +depends=('pangomm>=1.4' 'xorgproto' 'libsub>=1.6.13' 'libcxml>=0.17.3' 'libdcp>=1.8.13' 'ffmpeg>=4.0.2' 'glib2' 'imagemagick' 'libssh' 'wxgtk3>=3.0.4' 'wxgtk-common' 'libzip' 'xz' 'libsndfile' 'libsamplerate' 'pangomm' 'rtaudio' 'x264' 'openssl' 'leqm-nrt>=0.0.2') +makedepends=('python' 'which' 'boost>=1.78.0' ) source=("${pkgname}-${pkgver}.tar.bz2::https://dcpomatic.com/dl.php?id=source&version=${pkgver}" - "arch--boost-1.78.patch") -sha256sums=('f78b61ed9599bd4356cc6f16ea2b581285ffa8bfd778fd83427560b6be870489' - '49f7e47fa714d348a2fd9830e89ddf9334908284433a72e9d56c8375958b748b') - + "0001-set-version.patch" ) +sha256sums=('6cdccc69b0171220ae644c13fcfdad18d1957c9407ce370901627689cec670b9' + '21f83b2b6850a6fb717ff2815f53148b68efa83882c89e664c721d737afb0040') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch --forward --strip=1 --input="${srcdir}/arch--boost-1.78.patch" + ## Set Version in Source + sed -i "/^\+VERSION/ s/XXXXXX/${pkgver}/" ${srcdir}/0001-set-version.patch + for p in "${source[@]}"; do + if [[ "$p" =~ \.patch$ ]]; then + echo "Applying patch ${p##*/}" + patch -p1 -N -i "${srcdir}/${p##*/}" + fi + done + python waf configure --prefix=/usr --wx-config=/usr/bin/wx-config-gtk3 } build() { - PKG_CONFIG_LIBDIR="/usr/lib64/pkgconfig/:/usr/lib/pkgconfig/:$PKG_CONFIG_LIBDIR" - CXXFLAGS="$CXXFLAGS -std=c++11 -O2 " - cd "${srcdir}/${pkgname}-${pkgver}" - python2 waf configure --prefix=/usr --disable-tests - 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 mv usr/lib64 usr/lib fi + ln -s $(which openssl) usr/bin/dcpomatic2_openssl } diff --git a/arch--boost-1.78.patch b/arch--boost-1.78.patch deleted file mode 100644 index 44387b15a62e..000000000000 --- a/arch--boost-1.78.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/lib/case_insensitive_sorter.cc b/src/lib/case_insensitive_sorter.cc -index 1dfdb01f3..c7cc8dadc 100644 ---- a/src/lib/case_insensitive_sorter.cc -+++ b/src/lib/case_insensitive_sorter.cc -@@ -21,6 +21,7 @@ - #include "case_insensitive_sorter.h" - #include <boost/filesystem.hpp> - #include <boost/foreach.hpp> -+#include <algorithm> - #include <iostream> - - using std::string; |