From nobody Sun Jul 16 16:53:23 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 4R3rrM2XVgz4mmnL; Sun, 16 Jul 2023 16:53:23 +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 4R3rrM26dMz3PvY; Sun, 16 Jul 2023 16:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689526403; 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=W1GcPPIp5aUTxvJ+TL5agvnA+A895hs6Z6PF7N8y1XQ=; b=ruQc24TdglzciYR6PkFoWcUKIwd+3OEXy31XZgRvZSkUH5m0/JWUsT18o7XNQ7RZ1iTLqA hBRqpg74ZkLLzGGy5uzXTaauPW/bISz1IlIqVqajmGiNGe/xC0YSEtD4qBwu41cHCGDHaD eEPFCDKkJ2WmVrb9NxhjPIZyldbEtvBcgAKDLD762AY4xZwiFkihiJeJpoEl2a6z1P14XL xGt5U5zX77y3+fsI5FdUbODnh61RccT/EzEAca9LkFf4Sc+Y92/v7Gp9LhwtUJAyWCNj78 rs4G38Em84c+FW6jtQcxUDIYLxOf+pcatGhsh9HX8JGkg3k3eoYuGleRTbGi1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689526403; 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=W1GcPPIp5aUTxvJ+TL5agvnA+A895hs6Z6PF7N8y1XQ=; b=YbFiUU1e6MmE70gf4FK2/Hf4YcSiPdTmXFoKOXOUTERndmnWduUOCWMwLfgh4x6aqUU1Sa OLIkpaC+muo01Qxcg+x9kKywmz4CdG9j9tn4Pz9Vsny706Dl4gTux6MVHor5PDOvsqh34h fla8Krnwt0SAkB67k1toUZDqIXhUHFdEYlt7Cy3dQvOajIFzPG3OpE4Xz1yNgSvuJMh5cp rYHYVS+FfJakq1FCg3YwGQb62xGIzao4QtowKuYm7OdVKLsGyLY9T/6NlfRy6tz/SzEcmb 3NcXFQWWDk4lx/sNVVwzUf3xpKMR2kWqGvRQA8PYoih4WlyhawYt+n/0lxWy5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689526403; a=rsa-sha256; cv=none; b=nU0HDUtD1BqdtiVeSVPS7wXOZ9uQMMluZCRPZDwn7+6BqMPIouu6X8MXHnnz+4gntaN/kn ppyiDJRd/h38nCGYTKHBD7KiR6qaWEdqk1+i4cz+06r7/m280axcmX7O909ySvu/rUWoUa p2/TsYrKbbTSLwkjU9+s8+ouE7YOu+dpvz/bPfoKYJDrd5xEIKQYx1ZBnBGs8+ZwkXjtSM thgxjgwKI5yCNIsn8P3/vrqBDk+LreJorWekW5K6zqZHKSOfj/JzIYG+xOvWSUlGAQwgXm 5ioAsJgA7CEZank293vXW2rwavrlHl65KCNZ+OIrqa7+TmZeHgywobgeJ4h1Kg== 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 4R3rrM1C9JzqDS; Sun, 16 Jul 2023 16:53:23 +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 36GGrNoa011553; Sun, 16 Jul 2023 16:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GGrNRE011552; Sun, 16 Jul 2023 16:53:23 GMT (envelope-from git) Date: Sun, 16 Jul 2023 16:53:23 GMT Message-Id: <202307161653.36GGrNRE011552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 7c673ea6efff - 2023Q3 - multimedia/obs-studio: Fix conflict caused by luajit 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 7c673ea6efffaf1b20eed505f8c16ad506f818fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c673ea6efffaf1b20eed505f8c16ad506f818fb commit 7c673ea6efffaf1b20eed505f8c16ad506f818fb Author: Vladimir Druzenko AuthorDate: 2023-07-16 16:51:33 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-16 16:53:20 +0000 multimedia/obs-studio: Fix conflict caused by luajit USES=luajit resolves it. PR: 271085 (cherry picked from commit 8f4e2e277e3c807fa9099e3a586bf284f4eb642c) --- multimedia/obs-studio/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index 47881baddaa9..c3258943a5e1 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -37,17 +37,10 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libxcb-util.so:x11/xcb-util \ libxkbcommon.so:x11/libxkbcommon \ libuuid.so:misc/e2fsprogs-libuuid \ - libva.so:multimedia/libva \ - ${LIB_DEPENDS_${ARCH}} -LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_armv7= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_powerpc64= libluajit-5.1.so:lang/luajit-openresty -LIB_DEPENDS_powerpc64le= libluajit-5.1.so:lang/luajit-openresty - -USES= cmake compiler:c++17-lang desktop-file-utils gl gnome lua pkgconfig python \ - qt:6 xorg + libva.so:multimedia/libva + +USES= cmake compiler:c++17-lang desktop-file-utils gl gnome lua luajit \ + pkgconfig python qt:6 xorg USE_QT= base svg tools:build USE_GNOME= glib20 USE_GL= gl