From nobody Thu Apr 27 12:04:10 2023 X-Original-To: dev-commits-ports-all@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 4Q6ZCZ4hkxz474K9; Thu, 27 Apr 2023 12:04:10 +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 4Q6ZCZ3Pfgz3lXX; Thu, 27 Apr 2023 12:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597050; 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=Cqr64R524gZj3mdQMDf3j/8AhRMO0inbbnBkVNVlo3k=; b=pcMSe2REQDgCYfGjW4V1zWDZBYXwF9uIqdQK5uylKMvXEDFTOPNcKnermzT3AwNux45zuR /eji5do67xgxbAiQttBCQb+fsXiKeZe8aiolrJ41ormm4FXmYI5NBpi9SOnSL0uRqHJtJJ uGfmOCkGkNVgGP46f2Ra14iWik3sEIkSTUKCk6WgwjJ3UyH+zVfnEshwaXVsOYu8zzGZj8 ILjn0PrSGYHUnjgGs2tSrZ96Yu/Klk2YE2Ye0SMuHIcDXakE9nXvgd410xN9biPbd360Zg k5LMbbZkgk9S2pDte3LctJcYKeHZpYWsqHuVrzs1y3oIG5MSkD04ovR69S1LMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597050; 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=Cqr64R524gZj3mdQMDf3j/8AhRMO0inbbnBkVNVlo3k=; b=KWEVHGS1xyPdObjGe0ZTWyoFvMtfjtFnUvqIoz9hC+jd29g40qVTB5Qy5UYkkAT/QOsJFi lkNvbfBGLrBnEg9SNA2Cx19sVZg0rWPEwjPx74499eQ2luLw+KbZPp8D75ZJrdDBdjXv5T NSCp2q1QDa6PbFYkRfCtRUoCHyLVCq/bIWPHewdrwCaLajeuZqBp+EAFnYdiqsDUP6Fx11 O2Aa/fRlHwW5hYg7taErhcZlJlzcUHXpUNWgTcVIro5E7EE7usaZuZpxpCjNADxc2dzGvA wR7Fa9Zz1Ua7II2/qMEWeGQ7/BsXKk1CzZVZjsei0sCOkgbMGMWvYTvehkEGkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597050; a=rsa-sha256; cv=none; b=PRwoFB+Q3u0WXkxivi8O1UGDpRm3vnS47VYqXZ7YJESYJI6S1nGNtyW0ycHf5jL4T3lBM7 s+AtPq9UZtWre04h1AZ3Te3ynaSSCG8RO37RW1bZADYFtLxYmGo/8iou0jFsExF/ayWLDC hAHh6+RjUVjpZjQtqsAntAg1wsVRh+2EekUoFmye77VPWwYF554pF0Db0OvFmGp3wfPiYw QgcsLBRdL1wkitAKS32wTzXmTDmj+aXsc2zPJ8CH7KjDzdNBnt6lUR9v5K3OiadbKo9QNm qssdVDH3gNUi+CNke2aCM+Nx2d9yV/PJV9N7r13qQd5bw4rATKs45j9AKjOeRQ== 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 4Q6ZCZ2PzGzH6C; Thu, 27 Apr 2023 12:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RC4AR4046364; Thu, 27 Apr 2023 12:04:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4A5r046363; Thu, 27 Apr 2023 12:04:10 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:10 GMT Message-Id: <202304271204.33RC4A5r046363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: e7617d92c598 - main - multimedia/motion: Move to FFmpeg 4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7617d92c598c78e58423cc26e7351815ac3fad2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7617d92c598c78e58423cc26e7351815ac3fad2 commit e7617d92c598c78e58423cc26e7351815ac3fad2 Author: Daniel Engberg AuthorDate: 2023-04-27 10:16:02 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:43 +0000 multimedia/motion: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270295 Approved by: 270194 Sponsored by: Blinkinblox --- multimedia/motion/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 7db84987c47a..3ea18cac70c9 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -28,6 +28,11 @@ USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes +CFLAGS+= -I${LOCALBASE}/ffmpeg4/include +LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" +MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" + # Standard bsd.port.mk variables SUB_FILES= pkg-message @@ -55,8 +60,9 @@ VIDEO_DESC= Video capture driver (Netcam support only if none selected) WEBCAMD_DESC= Webcams using webcamd BKTR_CONFIGURE_WITH= bktr -FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg -FFMPEG_CONFIGURE_ON= --with-ffmpeg=${LOCALBASE} + +FFMPEG_LIB_DEPENDS= libavformat.so.58:multimedia/ffmpeg4 +FFMPEG_CONFIGURE_ON= --with-ffmpeg=${LOCALBASE}/ffmpeg4 FFMPEG_CONFIGURE_OFF= --without-ffmpeg MYSQL_USES= mysql