From nobody Thu Apr 27 12:03:55 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 4Q6ZCJ02lLz4749X; Thu, 27 Apr 2023 12:03:56 +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 4Q6ZCH6Mjgz3kw6; Thu, 27 Apr 2023 12:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597035; 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=pe9wGfsAK4MjLkH0YmJNMnyHyQssIvIZHiufOWCaJbo=; b=C2cE9E9KoOJa2LcaEK3qVlc2lKW5DKx4ChXQAMgRWfPKc/GGZxeheYqZWx/wbMVxa5AfZM OdgZ9zYJX8gT9k6Jsz08FGTMtSLnBW2CGz3ALIgFH8zPo/94SI7igUpqS9mK3pczOCWo9T sCbrDx2Be710qVto1Z4DDv7KrzBFUuMbAL0VO6h0yqvs5suyHNTiPiflKh5NkotHrwFnXB E6XzxPwbp7h6tS19yXbLnLx6vMe3BBP8AlNsVwzqrwlXehQUGas9rM2FCU0+j1NPNJohau twaSnGE70sFoTGnTMrEM6KZr8nHO48z6kACSy9/Or8ytzTuZBGOO9XWjTDQIwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597035; 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=pe9wGfsAK4MjLkH0YmJNMnyHyQssIvIZHiufOWCaJbo=; b=tUCcnmeC0kY4ZN3ftjM0JmHWknpVs+TNvEv4pRpqJYcJSSIdwcrNedMTDFTUcVPGSVba5M dVNU0y4XIc37v3w8JV0hn0+H3LzyeRh2by03dcbEboZgNbphdD4AhiQpRmAA/wdpLZbYub 5cTaUp9wfy2zwIxDpkfyqbKC2ucQrlIBFxMj4BODzs4BDs+H+duSjmZ+5AQHP1SZiXjSHo 7MUnv1nFqougKKvDqetSbX/xjWXoktexM7vhLiLzhxCp4UPrqBeg+s21WuJVorj2zNpZDz VI7Prks4SKghl12sDjyYDp4uMJ+6kcZhqvpt7FMBHmdqyO+lREX6iGh5orSDwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597035; a=rsa-sha256; cv=none; b=i8Aij+fsbyxjEo6zdf0Zbll1ply8ZYJ/WbngPd2E62jT8Ra3kU8Wf6jMlUcckmR0KG0o/c zCawBHn0DHYJo3rk6ehrdLp3MVoQa3YDPpsYTC6EdM22e5DkwCGppCK29oV6BAv/I66mCc QxmpSfJDGpSeA/2W18BtF9E/qyf8x4Hf3xuvIlWFcGMMlXa538FWGpHIS0Nkqrh+yHCI8o COWuWuBvSkLZUJk+/SmljbFySeItjL1GbJmrn18mdqK1kSpxRSa5HNvKw6pNPp1LkLa4OQ DOi7AQH1pYCScNZLv/c/YpamAIVVA57+LS103SHsprWTuGQBtLQFLgpigX0Caw== 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 4Q6ZCH51nrzGp4; Thu, 27 Apr 2023 12:03:55 +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 33RC3tmB046087; Thu, 27 Apr 2023 12:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3tTK046086; Thu, 27 Apr 2023 12:03:55 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:55 GMT Message-Id: <202304271203.33RC3tTK046086@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: 5c9272aa20d4 - main - devel/libdlna: Move to FFmpeg 4 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c9272aa20d4925026ce321de3bd737f46fafee7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c9272aa20d4925026ce321de3bd737f46fafee7 commit 5c9272aa20d4925026ce321de3bd737f46fafee7 Author: Daniel Engberg AuthorDate: 2023-04-27 09:35:10 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:41 +0000 devel/libdlna: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270199 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- devel/libdlna/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile index 339e9a9ca7dd..af2d5f2e84e3 100644 --- a/devel/libdlna/Makefile +++ b/devel/libdlna/Makefile @@ -12,17 +12,19 @@ WWW= https://libdlna.geexbox.org/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 HAS_CONFIGURE= yes -USES= gmake localbase pathfix pkgconfig tar:bzip2 +USES= gmake pathfix pkgconfig tar:bzip2 PATHFIX_MAKEFILEIN= Makefile USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes -CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-optimize \ - --includedir="${PREFIX}/include" \ - --libdir="${PREFIX}/lib" +CFLAGS+= -I${LOCALBASE}/ffmpeg4/include +LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib + +CONFIGURE_ARGS= --with-ffmpeg-dir="${LOCALBASE}/ffmpeg4" \ + --prefix="${PREFIX}" --disable-optimize post-extract: ${REINPLACE_CMD} -e 's|CODEC_ID|AV_CODEC_ID|g' \