[arch-commits] Commit in harvid/trunk (PKGBUILD harvid-0.8.3-fix_dep_detection.patch)

[David Runge]

    Date: Thursday, February 3, 2022 @ 17:55:20
  Author: dvzrv
Revision: 1124908

upgpkg: harvid 0.8.3-3: Rebuild against ffmpeg4.4.

The package is not compatible with ffmpeg >= 5
https://github.com/x42/harvid/issues/8

Simplify quoting in file.
Simplify calls to make.
Replace custom patch for libjpeg-turbo detection with upstream patch.

Modified:
  harvid/trunk/PKGBUILD
Deleted:
  harvid/trunk/harvid-0.8.3-fix_dep_detection.patch

--------------------------------------+
 PKGBUILD                             |   35 ++++++++++++++++-----------------
 harvid-0.8.3-fix_dep_detection.patch |   12 -----------
 2 files changed, 18 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-03 17:37:30 UTC (rev 1124907)
+++ PKGBUILD	2022-02-03 17:55:20 UTC (rev 1124908)
@@ -3,19 +3,22 @@
 
 pkgname=harvid
 pkgver=0.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc="HTTP Ardour Video Daemon"
-arch=('x86_64')
+arch=(x86_64)
 url="https://x42.github.io/harvid/"
-license=('GPL2')
-depends=('glibc' 'libpng')
-makedepends=('ffmpeg' 'libjpeg-turbo' 'xxd')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/x42/${pkgname}/archive/v$pkgver.tar.gz"
-        "${pkgname}-0.8.3-fix_dep_detection.patch")
+license=(GPL2)
+depends=(glibc libpng)
+makedepends=(ffmpeg4.4 libjpeg-turbo xxd)
+options=(debug)
+source=(
+  "$pkgname-$pkgver.tar.gz::https://github.com/x42/${pkgname}/archive/v$pkgver.tar.gz"
+  "${pkgname}-0.8.3-fix_dep_detection.patch::https://github.com/x42/harvid/commit/2c9960770ff692b4e2bddc98981b096af8efeab1.patch"
+)
 sha512sums=('748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac'
-            '3da826ec4cd9790c58535c85db0835221d8f61a92a42632262a109f0d3d8f794b54827ecfed17b52df86c8669d914e0aab54a46d9c043fb4bdd2b49b4d54cfe2')
+            'aae761b56b9fb7d4cd00190271dbe125b292d25f666039cbd6ba76cab162659425cd1e116507bda0cce87c2e5d3d4d6769a58f7b7563f42849335f0a02bb34e8')
 b2sums=('b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7'
-        'd5aa761ab59c5ad8d87a3721f96c02826572a697ae320c1b6fee53525d7bfbb722bf40bde46fb16afba0a09e4899a51bfd176d58568d0d7268c534f9bea82fde')
+        '2229dc7bea3c22ebc1c9a28401bbfa8159588f560a8aac5e977b9d4cae0e7918828127000d7cd108de86bbc4dad5b7c10687098686a6309d7c8c8e0b36efa344')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -24,22 +27,20 @@
   patch -Np1 -i "../${pkgname}-0.8.3-fix_dep_detection.patch"
 }
 build() {
-  cd "${pkgname}-${pkgver}"
+  # not compatible with ffmpeg >= 5: https://github.com/x42/harvid/issues/8
+  export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig:$PKG_CONFIG_PATH"
   # different job setting needed to not crash build
-  make -j1
+  make -j1 -C "${pkgname}-${pkgver}"
 }
 
 package() {
-  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'libjpeg.so'
-  'libswscale.so')
+  depends+=(libavcodec.so libavformat.so libavutil.so libjpeg.so libswscale.so)
 
-  cd "${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}/" install
+  make PREFIX=/usr DESTDIR="${pkgdir}/" install -C "${pkgname}-${pkgver}"
 
   # ffmpeg and ffprobe symlinks (for ardour)
   ln -sv ffmpeg "${pkgdir}/usr/bin/ffmpeg_${pkgname}"
   ln -sv ffprobe "${pkgdir}/usr/bin/ffprobe_${pkgname}"
 
-  install -vDm 644 {ChangeLog,README.md} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  install -vDm 644 "${pkgname}-${pkgver}/"{ChangeLog,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}/"
 }

Deleted: harvid-0.8.3-fix_dep_detection.patch
===================================================================
--- harvid-0.8.3-fix_dep_detection.patch	2022-02-03 17:37:30 UTC (rev 1124907)
+++ harvid-0.8.3-fix_dep_detection.patch	2022-02-03 17:55:20 UTC (rev 1124908)
@@ -1,12 +0,0 @@
-diff -ruN a/src/Makefile b/src/Makefile
---- a/src/Makefile	2018-11-30 23:30:41.000000000 +0100
-+++ b/src/Makefile	2021-09-24 22:38:42.060503051 +0200
-@@ -16,7 +16,7 @@
-   $(error "libpng is required - install libpng-dev")
- endif
- 
--ifeq ($(shell $(ECHO) "\#include <stdio.h>\n\#include <jpeglib.h>\nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no)
-+ifeq ($(shell $(ECHO) "#include <stdio.h>\n#include <jpeglib.h>\nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no)
-   $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")
- endif
-