From nobody Thu Apr 27 12:04:00 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 4Q6ZCN3Ml4z474jX; Thu, 27 Apr 2023 12:04:00 +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 4Q6ZCN2X9Nz3lFy; Thu, 27 Apr 2023 12:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597040; 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=fK7oSbAUH11EqAot5mPOXfhL49dnbTcezoRnpSP82d4=; b=WNr/T8eUAc6K7/FOntMjb+3gnxjqfqG4CS8sRPf+2oP+RX3F/y4J+R6OF4bVsH2hc5P+tr 77fCSHYaF4n4UAeXrMyvKmYD6CLjOwh4JwL/rjfGmltjat4tbKLX25oUxDaY1pVnIln22D kXQKb5M9LMpydvVA6wTigzMV47U9AIqZiUQo7AnUlde7JKwMfRcWNBVOkGYw+60XGO10RR 93KhugwOt0aHf8qnRoRuKg+IoyuML4cjhIrnqkLUhshlkcRdEeqdD86+18NX8UpX59Si8c LAGji+fISqKnA64wc+jOt3QsXJDJLqsR1MXVHRHB9JCECoXfV2zIPU71i+Nh/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597040; 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=fK7oSbAUH11EqAot5mPOXfhL49dnbTcezoRnpSP82d4=; b=XUh1g8F5Tq83kEY5A7CPBvDIUlWPyX8Gie7FWciLM3xoPIOsIeRFkOLhCyBfuom7zCLnVm xB/TY94UbNY8SE9j9sbI6T2mQu4/W7mcLRNJBqhjRhyxsSHW9VvU2YxMdJoMCbqrDMU5mX mQrIMjQSUNmdXCfp+5vmIFIqP575wiWIJO+HZ0tYeSnIM07iFEV8F42RilIg2vKDepIo7E Ob/52vpOk5k/TRFT3FCFDOfb7zAZzTO9pV0FhKuZjlq4dz5o74rXjTZbqEtO/1dn4yVefv REac/YeStrIzAUzoGOsCuv5J6pkfmFOtIyy6PgsiZ373mgAjaKeZ/iMClW9TMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597040; a=rsa-sha256; cv=none; b=e5nQKjirmocvX9p9pb7ctTbJ2aNu+Jn9ZGKSyGAhz0ldGiBNzwiOKqontBOhZLkfAmaBTN gSP/TV6dPMOMhPJvJKwseYMLY/MaNYI9iBpd4O+b7reh4a89mdfutyNGhESk+z+O9XnlPc b+MOPJ/cgMJirVNeIRPa/sxRCLTCFya1QoMN5Z9O/IK1ZG9OpPYBZIU3KwJvk5Kjrit7ID qmMwZWABkyTm39YzKP5chlvd9LpEeys9kQW6n2S/dFL/cnvQLPV0JK02x5TBFzEp3Uv7Xv vnjE2qYHfhGE5TiKJzaBak6mxCxB7lniaytWg4fMV0Kn9j8QvV0VrwGa5yQ+AQ== 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 4Q6ZCN1cmXzGQw; Thu, 27 Apr 2023 12:04:00 +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 33RC40Uh046181; Thu, 27 Apr 2023 12:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC40Bs046180; Thu, 27 Apr 2023 12:04:00 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:00 GMT Message-Id: <202304271204.33RC40Bs046180@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: 89fef4d90408 - main - graphics/wdune: 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: 89fef4d904086fa7d15c87885f6e59041f2c86a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=89fef4d904086fa7d15c87885f6e59041f2c86a0 commit 89fef4d904086fa7d15c87885f6e59041f2c86a0 Author: Daniel Engberg AuthorDate: 2023-04-27 09:46:41 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:42 +0000 graphics/wdune: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270212 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- graphics/wdune/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/wdune/Makefile b/graphics/wdune/Makefile index 404521d1654c..9f059cba4aff 100644 --- a/graphics/wdune/Makefile +++ b/graphics/wdune/Makefile @@ -18,19 +18,19 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libmpfr.so:math/mpfr \ libosdCPU.so:graphics/opensubdiv \ libpng.so:graphics/png \ - libswresample.so:multimedia/ffmpeg + libswresample.so.3:multimedia/ffmpeg4 USES= compiler:c++11-lang gl jpeg motif sdl tar:bzip2 xorg USE_XORG= x11 xft xi xmu xext xt USE_GL= gl glu glut USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-optimization \ +CONFIGURE_ARGS= --with-optimization \ --without-devil \ --with-cgalheaders \ --with-helpurl="${DOCSDIR}/index.html" -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 -D__FREEBSD__ -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/ffmpeg4/include -I${LOCALBASE}/include/freetype2 -D__FREEBSD__ +LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib -L${LOCALBASE}/lib CONFLICTS_INSTALL= ocaml-dune