From nobody Thu Dec 26 23:27:19 2024 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 4YK4Xm07zcz5hWfS; Thu, 26 Dec 2024 23:27:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YK4Xl6RR2z4Rj9; Thu, 26 Dec 2024 23:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735255639; 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=loyhaLyRw6WrQVD3/oU7IL7dXchzpx/JbmOxjBWDqxU=; b=hC+vmfHVjFoZuWTljkjtw7WDn0Wed0gsVernoCn/4NV8TWdqYPTyT0C41UH4yxHOZR48lp pPdjkupjyusmNYgPPahlqWKKfP6ey+osNU5/cqUiQYLhjD5s1SDg/x/k3cpL2nVQ8SAPfD QoZD8IdFn7HjqQNACDCdS8uee/Zpu+ZAo49R29wXZvto0TxJrvW7ujySqpz/YSJzCzCDNa zlGiLKOD3NIrh4Qxc0z5hc8HBgpEOiR2+vDNCYpCjfE01CiAjG+bpsCbNUTDA+Uj4Bh/Lh BSkOeuCorK+SNlFKP4ulzTeum9rwxigm5sbqJHkRSIps9/LCC4hylj32XLYLWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735255639; 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=loyhaLyRw6WrQVD3/oU7IL7dXchzpx/JbmOxjBWDqxU=; b=P92AdryqpGJsFmkBcQ0TWmkIsc1Ev1YIjcIDXyZj1bRiCfx8wvO+HcA1nktbD6loPZh4k9 wsbe71mY2EEey7ahTeBMsdj47LauypP/RnysnDa2K+njdDAvhr+Q6voqSBp1aax4wZRIw6 T4ih3EqLwdXMewhNbR+HFJ8tPfAo0p8dUzQRopiIKq0wFE/qqQ2gBDeu0AFlOaW+h2PlYT +pzP5thBp3ucY3GFby9dDdho5UL43+mz6MwcpePCxYWUaXDH79IeZYmKw/bo7OOqShM0hb 4E3wPvxtx2lsJDqMlisYpjueUx65CqpG2HKjKlHEQyzPoxJvz2eb3+DoNyd95Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735255639; a=rsa-sha256; cv=none; b=PHMqV7SUTW9UYJC6+IvoG36MVn/vc5tuFOmXCl9u9k+Vu258FBUVGkBbdNL5RgJI6gli5D MXmRnOGmlm9C13wMVUR8D8CZPOmKmKrieidyCTY3HeZ2hJzvZkkmE0kfAFcfwNfAuEzOGH mFmkmhF4FuVAtGhoTvQHUSotxaLAojJRhio7lVIQSk+uurS8O/OBnjUQIckEnQbSuNqcjY dborsreWUJpc+S3ziDzxaYBsxh8eb+TMRtDQPNFCpzU2WuEXo8XN0PYsl+SlJpOeLLTzcr YUnkUjwV0p1c+F95wSpx4zDJABD7iIrppaBPG7qp1gur/u6VMe5TwT2z3BLHfA== 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 4YK4Xl5xB3zFKx; Thu, 26 Dec 2024 23:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BQNRJEi056346; Thu, 26 Dec 2024 23:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQNRJE2056343; Thu, 26 Dec 2024 23:27:19 GMT (envelope-from git) Date: Thu, 26 Dec 2024 23:27:19 GMT Message-Id: <202412262327.4BQNRJE2056343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: 5b6a3e6549b9 - main - net/xrdp: Make H.264/AVC support optional (enabled by default) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b6a3e6549b9f4029f327b8e026cb3b3716dbf6f Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b6a3e6549b9f4029f327b8e026cb3b3716dbf6f commit 5b6a3e6549b9f4029f327b8e026cb3b3716dbf6f Author: Anton Saietskii AuthorDate: 2024-12-26 14:31:42 +0000 Commit: Koichiro Iwao CommitDate: 2024-12-26 23:24:21 +0000 net/xrdp: Make H.264/AVC support optional (enabled by default) PR: 283627 Approved by: meta@ (myself, maintainer) --- net/xrdp/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 7b1abce086af..5f915324c226 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -17,9 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ xterm:x11/xterm -LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ - libopenh264.so:multimedia/openh264 \ - libx264.so:multimedia/libx264 +LIB_DEPENDS= libImlib2.so:graphics/imlib2 USES= autoreconf:build compiler:c11 cpe jpeg libtool localbase \ pkgconfig ssl xorg @@ -30,9 +28,7 @@ USE_LDCONFIG= ${PREFIX}/lib/xrdp GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --enable-openh264 \ - --enable-x264 \ - --enable-imlib2 \ +CONFIGURE_ARGS= --enable-imlib2 \ --enable-jpeg \ --enable-painter \ --enable-pam-config=freebsd \ @@ -52,12 +48,14 @@ USER= _xrdp GROUP= _xrdp OPTIONS_DEFINE= DEBUG FUSE IPV6 -OPTIONS_DEFAULT= FDKAAC OPUS -OPTIONS_GROUP= AUDIO_CODEC +OPTIONS_DEFAULT= FDKAAC OPENH264 OPUS X264 +OPTIONS_GROUP= AUDIO_CODEC VIDEO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS +OPTIONS_GROUP_VIDEO_CODEC= OPENH264 X264 FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection FUSE_DESC= Enable drive redirection via FUSE (experimental) MP3LAME_DESC= Enable MP3 Lame for audio redirection +OPENH264_DESC= H.264 video codec support via OpenH264 OPUS_DESC= Enable Opus for audio redirection DEBUG_CONFIGURE_ENABLE= devel-debug devel-logging @@ -68,8 +66,12 @@ FUSE_USES= fuse IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame +OPENH264_CONFIGURE_ENABLE= openh264 +OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus +X264_CONFIGURE_ENABLE= x264 +X264_LIB_DEPENDS= libx264.so:multimedia/libx264 .include