Date: Thu, 29 Dec 2022 22:15:46 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8ceffed3aff0 - main - multimedia/obs-scrab: Update 1.1 -> 1.2.0 for new obs-studio Message-ID: <202212292215.2BTMFkEd063504@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ceffed3aff065716997cf4db437cf658f630859 commit 8ceffed3aff065716997cf4db437cf658f630859 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-12-29 19:41:14 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> 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 <bsd.port.mk> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212292215.2BTMFkEd063504>