From 2a6a603278df5c3d3f02e62574f7fc5c87ddc830 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sat, 1 Feb 2020 17:53:28 -0500
Subject: [lightspark]: rebuild against latest boost

---
 pcr/lightspark/PKGBUILD | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

(limited to 'pcr/lightspark')

diff --git a/pcr/lightspark/PKGBUILD b/pcr/lightspark/PKGBUILD
index 0f4f52cd1..abadafaa3 100644
--- a/pcr/lightspark/PKGBUILD
+++ b/pcr/lightspark/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=lightspark
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source flash player implementation"
 arch=('armv7h' 'i686' 'x86_64')
 url=http://lightspark.github.io/
@@ -21,25 +21,42 @@ depends=('boost-libs' 'cairo' 'curl' 'desktop-file-utils' 'ffmpeg' 'glew' \
 optdepends=('gnash-gtk: Gnash fallback support')
 makedepends=('cmake' 'nasm' 'boost')
 conflicts=('lightspark-git')
-
 install=lightspark.install
 source=(https://github.com/lightspark/lightspark/archive/${pkgver}.tar.gz)
 sha256sums=('05595a3085bf76ea5c9723f128dcadead5ccf38e177c3a456901ccee3265548a')
 
+# FIXME: FTBS against boost 1.72.0 - see note in prepare()
+source+=(include-boostserialization.patch)
+sha256sums+=('669b021aebb1bd0f4f8f7c029b963c575eaf3cdee1de194144bc8c9b8b61d2e5')
+
 
-_builddir=${pkgname}-${pkgver}/build
+_version_constraint() # (dep_pkgname)
+{
+  local dep_pkgname=$1
+  local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
+  version=${version%-*}
+  local version_inc=${version%.*}.$(( ${version##*.} + 1 ))
+
+  echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}"
+}
 
 
 prepare()
 {
-  cd "${srcdir}"/
+  cd "${srcdir}"/${pkgname}-${pkgver}/
+
+  [ -d build ] && rm -rf build/* || mkdir build
 
-  [ -d ${_builddir} ] && rm -rf ${_builddir}/* || mkdir ${_builddir}
+  # FIXME: FTBS against boost 1.72.0 - next upstream release should have this patch applied
+  # https://labs.parabola.nu/issues/2568
+  # https://github.com/lightspark/lightspark/pull/409
+  # i686 still has boost-libs 1.71.0
+  [[ "${CARCH}" != 'i686' ]] && patch -Np1 < "${srcdir}"/include-boostserialization.patch
 }
 
 build()
 {
-  cd "${srcdir}"/${_builddir}/
+  cd "${srcdir}"/${pkgname}-${pkgver}/build
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr         \
         -DCOMPILE_PLUGIN=1                  \
@@ -51,7 +68,9 @@ build()
 
 package()
 {
-  cd "${srcdir}"/${_builddir}/
+  depends+=( $(_version_constraint 'boost-libs') )
+
+  cd "${srcdir}"/${pkgname}-${pkgver}/build
 
   make DESTDIR="${pkgdir}/" install
 
-- 
cgit v1.2.3