From nobody Sun Jan 9 13:23:21 2022 X-Original-To: dev-commits-ports-branches@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 9FCA6193F2DE; Sun, 9 Jan 2022 13:23:21 +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 4JWyMF2Z65z3Hvp; Sun, 9 Jan 2022 13:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3887E12D46; Sun, 9 Jan 2022 13:23:21 +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 209DNLgD063250; Sun, 9 Jan 2022 13:23:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209DNLs7063249; Sun, 9 Jan 2022 13:23:21 GMT (envelope-from git) Date: Sun, 9 Jan 2022 13:23:21 GMT Message-Id: <202201091323.209DNLs7063249@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 825c0055b720 - 2022Q1 - multimedia/aom: expose Butteraugli tuning List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 825c0055b72033b0f04e5d0239584cba82525b61 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641734601; 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=cm8zfCstWooW45PqQ8Da6DdlKfUJ/liEYH0DSwcaFaE=; b=dNfUKQ47NHXAj2p01jPkzCsdMngTU9DzDZnzImTQk/Ba1AyiZkJtOQApkhOV9+enqkduMo 114C6ASb5Ms3wPgdpT3GFQzm5i+n9HMzt/Js6yI241nrxyH1rI7TRKRRbvgKC06Rmr8uKd XOp5jWHla54rd0W98pP/mGdboya2t86gadNAtd0rPBagGeLMc8MKHSP6KsvG5igLlOH2ei EipQbZcPvMmY9CZ/v+PTLaLBFIb+rXq82utaeYYc8Dz/Jek/LdC5VY1N+C4K49C68elDaG v66KFnWBlRklN2iYHzB1nmnkJ+87qCz6KTbNMf+kNI6lMQis+Kp0awJHyJzc7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641734601; a=rsa-sha256; cv=none; b=jJs69k4b76640plO9wo8cb8ZXeGGtR2eZtYwD+6n1gjPBZFNOBD6nvJKSZtpzSs6MDB34x soojrT1+Sr3A53eGUklJpbNvBS5tlHRTOfYNPv8p0IHynKqMENbvfrGRVw8+ekiZR2r3zA NOGfw55exHlaC81Q1/EIuliI6ZPawLtUjJheOS1l8Yu3LSCTG3UvY9RwQU0eMhj4bVAGz2 NeF2qJz6bUAVpLhczRy3viepEPI2lnWfuiuQaLBOzxTNCEAMXSVcyXwQ+1Y8wvWzndH9N4 qLLVNGQaDyYIcaw3ekuGnmuWt88B1BLxPSuEiNkvnKJ9aeVURMU+WjDj8py/DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=825c0055b72033b0f04e5d0239584cba82525b61 commit 825c0055b72033b0f04e5d0239584cba82525b61 Author: Jan Beich AuthorDate: 2022-01-08 18:28:10 +0000 Commit: Jan Beich CommitDate: 2022-01-09 13:20:34 +0000 multimedia/aom: expose Butteraugli tuning (cherry picked from commit bd359cba9a6e7091aba73afd713bf82abdb3666e) --- multimedia/aom/Makefile | 7 ++++++- multimedia/aom/files/patch-CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index cb15e55d73b7..d2e9b55f6dcf 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -22,9 +22,14 @@ GH_ACCOUNT= jbeich # mirror CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS -OPTIONS_DEFINE= VMAF +OPTIONS_DEFINE= JXL VMAF OPTIONS_DEFAULT=VMAF +JXL_DESC= Encoding tuning for Butteraugli +JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +JXL_USES= pkgconfig +JXL_CMAKE_ON= -DCONFIG_TUNE_BUTTERAUGLI:STRING=1 + VMAF_DESC= Encoding tuning for VMAF VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf VMAF_USES= pkgconfig diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..175de31849f0 --- /dev/null +++ b/multimedia/aom/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +- Drop unused static libhwy dependency when using shared libjxl + +--- CMakeLists.txt.orig 2021-10-13 17:24:39 UTC ++++ CMakeLists.txt +@@ -525,12 +525,6 @@ if(CONFIG_AV1_ENCODER) + if(LIBJXL_CFLAGS) + append_compiler_flag("${LIBJXL_CFLAGS}") + endif() +- pkg_check_modules(LIBHWY REQUIRED libhwy) +- target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS} ${LIBHWY_LIBRARIES}) +- target_include_directories(aom PRIVATE ${LIBLIBHWY_INCLUDE_DIRS}) +- if(LIBHWY_CFLAGS) +- append_compiler_flag("${LIBHWY_CFLAGS}") +- endif() + endif() + + set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)