Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Apr 2023 11:47:36 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 35f7caa0f364 - main - multimedia/harvid: Update to 0.9.1
Message-ID:  <202304081147.338BlaqW026171@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=35f7caa0f364c34eb10c4a61e1731829cbf3082d

commit 35f7caa0f364c34eb10c4a61e1731829cbf3082d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-04-08 11:22:09 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-04-08 11:22:44 +0000

    multimedia/harvid: Update to 0.9.1
    
    Fixes build with FFmpeg 6.0
    
    Changelog: https://github.com/x42/harvid/blob/v0.9.1/ChangeLog
    
    PR:             270256
    Approved by:    portmgr (maintainer timeout, 3+ weeks)
---
 multimedia/harvid/Makefile                 | 3 +--
 multimedia/harvid/distinfo                 | 6 +++---
 multimedia/harvid/files/patch-src_Makefile | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/multimedia/harvid/Makefile b/multimedia/harvid/Makefile
index befa480b7317..15ad8a8c4848 100644
--- a/multimedia/harvid/Makefile
+++ b/multimedia/harvid/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	harvid
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.2
-PORTREVISION=	3
+DISTVERSION=	0.9.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	marcelbonnet@gmail.com
diff --git a/multimedia/harvid/distinfo b/multimedia/harvid/distinfo
index b8bd2725f736..e41851e7e790 100644
--- a/multimedia/harvid/distinfo
+++ b/multimedia/harvid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519465247
-SHA256 (x42-harvid-v0.8.2_GH0.tar.gz) = 3e3e22f554c7c8f0efe3ca400200e95c9fd5c0495cc76c4ae08991bc2abbc358
-SIZE (x42-harvid-v0.8.2_GH0.tar.gz) = 116541
+TIMESTAMP = 1678872633
+SHA256 (x42-harvid-v0.9.1_GH0.tar.gz) = 6a3c881644b4c044d01ebd06bc8388b2f85764d7f1efac4a3cdeac9858f156a5
+SIZE (x42-harvid-v0.9.1_GH0.tar.gz) = 117187
diff --git a/multimedia/harvid/files/patch-src_Makefile b/multimedia/harvid/files/patch-src_Makefile
index 0b68ea8e6ca6..a4107daadbc1 100644
--- a/multimedia/harvid/files/patch-src_Makefile
+++ b/multimedia/harvid/files/patch-src_Makefile
@@ -1,13 +1,13 @@
---- src/Makefile.orig	2018-02-24 09:51:55 UTC
+--- src/Makefile.orig	2023-03-15 09:34:19 UTC
 +++ src/Makefile
-@@ -16,9 +16,9 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONF
+@@ -16,9 +16,9 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-c
    $(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 $(CC) ../misc/jpeg-test.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
-+#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 $(CC) ../misc/jpeg-test.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
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304081147.338BlaqW026171>