From nobody Fri Aug 04 02:33:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RH8sL5GLGz4Tkpd; Fri, 4 Aug 2023 02:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RH8sL4F6Rz3C01; Fri, 4 Aug 2023 02:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691116406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KwriQgMnccYiqyrDgn4M0GhHVEw8ec+qIUUN8NBjWdo=; b=ODZL0fc0doO5j0QceBkLlZF2UOWW1jT/KK/ILrcjcDee4E84aDKUGgRQXFn0c/0y6Oq9sh RlskUFmYSfhunUHG/x+KH9BPozliTXu7pmcc+4rnogB6HJ1bAuDS9yLooKWeNoQJGcfqMa Vt34ZVc3BqxF7l/ZKcmNb4tvJmbVFU9O5qwDTzA68qYnCVBKRkEMemtC8v53MR4+b1SZfg AROIcgHS2bINfmItPzCrcg0n+LprBXaT0TzfcpXSZx69HiaeKVCxTB5Qb1mdO7Uqr2PGTl RY5FwPog1vWfHBCgSaSJC1RUhnE2OnniD++n8MWBOl7uH92gJB2BvEZOf/1r+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691116406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KwriQgMnccYiqyrDgn4M0GhHVEw8ec+qIUUN8NBjWdo=; b=NPuTP3hK8mx07J/GT70ywzu5rs2ztlOOvbNNBpFgYAu7xrDJzY1WQohWy6FrJDXNyOdFcz Cy0r/2I4B4vbE4xAKL67pPLAuK/9P39YIcAT/pACAenaZ4oAGP9oFQ+yPt7N1MICdu8kvB og3v401fCHogQSIDRegSaWiiNHwiLkaPHZk+99+NUMKxKLPnzYZ5mfwzfovrtbmoopJI56 +SYye62bGA+fmo3yjTrpkIcMto2E6VT8Z03u4vF38y9OtuswDUudDUUDZ09m+cnGMA/wpr B/BFWDC8/Q7W7piIO12bdyI8ovXlOiECxoZjVtGaCci3gZ2sEZdElnSa0qkUMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691116406; a=rsa-sha256; cv=none; b=RaGJrmUM2vCjetaYmKmlZf4f16+IOdeVk02rcaWfE7dSLUV2h19AHXTaout6hFIh615xOB bLSuHZSe6XmkvoMrx6lIQWl+dzoBETFvT2rmou1cf8RtvEulPl0FGNfFTKv7TK93UX6sbA ZI2iR3/NdCxQp8qX7q7sXcr/TKvVjbJgZlqenqxrdwHILKN065VarB033vB802kKN8SLVf LjklkS4yD2W/qftr3rLzGvAHx4cE5XWsEbpW3dafqOFWkZP0sGboKs4VOXiy8L3nHlmzB+ oyT5gCGxN0KIrMeY8AvuP4pFRFbN51ISSiA2RcV6k2VXFazZLMP+5r3ddhMBgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RH8sL3Hrbzm0p; Fri, 4 Aug 2023 02:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3742XQdr037456; Fri, 4 Aug 2023 02:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3742XQ4J037455; Fri, 4 Aug 2023 02:33:26 GMT (envelope-from git) Date: Fri, 4 Aug 2023 02:33:26 GMT Message-Id: <202308040233.3742XQ4J037455@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3dd75711f95e - main - graphics/eos-movrec: take a different approach to unbreak the build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dd75711f95ee31ad9c23c13396a6bbbb117f357 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3dd75711f95ee31ad9c23c13396a6bbbb117f357 commit 3dd75711f95ee31ad9c23c13396a6bbbb117f357 Author: Alexey Dokuchaev AuthorDate: 2023-08-04 02:32:08 +0000 Commit: Alexey Dokuchaev 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 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