From nobody Fri Sep 29 06:52:30 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 4RxgyQ6G63z4jqKY; Fri, 29 Sep 2023 06:52:30 +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 4RxgyQ5lnKz4YJ1; Fri, 29 Sep 2023 06:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695970350; 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=f2fOHIQ5Byhn5RaKu6JhquRQyRvWhQwZSNG4xFR6d+8=; b=dY+NhZmArBK6gpQ7ZnfTjGg12UJ4vz6MfU08VmI1naPgKwy1g2kFYN/jdqf0O/w1IdKnn6 SKShFX7DTyI20rK8tB87kJjIisiT74cXGmEdUrGEk2D527ctWgMS9lFHHi8nREyqHcy6gn SgdPF+RC6mGxb+55RXe84yT46j4VOpkyQZnCXxHWjVrYQU+/bzvP847XiE15vKkwpOO7tJ +o+E7t91Ip8piNAMJAWihBmdiV+JPfY+PIFJpQiCoHmYmFwZJz7DEdHxEe0D8OEBYAC7As a55gtdckazh74pEhoYvyUiFFTEquSaRbn+8xSiP0fPWtP5LopfpR7Z9RtFjqbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695970350; a=rsa-sha256; cv=none; b=W2iJ8l8XTN3jMmc+cb5d3Z+E7XyLtaFAQ6eJzMsN+HCxkDuaF74+TjliMLBCExQTOHbYrP Hn4kbP/yfHYXuHl0fose3wIj1WbSbCUOyBfxSGAG//EbQlenf0hjQciKsYdV5NVEG/Nm5w +mKIlmglFBJQdaxgOjxgVgkztAut45p0OVIs98W1oNMdsbbSYEVDsfBtVLvWKGRqY6iZub 08fxZr+iXv7T3d5AMdS8yWmLB5ZlyM9RR+gPwJ+LdzPZSLB5p4seMajypZyrDzQGr+c0gp OUEVkTXb0Vp43fj1alT6wwq5SBMAgcSaK2QrvmEjJChkJl1YG6fGJO2e+z8EMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695970350; 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=f2fOHIQ5Byhn5RaKu6JhquRQyRvWhQwZSNG4xFR6d+8=; b=WQl/3GDkQgobIV5AsnF/dr2eXUzvixaLTqBCyJQFSJBm6EDlWzad6uO2Ym3GvJY29XSGhp riZls64GHUrTmir7ukwZw7TffH3vJlbPALHwiVwQQWBkQbZpMGwQ+N0ZNIrs9+UJQG05fJ DeB2OMaudUExQr4RdFLhaBT/JnAkoLeoB3p74lrntdcYMMobGdxqOpXR2nGWtbRb6PumLS jZx8j+MhCJf694ibMlbyzhK6JN41AmqO+v5c4+u0fNCMxjhUpBEYRgr4u/OSFkCDXbe2kD NTT9gcN7pwkiK76QBMjHE/7lcPtkQNP2GOAuAIr0BrbWilnyaapog2HMsmFzVg== 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 4RxgyQ4nWDzvPD; Fri, 29 Sep 2023 06:52:30 +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 38T6qUsn018264; Fri, 29 Sep 2023 06:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38T6qUZt018261; Fri, 29 Sep 2023 06:52:30 GMT (envelope-from git) Date: Fri, 29 Sep 2023 06:52:30 GMT Message-Id: <202309290652.38T6qUZt018261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: d26aa987ba6a - main - multimedia/{lib}x264: Fix build with PGO 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d26aa987ba6a52e0a7b295128008a9f0af96e2b8 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=d26aa987ba6a52e0a7b295128008a9f0af96e2b8 commit d26aa987ba6a52e0a7b295128008a9f0af96e2b8 Author: Muhammad Moinur Rahman AuthorDate: 2023-09-28 19:55:09 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-29 06:02:01 +0000 multimedia/{lib}x264: Fix build with PGO - Pet portclippy PR: 273904 Reported by: sven.a.jonsson@bahnhof.se --- multimedia/x264/Makefile | 51 ++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 425694d8274d..1545c7d6af76 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -27,7 +27,11 @@ COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI) WWW= https://www.videolan.org/x264.html LICENSE= GPLv2 +LICENSE_NAME_PGO= PGO LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS_PGO= auto-accept +# ${Y4M_VIDEO_DISTFILE} file may not be mirrored +LICENSE_DISTFILES_PGO= ${Y4M_VIDEO_DISTFILE} BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS?= libx264.so:multimedia/libx264 @@ -39,18 +43,25 @@ X264_GITVER= ${GL_TAGNAME:C/^(.{7}).*/\1/} USES?= pkgconfig USES+= compiler:c11 gmake localbase shebangfix USE_GITLAB= yes -USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= videolan GL_TAGNAME= baee400fa9ced6f5481a728138fed6e867b0ff7f -HAS_CONFIGURE= yes +USE_LDCONFIG= yes + SHEBANG_FILES= configure + +HAS_CONFIGURE= yes +CONFIGURE_ARGS?= --system-libx264 +CONFIGURE_ARGS+= --prefix="${PREFIX}" \ + --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" + PLIST_FILES?= bin/x264 OPTIONS_DEFINE+= BASH DEBUG FFMS LAVF PGO SWSCALE +OPTIONS_DEFAULT+= BASH FFMS LAVF LSMASH SWSCALE OPTIONS_RADIO+= MP4 OPTIONS_RADIO_MP4+= GPAC LSMASH -OPTIONS_DEFAULT+= BASH FFMS LAVF LSMASH SWSCALE .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" @@ -67,48 +78,32 @@ BASH_BUILD_DEPENDS= bash-completion>0:shells/bash-completion BASH_RUN_DEPENDS= bash-completion>0:shells/bash-completion BASH_CONFIGURE_ENABLE= bashcompletion BASH_PLIST_FILES= share/bash-completion/completions/x264 - -DEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_OFF= --enable-strip - +DEBUG_CONFIGURE_ENABLE= debug +FFMS_IMPLIES= SWSCALE FFMS_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMS_CONFIGURE_ENABLE= ffms -FFMS_IMPLIES= SWSCALE - GPAC_LIB_DEPENDS= libgpac.so:multimedia/gpac-libgpac GPAC_CONFIGURE_ENABLE= gpac - +LAVF_IMPLIES= SWSCALE LAVF_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg LAVF_CONFIGURE_ENABLE= lavf -LAVF_IMPLIES= SWSCALE - LSMASH_LIB_DEPENDS= liblsmash.so:multimedia/l-smash LSMASH_CONFIGURE_ENABLE=lsmash - PGO_DISTFILES= ${Y4M_VIDEO_DISTFILE}:pgo PGO_MAKE_ENV= VIDS="${WRKDIR}/${Y4M_VIDEO}" PGO_ALL_TARGET= fprofiled -# y4m sample video -Y4M_VIDEO= example.y4m -Y4M_VIDEO_DISTFILE= example.y4m.bz2 -PGO_VARS= USE_GCC=yes \ - LICENSE+=PGO LICENSE_COMB=multi - -# ${Y4M_VIDEO_DISTFILE} file may not be mirrored -LICENSE_NAME_PGO= PGO -LICENSE_DISTFILES_PGO= ${Y4M_VIDEO_DISTFILE} -LICENSE_PERMS_PGO= auto-accept - +PGO_USE= GCC=yes +PGO_VARS= LICENSE+=PGO LICENSE_COMB=multi SWSCALE_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg SWSCALE_CONFIGURE_ENABLE= swscale -CONFIGURE_ARGS?= --system-libx264 -CONFIGURE_ARGS+= --prefix="${PREFIX}" \ - --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" +# y4m sample video +Y4M_VIDEO= example.y4m +Y4M_VIDEO_DISTFILE= example.y4m.bz2 post-extract-PGO-on: @${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} \ @@ -131,7 +126,7 @@ pre-build: .include -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 && !${PORT_OPTIONS:MPGO} CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif