From nobody Wed Nov 02 19:29:02 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 4N2cQ70Mxrz4gkBq; Wed, 2 Nov 2022 19:29:03 +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 4N2cQ670t4z4D6n; Wed, 2 Nov 2022 19:29:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667417343; 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=CHdc0USgkR3hRmOc/jMaa7BUIR8kPOUV3SGjuG5I9gQ=; b=ZPPeQVxvJPoUZxcKIlR+UPUWxYa8EtHINSU96q7uxZ//4NVGS07CDJY0Ux9UwTgo9l4CM3 voTsrBjRogwgD9dvbg4mYuUP71rH4K0WgHc+B60ThrAJJeN9UvkAjhK/5C69MqVYuUgzez yRjOIaYdz1fSAU3HubH2q/P8tQQnU2CfUD5GgmmY7BiGA0OmfdCQNnzsiKH1QofzlQ56S1 jFwvtOKcOrIXDaxc9PP5nh8q9+5OoejQAm3e0OHoh1VlpXPDuTFLhu+wrAr1FPyGM2u77s Mwl8J4yigEUbqtPqv+N+TNnBWUc9xuudW6W2keRvV15paukJJn/kxE8Ho0vtVw== 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 4N2cQ665D8z17Qr; Wed, 2 Nov 2022 19:29:02 +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 2A2JT2fY064184; Wed, 2 Nov 2022 19:29:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2JT2lD064183; Wed, 2 Nov 2022 19:29:02 GMT (envelope-from git) Date: Wed, 2 Nov 2022 19:29:02 GMT Message-Id: <202211021929.2A2JT2lD064183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: c214c3d4aee6 - main - emulators/rpcs3: add -qt6 flavor 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c214c3d4aee6e42e63eb04cedb2b5e44e8a171eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667417343; 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=CHdc0USgkR3hRmOc/jMaa7BUIR8kPOUV3SGjuG5I9gQ=; b=BNSKniLp5B0yP/KLdROWPS9Mj+yH52/Qu0z0UymT9r6G6493hnlFbcs63w9JL1jR6Mk2zY UxBmqzBeB8irbtSvzUCEV9gNobs76L8ZR+harba+D6t2M6ULXut5zq8QiPaVaA7R80030W H7ad3pZwVGE7d6dpdDH5lCyyGfVcWMcasp8bJr3DtRCTJ/nXvAb3nl/8yxTwGZdIeZ8Rvd NFU5nNyEf30Mkro2m1XmPFd9K7q/OlbJbht1hZcQ+jU94KGpMYDpXeNmCYhSXS7oNv4FQc G5BMZ8ulazZl/3DGV0Qq8QQyyzflKp3hQf7Ivb4JpBgf2EnmYMp2SDFnqKtkdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667417343; a=rsa-sha256; cv=none; b=qflpBxKXROrlfR7an3+6AsWYgvrmP0eIXj+Ud/9WaUcJw84sNhF0faHJOj3f+9KWIj/k3P Q0y7o9FdQXVbJCERHth7JNG/+lLvtt/rlVw7EhgP9aTYz4vqoqferN92hPc6UwlLpNfJA/ yRUrq7Cp8rQ5pNVCdg382gLVvWAL2ytcY9rwJC4JuafVA0NVWz1XijcQ+FV7y37FKawGkP 0HjtfSplHSPM1Vn3yWFuyF1wVocNEToltTms5bgVJDdfwekNWZSxAVg3QEPYrGuwnLCI3u oSrzEVku7yMfm8VlGeSWsDTvHf+XGbG6cXcEfXSlbarEIyNML/mtlmhEiT1XgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c214c3d4aee6e42e63eb04cedb2b5e44e8a171eb commit c214c3d4aee6e42e63eb04cedb2b5e44e8a171eb Author: Jan Beich AuthorDate: 2022-11-02 14:54:26 +0000 Commit: Jan Beich CommitDate: 2022-11-02 19:28:11 +0000 emulators/rpcs3: add -qt6 flavor Based on upstream patch. Once merged, Qt5 won't be supported. --- emulators/rpcs3/Makefile | 23 +++++++++++++++++++++++ emulators/rpcs3/distinfo | 2 ++ emulators/rpcs3/pkg-message.qt6 | 24 ++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index ea9fe21e6d29..76f57f49c593 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -13,6 +13,8 @@ LICENSE_COMB= multi LICENSE_FILE_ISCL= ${WRKSRC_cubeb}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md +FLAVORS= qt5 qt6 + BUILD_DEPENDS= flatc:devel/flatbuffers LIB_DEPENDS= libxxhash.so:devel/xxhash \ libcurl.so:ftp/curl \ @@ -47,6 +49,27 @@ CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU ELF_FEATURES= +noaslr,wxneeded:bin/${PORTNAME} +.if ${FLAVOR:U} == qt6 || make(makesum) || make(fetch) +PATCH_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/:qt6 +PATCHFILES+= 052d8cceb679.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471 +PKGNAMESUFFIX= -${FLAVOR} +USES:= ${USES:S/qt:5/qt:6/} +USE_QT= base multimedia svg +PKGMESSAGE= ${.CURDIR}/pkg-message.${FLAVOR} + +CONFLICTS_INSTALL= ${PORTNAME} + +post-patch: ${FLAVOR}-post-patch +${FLAVOR}-post-patch: +# patch(1) doesn't support renames unlike git-apply(1) + @${MV} ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_surface.cpp \ + ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_sink.cpp + @${MV} ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_surface.h \ + ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_sink.h +.else +CONFLICTS_INSTALL= ${PORTNAME}-qt6 +.endif + OPTIONS_DEFINE= ALSA EVDEV FAUDIO PULSEAUDIO JACK SNDIO VULKAN OPTIONS_DEFAULT=EVDEV FAUDIO PULSEAUDIO JACK SNDIO VULKAN diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 9f59f45db5d0..4af2988fa1be 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -23,3 +23,5 @@ SHA256 (wolfSSL-wolfssl-v5.4.0-stable_GH0.tar.gz) = dc36cc19dad197253e5c2ecaa490 SIZE (wolfSSL-wolfssl-v5.4.0-stable_GH0.tar.gz) = 20972285 SHA256 (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = c9411f1882eaf0c190fd5b412deb0bd7dba61a48df243d3408298cc6f53b6921 SIZE (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = 147284646 +SHA256 (052d8cceb679.patch) = 5e8e600ca1a6889a4f19b574275af1379a7c0b57de776f4d955dc95fdcb2c973 +SIZE (052d8cceb679.patch) = 111096 diff --git a/emulators/rpcs3/pkg-message.qt6 b/emulators/rpcs3/pkg-message.qt6 new file mode 100644 index 000000000000..b2171411dfd0 --- /dev/null +++ b/emulators/rpcs3/pkg-message.qt6 @@ -0,0 +1,24 @@ +{ type: install + message: < Audio -> Music Handler then change Qt to Null. + +Process 84361 stopped +* thread #1, name = 'rpcs3', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) + frame #0: 0x0000000805112583 libQt6Multimedia.so.6`QMediaDevices::audioOutputs() at qmediadevices.cpp:133:47 + 130 */ + 131 QList QMediaDevices::audioOutputs() + 132 { +-> 133 return QPlatformMediaDevices::instance()->audioOutputs(); + 134 } + 135 + 136 /*! +(lldb) bt +* thread #1, name = 'rpcs3', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) + * frame #0: 0x0000000805112583 libQt6Multimedia.so.6`QMediaDevices::audioOutputs() at qmediadevices.cpp:133:47 + frame #1: 0x000000080511274e libQt6Multimedia.so.6`QMediaDevices::defaultAudioOutput() at qmediadevices.cpp:190:26 + frame #2: 0x00000008050c86ef libQt6Multimedia.so.6`QAudioOutput::QAudioOutput(this=0x0000000899ff05e0, parent=0x0000000000000000) at qaudiooutput.cpp:54:20 +[...] +EOM +} +]