From nobody Thu Nov 10 07:29:11 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 4N7D3q58fFz4fKsl; Thu, 10 Nov 2022 07:29:11 +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 4N7D3q4wJCz3F06; Thu, 10 Nov 2022 07:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668065351; 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=Vc1ia+5WmcP+OS6gZ4+WjbETsnoXuwN9dfSFvTxOyxQ=; b=B/irH07slA9jeXvgUzhrjp6P0p9AL1EE6/yw59FkkJ5S7hXaLWQ+C6OVU5o1KvntQ5MmHN nRlktLEhse3lBo+85ktdBtNCB9FYayQowrcXA5POSJo1mQLYbK3VSpCCz7YGMwqDDx7F3k lFoXYJwib8zb5ujWqcJXHmRCDSPZk8mVU/wfMLCZtYPZCSp+ILJpv5yQUQCaENuBKsehu3 J4ALiGrt5OFRNvCYHz9OScgJrn8d0cchCDBSzJxVoZKl/3iK+cFozs8U4ve7yQbe7ZxLAP gJYAV7j3kd0Y7TJg4XvHA8k2+83A6UjVIUtzL1sPeIh8rwlTJgiVx0K2fGFtkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668065351; 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=Vc1ia+5WmcP+OS6gZ4+WjbETsnoXuwN9dfSFvTxOyxQ=; b=olqFFKxhrao8HHrkDViH6l+51pRLUYLtyd1enbaKrI5IQT6ZDI4/nTL9AY7xupdfy9XLF2 scwgtWZkVFAcY1yvibEKVj949Gh6L1FkADGMdUuz13LGH3AF4Yw+hRa0n9CSwbEYELRXGp F1p6CwN5EaBvtYB6muQZIsI1ukqvfytDLOaPaA0LO+N5hZwgzctDt4lKM1nob/c+c5uk0X bOfYaycVzhmKo7mtil9tdGBG5GFbvktIRgoBenFAze05uwI7I2Zwt3koJLOInvDwYaGrHo bXZYB2RBZ5zlSi+uC3e2Emco+98BZ0i8LGeT4mGvOBGwDM2qT0LZIMp9k2WE6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668065351; a=rsa-sha256; cv=none; b=eHBGu81NwS0ff/ZxPARLoXvMipxKvQRbrbZXzoKPEHP0Ych64dDa+32SzhmthiouaC4dqq Lpu4RYHRHexSrAEYyadrOBXXWtdSMkjfAmZh86qI8A45+CWpedaecxjjEJD40qEjEIDnW9 iG6Ffze35B1Hk78baNmkmhTtxdd1+YS3JW0Is51esNkz6v3xWK4ldVc3t8m0wIlGLGYqFc UjqER2K4zjhiCT6TUudfxrBx3ETwdqKm8/n3MK+MS1ry0q3o6Fk4Uf5EX5g7Bs7i+QTel9 VqviyA+CRa3BZZrZJyNHcbVqif0FxsQI/PYsTkuG0rjLXfofM+dJiKChovYfFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7D3q3zNNzsLw; Thu, 10 Nov 2022 07:29:11 +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 2AA7TBvl092196; Thu, 10 Nov 2022 07:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AA7TBAh092195; Thu, 10 Nov 2022 07:29:11 GMT (envelope-from git) Date: Thu, 10 Nov 2022 07:29:11 GMT Message-Id: <202211100729.2AA7TBAh092195@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: a79118c74d12 - main - emulators/qmc2: Update to 0.243 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a79118c74d12885ed5f35285832126b8a429421f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a79118c74d12885ed5f35285832126b8a429421f commit a79118c74d12885ed5f35285832126b8a429421f Author: Alastair Hogge AuthorDate: 2022-11-10 07:25:39 +0000 Commit: Li-Wen Hsu CommitDate: 2022-11-10 07:25:39 +0000 emulators/qmc2: Update to 0.243 Changelog: https://github.com/qmc2/qmc2-mame-fe/releases/tag/v0.243 PR: 264167 --- emulators/qmc2/Makefile | 137 ++++++++++++--------- emulators/qmc2/distinfo | 6 +- emulators/qmc2/files/Makefile | 4 - .../qmc2/files/patch-qmc2_htmleditor_htmleditor.ui | 11 -- emulators/qmc2/files/patch-qmc2_imagechecker.cpp | 9 -- emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h | 23 ---- .../qmc2/files/patch-qmc2_softwareimagewidget.cpp | 10 -- emulators/qmc2/files/pkg-message.in | 12 -- emulators/qmc2/pkg-descr | 5 +- emulators/qmc2/pkg-message | 14 --- emulators/qmc2/pkg-plist | 42 +++---- 11 files changed, 104 insertions(+), 169 deletions(-) diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile index 4cbf5c3ac087..158ec864d5c3 100644 --- a/emulators/qmc2/Makefile +++ b/emulators/qmc2/Makefile @@ -1,76 +1,101 @@ PORTNAME= qmc2 -PORTVERSION= 0.195 -PORTREVISION= 4 -CATEGORIES= emulators -MASTER_SITES= SF +PORTVERSION= 0.243 +DISTVERSIONPREFIX= v +CATEGORIES= emulators games -MAINTAINER= ports@FreeBSD.org -COMMENT= Qt based UNIX MAME/MESS frontend +MAINTAINER= agh@riseup.net +COMMENT= Qt based UNIX MAME frontend WWW= https://qmc2.batcom-it.net/ -RUN_DEPENDS= mame>=0.154:emulators/mame \ - mess>=0.154:emulators/mess +LICENSE= GPLv2+ -OPTIONS_DEFINE= DOCS +BUILD_DEPENDS= bash>0:shells/bash \ + gawk>0:lang/gawk +RUN_DEPENDS= libglvnd>0:graphics/libglvnd \ + mame>=0.249:emulators/mame \ + mess>=0.249:emulators/mess -NO_WRKSUBDIR= yes - -USES= compiler:c++11-lang dos2unix gl gmake qt:5 sdl tar:bzip2 xorg -USE_XORG= x11 xmu +USES= compiler:c++11-lang desktop-file-utils gmake gl qt:5 sdl \ + shebangfix tar:bzip2 xorg +USE_GITHUB= yes +GH_ACCOUNT= qmc2 +GH_PROJECT= qmc2-mame-fe USE_GL= gl glu -USE_QT= buildtools:build core declarative gui multimedia \ - network opengl qmake:build \ - testlib script scripttools sql svg \ - webkit widgets xml xmlpatterns -USE_SDL= sdl - -CXXFLAGS+= -I${LOCALBASE}/include/SDL/ -MAKE_ARGS= QTDIR="${PREFIX}" QMAKE="${QMAKE}" \ - SYSCONFDIR="${PREFIX}/etc" ARCH="${OPSYS}" \ +USE_QT= buildtools core declarative gui multimedia network opengl qmake \ + script scripttools sql svg testlib webkit widgets xml \ + xmlpatterns +USE_SDL= sdl2 +USE_XORG= x11 xmu + +SHEBANG_FILES= scripts/cleanup-category-ini.sh \ + scripts/make-man-pages.sh \ + scripts/plugin_helper.sh \ + scripts/sdl-defines.sh \ + scripts/sdl-includepath.sh \ + scripts/sdl-libs.sh \ + scripts/sdl-version.sh \ + scripts/strip-png-headers.sh + +MAKE_ARGS= ARCH="${OPSYS}" \ + CC="${CC}" \ CC_FLAGS="${CFLAGS} -DUSE_FILE32API" \ + CXX="${CXX}" \ CXX_FLAGS="${CXXFLAGS} -DUSE_FILE32API" \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" + DATADIR="${DATADIR}" \ + LINK="${CXX}" \ + MAKE="${MAKE_CMD}" \ + PHONON="0" \ + QMAKE="${QMAKE}" \ + QTDIR="${PREFIX}" \ + SYSCONFDIR="${PREFIX}/etc" + +ALL_TARGET= all arcade tools + +OPTIONS_DEFINE= DOCS EXAMPLES +DOCS_DESC= Comprehensive qmc2 documentaion -DESKTOP_ENTRIES="QMC2" "MAME frontend" "${DATADIR}/img/mame.png" \ - "${PORTNAME}-sdlmame" "Game;Emulator;Qt;" "true" \ - "QMC2 Arcade" "QMC2 Arcade Mode" "${DATADIR}/img/qmc2-arcade.png" \ - "${PORTNAME}-arcade" "Game;Emulator;Qt;" "true" \ - "CHDMAN GUI" "Qt CHDMAN GUI" "${DATADIR}/img/qchdman.png" \ - "qchdman" "Game;Emulator;Qt;" "true" \ +DOCS_ALL_TARGET= doc +DOCS_PORTDOCS= html -# This seems to be third-party, and has DOS line-endings. It also -# needs to be patched because of a confusing build error: #define True 1 -# is a bad idea in C++ code that *also* uses True as an identifier -# in some scopes. -DOS2UNIX_FILES= qmc2/lzma/7zTypes.h +.include post-patch: - @${CP} ${FILESDIR}/Makefile ${WRKSRC} - @(cd ${WRKSRC}/qmc2/inst; ${SED} -e 's|DATADIR|${PREFIX}/share|' \ - < qmc2.ini.template > qmc2.ini) - @${REINPLACE_CMD} -e 's/bash/sh/' ${WRKSRC}/qmc2/scripts/sdl-libs.sh + @${REINPLACE_CMD} -e 's|DATADIR/qmc2|${DATADIR}|g' \ + ${WRKSRC}/inst/*.template do-install: - (cd ${WRKSRC}/qmc2 && ${INSTALL_PROGRAM} qmc2-sdlmame \ + (cd ${WRKSRC} && ${INSTALL_PROGRAM} qmc2-sdlmame \ + ${STAGEDIR}${PREFIX}/bin/qmc2-mame) + (cd ${WRKSRC}/src/arcade && ${INSTALL_PROGRAM} qmc2-arcade \ ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/qmc2/arcade && ${INSTALL_PROGRAM} qmc2-arcade \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/qmc2/tools/qchdman && ${INSTALL_PROGRAM} qchdman \ + (cd ${WRKSRC}/src/tools/qchdman && ${INSTALL_PROGRAM} qchdman \ ${STAGEDIR}${PREFIX}/bin) + + @${MKDIR} ${STAGEDIR}${DATADIR} +.for data in img lng opt + (cd ${WRKSRC}/data && ${COPYTREE_SHARE} ${data} \ + ${STAGEDIR}${DATADIR}) +.endfor + + ${INSTALL_MAN} ${WRKSRC}/data/doc/man/qchdman.6.gz \ + ${STAGEDIR}${MANPREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/data/doc/man/qmc2-arcade.6.gz \ + ${STAGEDIR}${MANPREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/data/doc/man/qmc2-main-gui.6.gz \ + ${STAGEDIR}${MANPREFIX}/man/man6/qmc2-mame.6.gz + +.for dsktop_entry in qchdman.desktop qmc2-arcade.desktop qmc2.desktop + (cd ${WRKSRC}/inst && ${INSTALL_DATA} ${dsktop_entry}.template \ + ${STAGEDIR}${LOCALBASE}/share/applications/${dsktop_entry}) +.endfor + @${MKDIR} ${STAGEDIR}${ETCDIR} - (cd ${WRKSRC}/qmc2/inst && ${INSTALL_DATA} qmc2.ini \ - ${STAGEDIR}${ETCDIR}) - @${MKDIR} ${STAGEDIR}${DATADIR}/img - @(cd ${WRKSRC}/qmc2/data/img; ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DATADIR}/img) - @${MKDIR} ${STAGEDIR}${DATADIR}/lng - (cd ${WRKSRC}/qmc2/data/lng && ${INSTALL_DATA} qmc2_*.qm \ - ${STAGEDIR}${DATADIR}/lng) - @${MKDIR} ${STAGEDIR}${DATADIR}/opt - @(cd ${WRKSRC}/qmc2/data/opt; ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DATADIR}/opt) - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html - @(cd ${WRKSRC}/qmc2/data/doc/html; ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DOCSDIR}/html) + (cd ${WRKSRC}/inst && ${INSTALL_DATA} qmc2.ini.template \ + ${STAGEDIR}${ETCDIR}/qmc2.ini.sample) + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/data/doc && ${COPYTREE_SHARE} html \ + ${STAGEDIR}${DOCSDIR}) .include diff --git a/emulators/qmc2/distinfo b/emulators/qmc2/distinfo index 762d1e684dd0..2458924e6946 100644 --- a/emulators/qmc2/distinfo +++ b/emulators/qmc2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520181492 -SHA256 (qmc2-0.195.tar.bz2) = 44b36a80ab7cd23e0efc3e0296ea680b38dd122319379bf6a4dcb9c2111183e7 -SIZE (qmc2-0.195.tar.bz2) = 13463384 +TIMESTAMP = 1651496883 +SHA256 (qmc2-qmc2-mame-fe-v0.243_GH0.tar.gz) = 0608a4e08bc451ae01856b85525f1dc767e01eb823e7e294c772876971e7609b +SIZE (qmc2-qmc2-mame-fe-v0.243_GH0.tar.gz) = 14446061 diff --git a/emulators/qmc2/files/Makefile b/emulators/qmc2/files/Makefile deleted file mode 100644 index 9ce72bd82fd8..000000000000 --- a/emulators/qmc2/files/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all: - ${MAKE} -C qmc2 DISTCFG=1 SDL=1 - ${MAKE} -C qmc2 arcade DISTCFG=1 SDL=1 - ${MAKE} -C qmc2 qchdman DISTCFG=1 SDL=1 diff --git a/emulators/qmc2/files/patch-qmc2_htmleditor_htmleditor.ui b/emulators/qmc2/files/patch-qmc2_htmleditor_htmleditor.ui deleted file mode 100644 index b3a2c72a880c..000000000000 --- a/emulators/qmc2/files/patch-qmc2_htmleditor_htmleditor.ui +++ /dev/null @@ -1,11 +0,0 @@ ---- qmc2/htmleditor/htmleditor.ui.orig 2018-12-11 18:01:15 UTC -+++ qmc2/htmleditor/htmleditor.ui -@@ -771,7 +771,7 @@ - - QWebView - QWidget --
QtWebKit/QWebView
-+
QtWebKitWidgets/QWebView
- - - diff --git a/emulators/qmc2/files/patch-qmc2_imagechecker.cpp b/emulators/qmc2/files/patch-qmc2_imagechecker.cpp deleted file mode 100644 index 0f42c7f184df..000000000000 --- a/emulators/qmc2/files/patch-qmc2_imagechecker.cpp +++ /dev/null @@ -1,9 +0,0 @@ -Workaround where the LZMA headers #define False 0, while -parts of QtCore (the new qcborflags?) use False as an identifier. ---- qmc2/imagechecker.cpp.orig 2016-09-04 14:08:00 UTC -+++ qmc2/imagechecker.cpp -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include diff --git a/emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h b/emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h deleted file mode 100644 index 03ea8278da17..000000000000 --- a/emulators/qmc2/files/patch-qmc2_lzma_7zTypes.h +++ /dev/null @@ -1,23 +0,0 @@ -This avoids errors list the following, where True is a C++ -identifier used in scoped context; the #define eats it. - -/usr/local/include/qt5/QtCore/qcborstreamreader.h:143:76: error: expected unqualified-id - bool isFalse() const { return isSimpleType(QCborSimpleType::False); } - ^ -lzma/7zTypes.h:98:15: note: expanded from macro 'False' -#define False 0 - ---- qmc2/lzma/7zTypes.h.orig 2020-05-30 14:14:41 UTC -+++ qmc2/lzma/7zTypes.h -@@ -94,8 +94,11 @@ typedef size_t SizeT; - #endif - - typedef int Bool_7z; -+#ifndef __cplusplus -+/* Only for library internals */ - #define True 1 - #define False 0 -+#endif - - - #ifdef _WIN32 diff --git a/emulators/qmc2/files/patch-qmc2_softwareimagewidget.cpp b/emulators/qmc2/files/patch-qmc2_softwareimagewidget.cpp deleted file mode 100644 index 4acc0f891881..000000000000 --- a/emulators/qmc2/files/patch-qmc2_softwareimagewidget.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qmc2/softwareimagewidget.cpp.orig 2020-06-24 12:40:06 UTC -+++ qmc2/softwareimagewidget.cpp -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include "softwarelist.h" - #include "softwaresnapshot.h" diff --git a/emulators/qmc2/files/pkg-message.in b/emulators/qmc2/files/pkg-message.in deleted file mode 100644 index a8d1d6d5efc7..000000000000 --- a/emulators/qmc2/files/pkg-message.in +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ type: install - message: <