Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Aug 2023 02:33:26 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3dd75711f95e - main - graphics/eos-movrec: take a different approach to unbreak the build
Message-ID:  <202308040233.3742XQ4J037455@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=3dd75711f95ee31ad9c23c13396a6bbbb117f357

commit 3dd75711f95ee31ad9c23c13396a6bbbb117f357
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-08-04 02:32:08 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-08-04 02:32:08 +0000

    graphics/eos-movrec: take a different approach to unbreak the build
    
    Fix the bad guard around #include <unistd.h> and drop the `register'
    keyword which is no longer accepted as of C++ 17 instead of forcing
    the particular (less strict) C++ standard.  Reclaim maintainership.
---
 graphics/eos-movrec/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
index cc7c9397ed1a..eeab93e8a40d 100644
--- a/graphics/eos-movrec/Makefile
+++ b/graphics/eos-movrec/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	6
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Capture short movies with Canon DSLR camera
 WWW=		https://sourceforge.net/projects/eos-movrec/
 
@@ -14,7 +14,6 @@ LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 USES=		cmake compiler:c++11-lang dos2unix pkgconfig qt:5 tar:bzip2
 DOS2UNIX_FILES=	main.cpp
-USE_CXXSTD=	c++14
 USE_QT=		buildtools:build qmake:build core gui widgets
 
 ICON_SIZES=	16x16 32x32 128x128 256x256 512x512
@@ -23,7 +22,9 @@ DESKTOP_ENTRIES="EOS Camera Movie Recorder" "" "${PORTNAME}" \
 		"eos_movrec" "Graphics;Photography;Qt;" ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|GLIBC|${OPSYS}|' ${WRKSRC}/os_api.h
+	@${REINPLACE_CMD} -e 's,GLIBC,${OPSYS},' ${WRKSRC}/mjpegwrt.c \
+		${WRKSRC}/os_api.h
+	@${REINPLACE_CMD} -e '/int/s,register ,,' ${WRKSRC}/histogramwnd.cpp
 .for s in 16 32 128 256 512
 	@cd ${WRKSRC}/mac.icons && \
 		${MV} ${s}.png ${PORTNAME}_${s}x${s}.png



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