From nobody Thu Dec 29 22:15:46 2022 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 4NjjQC1Wkzz1J5mn; Thu, 29 Dec 2022 22:15:47 +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 4NjjQB6n6Tz3vTl; Thu, 29 Dec 2022 22:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672352147; 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=H0+GGCVvM5z/JwnOK4gWcIkC1oW+1Ii9PyHVFXLLnV4=; b=o071g3hg1J76nDTnamUzH1rp1ZDnpVooSM8Jk3JvG6fypkKC40cNQZNTN8swM3Ke2GbTAm Kbtc+j7ikQNv1i9JJ7qqWf5DXuXNQ55TpsukhifB0rIoj13MdjG8ao+owXfMzOrx86FYli yBxME0QuDwjnNO+RRodMT+Pcbj724TCePIitk8WdqJAud53a5kw65A981rN4OgDk2qvlhM /XUzDhP1ODmSEHFpUuxYxWsdPh/ept+TYZdhTlYPsUzG2f1Vjk61xcVO4LXO3d7SwPEku7 WJQMrBHCPZWV+wxTO5V6iOFtCrAxcR007Y6S6bGZMkysHvz2WbJTHXYmg7IzIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672352147; 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=H0+GGCVvM5z/JwnOK4gWcIkC1oW+1Ii9PyHVFXLLnV4=; b=qomiIPvYSavjCOjOeoERr9q+Z3Oexh2LWKUvq8upMipureR8awXNXp0nY5yCOcgpXzQEde c7GARzzP0BvYvMMybVpOaFf9TcdUR7t8i8+/vnJzVWSmEGjGIH9v7Yqhrd2zz7KWSUw+ze 7iIbJ8z0S0TZG+IYKEB2d6MBLEwYxo2onZ27lyMSIFFx5Q+gY/1iC901C7nYh7DFYpwi9+ 7j4BQSIZWojeFEskYpq1KGyFpgLs1T4qwiZhPkB/6QRfNzgv0/pXxuMYpDCG/9G+BssJT8 bKV09ISP1oL8QmbDFi6b0ynn97+NlykMfu4RMR8j0dg4JsD6ctwhv5gx4KtZfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672352147; a=rsa-sha256; cv=none; b=rECts7fag0/NK/j5lLuD1HiCKdADNYbejy/7imrPF9dmovnnoopB7SlG/j+4g2pNamNASS JKs1KitkebIsOqOGN8zY8ld7w68/cmT1QclB2Bi2sdxChrXq2Jre+10zBScRr91IwSuR6+ rGKpapu9H7gXDHOlbTLnNrW2xTntbmAlKLJwGUsK7V1outwykMM+KbuC8N7OK3qm4LbIiU 42tYM9iBfkko62lB3g36khg1smJmHuyIgUA7zFLm0I7hkHV0xllLSxEHsN2v6WB0vu5RBt k2lYqWa9Cw9bqHJzSspY4FY73dG3RAdFBR60ItaVV66sye27hUYcmxk8SM4y+Q== 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 4NjjQB4cwbzl32; Thu, 29 Dec 2022 22:15:46 +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 2BTMFkVJ063505; Thu, 29 Dec 2022 22:15:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTMFkEd063504; Thu, 29 Dec 2022 22:15:46 GMT (envelope-from git) Date: Thu, 29 Dec 2022 22:15:46 GMT Message-Id: <202212292215.2BTMFkEd063504@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: 8ceffed3aff0 - main - multimedia/obs-scrab: Update 1.1 -> 1.2.0 for new obs-studio 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ceffed3aff065716997cf4db437cf658f630859 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ceffed3aff065716997cf4db437cf658f630859 commit 8ceffed3aff065716997cf4db437cf658f630859 Author: Yuri Victorovich AuthorDate: 2022-12-29 19:41:14 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-29 22:15:35 +0000 multimedia/obs-scrab: Update 1.1 -> 1.2.0 for new obs-studio Unfortunately it is also broken now, pending upstream fix. --- multimedia/obs-scrab/Makefile | 23 ++++++++++++++++++++--- multimedia/obs-scrab/distinfo | 6 +++--- multimedia/obs-scrab/files/patch-CMakeLists.txt | 16 ---------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/multimedia/obs-scrab/Makefile b/multimedia/obs-scrab/Makefile index 96a61dff3948..7f90813c9812 100644 --- a/multimedia/obs-scrab/Makefile +++ b/multimedia/obs-scrab/Makefile @@ -1,6 +1,6 @@ PORTNAME= obs-scrab DISTVERSIONPREFIX= v -DISTVERSION= 1.1 +DISTVERSION= 1.2.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -10,17 +10,34 @@ WWW= https://github.com/univrsal/scrab LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= installs into the build directory, see https://github.com/univrsal/scrab/issues/7 + LIB_DEPENDS= libobs.so:multimedia/obs-studio -USES= cmake localbase:ldflags qt:5 +USES= cmake gl localbase:ldflags qt:6 + +USE_QT= base tools:build +USE_GL= gl + USE_GITHUB= yes GH_ACCOUNT= univrsal GH_PROJECT= scrab -USE_QT= core gui widgets buildtools:build qmake:build +CMAKE_ARGS= -DOS_POSIX:BOOL=TRUE -DLINUX_PORTABLE:BOOL=FALSE CXXFLAGS+= -I${LOCALBASE}/include/obs PLIST_FILES= lib/obs-plugins/scrab.so \ share/obs/obs-plugins/scrab/locale/en-US.ini +do-install: # workaround for https://github.com/univrsal/scrab/issues/7 + ${MKDIR} \ + ${STAGEDIR}${PREFIX}/lib/obs-plugins \ + ${STAGEDIR}${PREFIX}/share/obs/obs-plugins/scrab/locale + ${INSTALL} \ + ${BUILD_WRKSRC}/scrab.so \ + ${STAGEDIR}${PREFIX}/lib/obs-plugins + ${INSTALL} \ + ${WRKSRC}/data/locale/en-US.ini \ + ${STAGEDIR}${PREFIX}/share/obs/obs-plugins/scrab/locale + .include diff --git a/multimedia/obs-scrab/distinfo b/multimedia/obs-scrab/distinfo index 480652b19bed..6dd16707b292 100644 --- a/multimedia/obs-scrab/distinfo +++ b/multimedia/obs-scrab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586809549 -SHA256 (univrsal-scrab-v1.1_GH0.tar.gz) = d0e14a0fc62591820b2188eecb472afa7e89e9419461b29e605ebf25dce6204e -SIZE (univrsal-scrab-v1.1_GH0.tar.gz) = 1423183 +TIMESTAMP = 1672309190 +SHA256 (univrsal-scrab-v1.2.0_GH0.tar.gz) = 4395c2020b4adbeeb5357827a3fdf9437df1ae8f6957ef78fa15afbb07b409c3 +SIZE (univrsal-scrab-v1.2.0_GH0.tar.gz) = 1456346 diff --git a/multimedia/obs-scrab/files/patch-CMakeLists.txt b/multimedia/obs-scrab/files/patch-CMakeLists.txt deleted file mode 100644 index 7a3307567edd..000000000000 --- a/multimedia/obs-scrab/files/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.orig 2020-04-05 03:14:35 UTC -+++ CMakeLists.txt -@@ -42,10 +42,12 @@ include_directories( - ${QtWidgets_INCLUDES}) - - target_link_libraries(scrab -- libobs -+ obs - obs-frontend-api - Qt5::Core - Qt5::Widgets - ${scrab_PLATFORM_DEPS}) -+ -+include(${CMAKE_INSTALL_PREFIX}/lib/cmake/ObsHelpers.cmake) - - install_obs_plugin_with_data(scrab data)