[arch-commits] Commit in harvid/repos/community-x86_64 (3 files)

David Runge dvzrv at gemini.archlinux.org
Fri Sep 24 20:54:39 UTC 2021


    Date: Friday, September 24, 2021 @ 20:54:39
  Author: dvzrv
Revision: 1023972

archrelease: copy trunk to community-x86_64

Added:
  harvid/repos/community-x86_64/PKGBUILD
    (from rev 1023971, harvid/trunk/PKGBUILD)
  harvid/repos/community-x86_64/harvid-0.8.3-fix_dep_detection.patch
    (from rev 1023971, harvid/trunk/harvid-0.8.3-fix_dep_detection.patch)
Deleted:
  harvid/repos/community-x86_64/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   77 +++++++++++++++++++--------------
 harvid-0.8.3-fix_dep_detection.patch |   12 +++++
 2 files changed, 57 insertions(+), 32 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-24 20:54:30 UTC (rev 1023971)
+++ PKGBUILD	2021-09-24 20:54:39 UTC (rev 1023972)
@@ -1,32 +0,0 @@
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: speps <speps dot aur dot archlinux dot org>
-
-pkgname=harvid
-pkgver=0.8.3
-pkgrel=1
-pkgdesc="HTTP Ardour Video Daemon"
-arch=('x86_64')
-url="https://x42.github.io/harvid/"
-license=('GPL')
-depends=('ffmpeg')
-makedepends=('xxd')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/x42/${pkgname}/archive/v$pkgver.tar.gz")
-sha512sums=('748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  # different job setting needed to not crash build
-  make PREFIX=/usr -j1
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}/" install
-
-  # 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 README.md \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
-}

Copied: harvid/repos/community-x86_64/PKGBUILD (from rev 1023971, harvid/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-09-24 20:54:39 UTC (rev 1023972)
@@ -0,0 +1,45 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: speps <speps dot aur dot archlinux dot org>
+
+pkgname=harvid
+pkgver=0.8.3
+pkgrel=2
+pkgdesc="HTTP Ardour Video Daemon"
+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")
+sha512sums=('748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac'
+            '3da826ec4cd9790c58535c85db0835221d8f61a92a42632262a109f0d3d8f794b54827ecfed17b52df86c8669d914e0aab54a46d9c043fb4bdd2b49b4d54cfe2')
+b2sums=('b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7'
+        'd5aa761ab59c5ad8d87a3721f96c02826572a697ae320c1b6fee53525d7bfbb722bf40bde46fb16afba0a09e4899a51bfd176d58568d0d7268c534f9bea82fde')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # fix issues with newer versions of make:
+  # https://github.com/x42/harvid/issues/7
+  patch -Np1 -i "../${pkgname}-0.8.3-fix_dep_detection.patch"
+}
+build() {
+  cd "${pkgname}-${pkgver}"
+  # different job setting needed to not crash build
+  make -j1
+}
+
+package() {
+  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'libjpeg.so'
+  'libswscale.so')
+
+  cd "${pkgname}-${pkgver}"
+  make PREFIX=/usr DESTDIR="${pkgdir}/" install
+
+  # 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}/"
+}

Copied: harvid/repos/community-x86_64/harvid-0.8.3-fix_dep_detection.patch (from rev 1023971, harvid/trunk/harvid-0.8.3-fix_dep_detection.patch)
===================================================================
--- harvid-0.8.3-fix_dep_detection.patch	                        (rev 0)
+++ harvid-0.8.3-fix_dep_detection.patch	2021-09-24 20:54:39 UTC (rev 1023972)
@@ -0,0 +1,12 @@
+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
+ 



More information about the arch-commits mailing list