From nobody Sun Jul 16 16:53:00 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 4R3rqx0P0Nz4mmQy; Sun, 16 Jul 2023 16:53:01 +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 4R3rqw70l7z3Pph; Sun, 16 Jul 2023 16:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689526381; 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=EkDKdhdXZvcZUJsAFlWQgvUomMr71iwcOVNWv1Lwdrc=; b=coVH0pAwrlFURjW+3oArpVMUZkpxTdWhxnV7WtuKDVoIXLvIeFkinX3YI6J7y+lNmEocwI 60tv/j8jamciRVCvcLotWz8bUqK/JbjFDuZxDSDWdsys577D/tEtrxlGO6bsAsUBzzbWYB T9LjhXiITSuAd3/gGiUjGzsWOnY1haN0u5kT/mh49SU657wMitzP8OGMq60GPulp607uz9 GjKL+9jlr9ovJPvESJAK+hvwC0qYslfLe20OpPRETMAnyR0pvPWgklLSjjJuDW39HV3ngI 6g9l3lGHCCb8O/i25nnry5WL5GU/rdRHRXYnRRLdsmcuwshzSDU9dBBPxS0Kug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689526381; 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=EkDKdhdXZvcZUJsAFlWQgvUomMr71iwcOVNWv1Lwdrc=; b=sVHOMzWVsMEDXXT7NWw3cMLARLSy1q3Ke+KAuAfI3uWLaamdVvhYwR4/zKWa5QRstnYS7A +giY2KhdcZeQyMlE9IJmFiCskHe9KJI1QyS4K6JMZEaS8s3PnK/yjOBKsqKvPG+kh3TETp PG366BPj3LnnL+1gX6xVFhwa9cSN/hjNGF/OG04vS2zyOiluYBAK+Sea74UsSLgw+ZAv6j b+x78/Skz+A2Q2t3q1sw+hSJN/dY+5Qhrg/+xOTO7sQnr5cMNKbvQO+1rpoI++K2b3sATF RMHTHiSi9oI8KmOr5Kf4SNUf81LhFRTwVGWEjOT+j+V0BX6eCxKT9abLgosqsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689526381; a=rsa-sha256; cv=none; b=V3ihq8r2zaCAM5AF9Xl/ogpUd1s5lDiwYTF8S4ht95bntNCW3yaB9E7RU8Cotmlgkmujkl 7c2iHTmnOSPqGkxRc+6t+bC9SGJcVHjxO9/8kjgyo4Nb35gQBetvDoMz4pp7u6KVX5wz5T 9KYtXKtpzcRpk/b8xmgoNelSg381pGZM4SiWYB1DhSwLczh6l2DU5vnBDbwAGd14+vlGU5 G5B1jkH+naalOmWkHv8FdnqkvEZ8uzGQ+owgGVSpRi1gEjc0P9lVAcicK7xr0o4o2PGrQb oVmdLA+GdrANdxnRdoa/+/8y/9BZLgN9p0dQXrORnS8dBs44xS9Ug6xe908SZQ== 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 4R3rqw64jHzqDR; Sun, 16 Jul 2023 16:53:00 +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 36GGr0hJ011384; Sun, 16 Jul 2023 16:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GGr07a011383; Sun, 16 Jul 2023 16:53:00 GMT (envelope-from git) Date: Sun, 16 Jul 2023 16:53:00 GMT Message-Id: <202307161653.36GGr07a011383@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 8f4e2e277e3c - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8f4e2e277e3c807fa9099e3a586bf284f4eb642c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f4e2e277e3c807fa9099e3a586bf284f4eb642c commit 8f4e2e277e3c807fa9099e3a586bf284f4eb642c Author: Vladimir Druzenko AuthorDate: 2023-07-16 16:51:33 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-16 16:51:33 +0000 multimedia/obs-studio: Fix conflict caused by luajit USES=luajit resolves it. PR: 271085 --- 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