From nobody Thu Aug 4 08:09:58 2022 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 4Lz1c65rXDz4YLCv; Thu, 4 Aug 2022 08:09:58 +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 4Lz1c65R38z3cmr; Thu, 4 Aug 2022 08:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659600598; 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=DEk86jE9XV7APqezSk0XAiXAjyDsA85rGrdDbiopowk=; b=G+QjiZYdtfY1x5yeRhOhGKAz7VER2dGOwWBMo6C06iiQH7no+cTGTKIbhqFi3CEfnoClz2 ZexeUF2WuZEPuvynAcevtc6CAVKm18yMGCKubcELpO3mfjbX4sEPP9MHP+45NvDckAllMp 6rErM8V0AR9dJCFeG1IUSYxCbGM74XaDDUPUTbvKBufGZ2kQU/eEa0+RTayvI68PbV467H 7OsnZg73egvljokrAqNAy2o03l9OnCEZ/LUqoG9r5r1abJAlPGvF3P1yi9p1eBcxZYkVGE BSx0uIdr8KL7HUea/+ajuRvxg5Rd7c2/rcidz19/MqFKszJJCsogHZET/8Vijw== 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 4Lz1c64XRlz1MFG; Thu, 4 Aug 2022 08:09:58 +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 27489w1H082075; Thu, 4 Aug 2022 08:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27489ws4082074; Thu, 4 Aug 2022 08:09:58 GMT (envelope-from git) Date: Thu, 4 Aug 2022 08:09:58 GMT Message-Id: <202208040809.27489ws4082074@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: 543aa1a5a568 - main - multimedia/obs-websocket: Update 4.8.0 -> 5.0.1 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: 543aa1a5a56824c155994dd4143cb8ac1df5ef15 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659600598; 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=DEk86jE9XV7APqezSk0XAiXAjyDsA85rGrdDbiopowk=; b=gJ7zZMUaCvCPoBpCc2vJwmj8yDE9GkgCxBQGoagEPrHQsdMar0xwz5X96uD/Egz8owi+JB Cw2YAuwuur6G0y36WiUDjJ+DT+AwskDbVMq5oZCbLZ06UkHelLFJYFKUEyGmjkl6rN/gxP 44Ss5i6T1aWmPm1zfQhvmuBHTVDJz8fx0WP3Pm1jA4Ab2OB0sLrXX+5LZ4NBw+MlBwEeGc MtG5UafplG7eUtkJ31UUTdqiwL2+Lwo5TFaHzm1bFPYyEPDH+Sns23ZZ+VdR63+/42gUQi zROM2Jpu5jVFq+9EDt5Ql7w/gUeBbPQn0ZHvClJyN+dF3tdtPifMCd6tE7xF0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659600598; a=rsa-sha256; cv=none; b=EcnMXzvwYsu2mwHiwmiMeybKPtteVRAz4kAkGsIjAE8X/1YvKgJFVdcHt3EMhLFMlXUts4 eYf3+skKh1PT0Q96EAUcsqolapsmWQpKKnait99Rk3kSix9C+I7XzxHDmAUgRzWz/k5OGI Vk262PPT9VyAjXeN+kRcXzfwO35EgG1UjpWtEU6TLbbezt/06F+/wCw0oraOdUPL5LUCQV Rl+Q2Ir3aDO0zZrMjRDBoPMR+gXzCBtrtbLMK99PzmzlfEKTxXP8BhURvYZ0fyFuNTbWMv tekRsCyW7qnn7MXe2fvE2rgy4VR/F60hIN/pQA/5Plp+DZVOrf1nAhoOFwXPcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=543aa1a5a56824c155994dd4143cb8ac1df5ef15 commit 543aa1a5a56824c155994dd4143cb8ac1df5ef15 Author: Yuri Victorovich AuthorDate: 2022-08-04 08:09:10 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-04 08:09:10 +0000 multimedia/obs-websocket: Update 4.8.0 -> 5.0.1 This also unbreaks it. --- multimedia/obs-websocket/Makefile | 23 ++++++++-------------- multimedia/obs-websocket/distinfo | 10 +++++++--- .../obs-websocket/files/patch-CMakeLists.txt | 23 ++++++++++++++++++++++ multimedia/obs-websocket/pkg-plist | 16 --------------- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/multimedia/obs-websocket/Makefile b/multimedia/obs-websocket/Makefile index 5b8a8ab04777..8ba6b0a639fd 100644 --- a/multimedia/obs-websocket/Makefile +++ b/multimedia/obs-websocket/Makefile @@ -1,5 +1,5 @@ -PORTNAME= obs-websocket -DISTVERSION= 4.8.0 +PORTNAME= obs-websocket # will be included in obs-studio-28.x - port should be removed then +DISTVERSION= 5.0.1 CATEGORIES= multimedia www MAINTAINER= yuri@FreeBSD.org @@ -8,26 +8,19 @@ COMMENT= OBS Studio Plugin: WebSockets API LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= does not build: src/rpc/../obs-websocket.h:36:7: error: type alias redefinition with different types, see https://github.com/obsproject/obs-websocket/issues/954 - BUILD_DEPENDS= websocketpp>0:devel/websocketpp LIB_DEPENDS= libobs.so:multimedia/obs-studio -USES= cmake compiler:c++17-lang localbase:ldflags qt:5 +USES= cmake:insource compiler:c++17-lang localbase:ldflags qt:5 # insource because of https://github.com/obsproject/obs-websocket/issues/973 USE_QT= core gui widgets buildtools_build concurrent_build qmake_build USE_GITHUB= yes GH_ACCOUNT= obsproject -GH_TUPLE= chriskohlhoff:asio:b73dc1d2c0ecb9452a87c26544d7f71e24342df6:chriskohlhoff_asio/deps/asio - -OPTIONS_DEFINE= IPV4 # with devel/websocketpp it's either IPv4 or IPv6, but not both -OPTIONS_DEFAULT= IPV4 # project defaults to IPv6 but the port defaults to IPv4 because IPv4 is currently more common - -post-patch-IPV4-on: - @${REINPLACE_CMD} -e 's|ip::tcp::v6|ip::tcp::v4|g' ${WRKSRC}/deps/asio/asio/src/tests/unit/ip/tcp.cpp - @${REINPLACE_CMD} -e 's|_server.listen(|_server.listen(asio::ip::tcp::v4(), |g' ${WRKSRC}/src/WSServer.cpp +GH_TUPLE= chriskohlhoff:asio:b73dc1d2c0ecb9452a87c26544d7f71e24342df6:chriskohlhoff_asio/deps/asio \ + nlohmann:json:a34e011:json/deps/json \ + nayuki:QR-Code-generator:8518684:qr/deps/qr -post-install: # see https://github.com/Palakis/obs-websocket/issues/457 - @${RM} -r ${STAGEDIR}${PREFIX}/lib/amd64-linux-gnu +PLIST_FILES= lib/obs-plugins/obs-websocket.so \ + share/obs/obs-plugins/obs-websocket/locale/en-US.ini .include diff --git a/multimedia/obs-websocket/distinfo b/multimedia/obs-websocket/distinfo index 81dd9ea6f27c..98f1abda7027 100644 --- a/multimedia/obs-websocket/distinfo +++ b/multimedia/obs-websocket/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1655971074 -SHA256 (obsproject-obs-websocket-4.8.0_GH0.tar.gz) = a0b99f8039225305af36ef84d353155173d5878f56187a8988a827b487f15781 -SIZE (obsproject-obs-websocket-4.8.0_GH0.tar.gz) = 173336 +TIMESTAMP = 1659569302 +SHA256 (obsproject-obs-websocket-5.0.1_GH0.tar.gz) = eb0387788f6b1ed4868db1bbe2572879057027bc06e1ebc0e1d284b419244f33 +SIZE (obsproject-obs-websocket-5.0.1_GH0.tar.gz) = 211686 SHA256 (chriskohlhoff-asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6_GH0.tar.gz) = e4a5f556e3d562c71f9e569ffa64eae665abd2c61d85a2d275c86042b32f9342 SIZE (chriskohlhoff-asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6_GH0.tar.gz) = 1211725 +SHA256 (nlohmann-json-a34e011_GH0.tar.gz) = 8580814d7748cb417eb4e89bab32ae2473ecf055d33cdf18044f09f84eab2db8 +SIZE (nlohmann-json-a34e011_GH0.tar.gz) = 6860457 +SHA256 (nayuki-QR-Code-generator-8518684_GH0.tar.gz) = 0fa3e16822e66343d10ba0ba2787378e44d88686d9836476d2df041a59b729e9 +SIZE (nayuki-QR-Code-generator-8518684_GH0.tar.gz) = 135743 diff --git a/multimedia/obs-websocket/files/patch-CMakeLists.txt b/multimedia/obs-websocket/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..ea1a178b0100 --- /dev/null +++ b/multimedia/obs-websocket/files/patch-CMakeLists.txt @@ -0,0 +1,23 @@ +- workaround for +- * https://github.com/obsproject/obs-websocket/issues/973 +- * https://github.com/obsproject/obs-websocket/issues/974 +--- CMakeLists.txt.orig 2022-08-02 21:52:49 UTC ++++ CMakeLists.txt +@@ -77,7 +77,7 @@ add_subdirectory(deps/json) + # Configure files + configure_file( + src/plugin-macros.h.in +- ../src/plugin-macros.generated.h ++ src/plugin-macros.generated.h + ) + configure_file( + installer/installer-windows.iss.in +@@ -303,7 +303,7 @@ endif() + if(UNIX AND NOT APPLE) + include(GNUInstallDirs) + +- target_compile_options(obs-websocket PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-missing-field-initializers) ++ target_compile_options(obs-websocket PRIVATE -Wall -Wextra -Wpedantic -Wno-missing-field-initializers) + + set_target_properties(obs-websocket PROPERTIES PREFIX "") + target_link_libraries(obs-websocket obs-frontend-api) diff --git a/multimedia/obs-websocket/pkg-plist b/multimedia/obs-websocket/pkg-plist deleted file mode 100644 index 7b113f88bf53..000000000000 --- a/multimedia/obs-websocket/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -lib/obs-plugins/obs-websocket.so -share/obs/obs-plugins/obs-websocket/locale/ar-SA.ini -share/obs/obs-plugins/obs-websocket/locale/de-DE.ini -share/obs/obs-plugins/obs-websocket/locale/en-US.ini -share/obs/obs-plugins/obs-websocket/locale/es-ES.ini -share/obs/obs-plugins/obs-websocket/locale/fr-FR.ini -share/obs/obs-plugins/obs-websocket/locale/hi-IN.ini -share/obs/obs-plugins/obs-websocket/locale/it-IT.ini -share/obs/obs-plugins/obs-websocket/locale/ja-JP.ini -share/obs/obs-plugins/obs-websocket/locale/ko-KR.ini -share/obs/obs-plugins/obs-websocket/locale/nl-NL.ini -share/obs/obs-plugins/obs-websocket/locale/pl-PL.ini -share/obs/obs-plugins/obs-websocket/locale/pt-PT.ini -share/obs/obs-plugins/obs-websocket/locale/ru-RU.ini -share/obs/obs-plugins/obs-websocket/locale/zh-CN.ini -share/obs/obs-plugins/obs-websocket/locale/zh-TW.ini