From nobody Thu Apr 27 12:03:56 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 4Q6ZCK1NdBz4749Y; Thu, 27 Apr 2023 12:03:57 +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 4Q6ZCK02v5z3l3x; Thu, 27 Apr 2023 12:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597037; 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=W4TEDC7FEtLxynjoAwJKSYGIFC/D20bTRcA+BNIv0Uc=; b=n6369uRs3TxkdI/FgiaWEdmPPROwo6lgfVT/UZ97ABHep9FlUM/0hrLNdWgyF5zSMJN5yy OYh0Qo8MebmRzvMu2K6NQ1YZW7gWIQWzCXecIyw9o7BeZUptaICkU9GDgYpZPF+qTDhYjT WgJ2er2FlWsIZwaTFx1iQyfXreuhYCQ5MwS5GbUtt+ln8sTFAkYHlM52PSHkluSd8cSB0h RF/HS5onIcMo7pQsRmqoR6HGrGIN7qKY+yu9IQWbBXhdUvXqg26kXDvJIYsDUsnbx63gOY K9LwS8rcSHa0m2vLCc0jN1N7Yqd2MrYr07sgphz5FvLal4WtoWYlLFy13NV0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597037; 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=W4TEDC7FEtLxynjoAwJKSYGIFC/D20bTRcA+BNIv0Uc=; b=lmWCc6+ZFK6C4Qu3Ydq2dp5hJwBshdcmCrMFeYGLbpUqJEKgjbtMNdJj9a8MiZvPpC45kL PGFqSf0gR5Wh6f7eEKwe9VhFX3gXCxR3BOeqOkeE99ctJTDLIBrKjjh2my5Rd5jVG6Udke iTBM8kjpaJEjGjTK7Aledn3ok+tC0TwIzyFRZ8QK0fLjuAijrL+GcFd69IaZJ4SAVkNJjy CL1bP+sUJvXZ/2zaxjYvY+skY1OBnjaZxV4OfZGElXfZ7oljIwBxbnIhQC2ZsQ+PIlRrik O43z191TmV3ElrDD2Dj/CxTeGSPTtCVYwvLLp3C9MzjVLeifAZ74T73N+33Cog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597037; a=rsa-sha256; cv=none; b=cijGQLO4CsDGO3oKUYdH4tAbrV+L4BpOa9mALsLqr0G4OvRYSX4p8IhyZcYKxQOYOQ6agz 8+iY/oPGyxZTVbqHHnzs+c7Iyv3IwSZuAtA+drRksy/MlTpzoqUOA8n0cv3pwPWL4lNn3y 5KGejIwvhHiis5tLfsM14z9aCNsRXWPTFYHWMn2EGkoq3NVkCKa/IwL0i7qReHy3qD4BDa rGO02zLT3ULEtj7tEI5slYYx+8gQz97lLH1o+ePyiN/DpqDYWKeaaigKMRljVk1L0YS88U Hi5AboMcUz1Agw8kJtxxbxjtkoNnQ2AyJ2YqE/BJaGJC706ZZJaGu4c2tP+HpA== 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 4Q6ZCJ5ylczGQv; Thu, 27 Apr 2023 12:03:56 +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 33RC3uPu046114; Thu, 27 Apr 2023 12:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3u69046113; Thu, 27 Apr 2023 12:03:56 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:56 GMT Message-Id: <202304271203.33RC3u69046113@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: 4d05aee79511 - main - graphics/gnash: 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: 4d05aee79511c90e7c983af8fa2b9cb1123b2977 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d05aee79511c90e7c983af8fa2b9cb1123b2977 commit 4d05aee79511c90e7c983af8fa2b9cb1123b2977 Author: Daniel Engberg AuthorDate: 2023-04-27 09:37:46 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:41 +0000 graphics/gnash: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270206 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- graphics/gnash/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index f4004f30e645..24ff72e233cb 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libboost_thread.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ - libavcodec.so:multimedia/ffmpeg \ + libavcodec.so.58:multimedia/ffmpeg4 \ libtheora.so:multimedia/libtheora \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ @@ -32,7 +32,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ CONFLICTS= gnash-devel USES= cpe tar:bzip2 compiler:c++11-lang autoreconf gmake libtool \ - pkgconfig jpeg gnome gl sdl desktop-file-utils xorg + pkgconfig jpeg gnome gl sdl desktop-file-utils xorg localbase:ldflags USE_CSTD= gnu11 CPE_VENDOR= gnu GNU_CONFIGURE= yes @@ -43,17 +43,17 @@ USE_SDL= sdl SYSCONFIGDIR= ${PREFIX}/etc # jemalloc leads to infinite recursion on FreeBSD -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/ffmpeg4/include +CPPFLAGS+= -I${LOCALBASE}/ffmpeg4/include +LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ --with-plugins-install=prefix \ --sysconfdir="${SYSCONFIGDIR}" \ --enable-gui=gtk \ --enable-media=ffmpeg \ - --with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \ - --with-ffmpeg-lib=${LOCALBASE}/lib \ + --with-ffmpeg-incl="${LOCALBASE}/ffmpeg4/include/libavcodec" \ + --with-ffmpeg-lib=${LOCALBASE}/ffmpeg4/lib \ --disable-testsuite \ --disable-kparts3 \ --disable-jemalloc \