From nobody Tue Aug 01 19:29:56 2023 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 4RFlYd3fHWz4pm16; Tue, 1 Aug 2023 19:29:57 +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 4RFlYd0fwgz4cfp; Tue, 1 Aug 2023 19:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690918197; 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=B0vOJbI+M86OaQUyejirOa71553//6yNw5g0Qn5SKVE=; b=FsMtXyXfdDnymINBIjTSVFQvhbKlF2CcHjkA/TYePlqTlmjqDkQ/wFFzMMqfN9LWhRLS4e wTAkDLJ0HQXLH6Z98Cqh4n84vlRrvjdqQVPTcoZCzQ7r9LwySlAZ//nUYDsdglBWRAP+bb Y1QGfra4vgsUnq+WYLIvOkjxiLzLp/OquwImiPaFeK+i/guKI+ReYQxlGwm8st0v/CgSrR WUFOTwJIHquLLALw2za5j67AJdn5qYsIEirgIOvMPAdW9+29wfQnDy0XM4JoI+jFhizPMA VBbOEwRK+sqU7DNmN1UDtD60oCY5HH4A9A2ALU6QJWctNkzNUzlIZULHSjqMjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690918197; a=rsa-sha256; cv=none; b=s3NF+1wCrcFGxv7cCE0dX7Hm3KDX4aDR8ktRYPSMdFiDWxUwkcQo7aHljhqqLLXRTxV7Qr RhDjXWbrfEv4aae1sSqSzpfTv6JclNySHOX1H43WYCxvwlVacuM2vmosjompMn/dOzZUPr QROG9zG6OL1SujhafwDsBqmfngPLbWzhqJSqqx7GAoHqXgfjt5KTEp62lADmwdP0tPqEID 9A9SupJrxopmerhGiIDWhNdbz3JvpU7FFU0cijSEJLXlsanP4XoE49slYX5Mj10861Kg9q 6rRdzaZKnk30TLo5QkLr8/s/xsoUt/IqhCTscAsPYtXwVqbIGVJ9Bp4yObJx+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690918197; 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=B0vOJbI+M86OaQUyejirOa71553//6yNw5g0Qn5SKVE=; b=R0rcZD7MbstQj7snckjlyf4+XoyZtE7xgNq0tOLERb9vO+jKkp2DlgaMRz3BFSVFs5VDy9 FjsiL27L9kfVW0+0oqxhidgAginxa0It7kywWb5qaChypvIp83cyZ+jf0R+3Qa1Y3Fd4u/ /8GyYsQ0KKfdVexMgOShNB6w23+7iKOjjKOLQefpxP8ojB2MMoS0LHuCgIaCo0yeWyqcbw tfV/VKID0SxOw9BxJzlcnYhmxe3FPXb7iqqCzbkcSq7llNU/vnJZADNogmtFtFCBw8cv6c C8jnyMsCJPBcCCYjofcSgvOM6OPSdbOmG8A+P1anFOIRl1OvIDLBRiVSytIpOw== 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 4RFlYc65xrzpsG; Tue, 1 Aug 2023 19:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371JTuUk046415; Tue, 1 Aug 2023 19:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371JTu8i046414; Tue, 1 Aug 2023 19:29:56 GMT (envelope-from git) Date: Tue, 1 Aug 2023 19:29:56 GMT Message-Id: <202308011929.371JTu8i046414@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 7abd012d3874 - main - audio/bambootracker: Unbreak 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7abd012d3874470c4785471e5c4bb3a3112f6947 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7abd012d3874470c4785471e5c4bb3a3112f6947 commit 7abd012d3874470c4785471e5c4bb3a3112f6947 Author: Emanuel Haupt AuthorDate: 2023-08-01 19:29:44 +0000 Commit: Emanuel Haupt CommitDate: 2023-08-01 19:29:51 +0000 audio/bambootracker: Unbreak --- audio/bambootracker/Makefile | 18 +++++++++--------- audio/bambootracker/distinfo | 12 +++++++++--- ...cker_gui_order__list__editor_order__list__panel.cpp | 13 ------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile index 46a57f258245..ef5f390b49ca 100644 --- a/audio/bambootracker/Makefile +++ b/audio/bambootracker/Makefile @@ -1,18 +1,13 @@ PORTNAME= bambootracker DISTVERSIONPREFIX= v -DISTVERSION= 0.6.1 -PORTREVISION= 1 +DISTVERSION= 0.6.1-19 +DISTVERSIONSUFFIX= -g9bf6c7a0 CATEGORIES= audio -MASTER_SITES= https://github.com/BambooTracker/BambooTracker/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ -DISTNAME= BambooTracker-src-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= ehaupt@FreeBSD.org COMMENT= Music tracker for the Yamaha YM2608 (OPNA) sound chip WWW= https://github.com/rerrahkr/BambooTracker -# https://github.com/BambooTracker/BambooTracker/issues/492 -BROKEN= incompatible with rtaudio 6.x - LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -22,6 +17,13 @@ LIB_DEPENDS= librtaudio.so:audio/rtaudio \ USES= compiler:c++14-lang desktop-file-utils gl qmake qt:5 \ shared-mime-info xorg +USE_GITHUB= yes +GH_ACCOUNT= BambooTracker +GH_PROJECT= BambooTracker +GH_TUPLE= thestk:rtaudio:0e11b50a:rtaudio/submodules/RtAudio/src \ + thestk:rtmidi:d2dd50da:rtmidi/submodules/RtMidi/src \ + rerrahkr:emu2149:63c0fe07:emu2149/submodules/emu2149/src + USE_GL= gl USE_QT= buildtools core gui multimedia network widgets \ linguisttools:build @@ -30,8 +32,6 @@ DATADIR= ${PREFIX}/share/BambooTracker DOCSDIR= ${PREFIX}/share/doc/BambooTracker EXAMPLESDIR= ${PREFIX}/share/examples/BambooTracker -WRKSRC= ${WRKDIR}/BambooTracker-src-${DISTVERSIONPREFIX}${DISTVERSION} - OPTIONS_DEFINE= ALSA EXAMPLES JACK NLS PULSEAUDIO OPTIONS_DEFAULT= PULSEAUDIO OPTIONS_SUB= yes diff --git a/audio/bambootracker/distinfo b/audio/bambootracker/distinfo index 442f8777f68e..a44d3a08bce3 100644 --- a/audio/bambootracker/distinfo +++ b/audio/bambootracker/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1675961730 -SHA256 (BambooTracker-src-v0.6.1.tar.gz) = 6fff502620fc8e43725e6173f9c1be5d7d41951b5bfe79245045e5423ea8b9ec -SIZE (BambooTracker-src-v0.6.1.tar.gz) = 1396221 +TIMESTAMP = 1690874252 +SHA256 (BambooTracker-BambooTracker-v0.6.1-19-g9bf6c7a0_GH0.tar.gz) = b24def593700eb649fbb36a5d7c247bf437441f7928158e5238f8567f11c83ea +SIZE (BambooTracker-BambooTracker-v0.6.1-19-g9bf6c7a0_GH0.tar.gz) = 1067002 +SHA256 (thestk-rtaudio-0e11b50a_GH0.tar.gz) = a3494753bf133ceb6fc70365e3492877a98cc48c58b1c681806101bf0b7f2483 +SIZE (thestk-rtaudio-0e11b50a_GH0.tar.gz) = 254679 +SHA256 (thestk-rtmidi-d2dd50da_GH0.tar.gz) = fed7ad5852a8b0e58e989f0eb3d9485ad671a6f5adf58865a03a668851b4f285 +SIZE (thestk-rtmidi-d2dd50da_GH0.tar.gz) = 93519 +SHA256 (rerrahkr-emu2149-63c0fe07_GH0.tar.gz) = c13a24ca92821f9472e6bbeafa683ffddca358f5164b2505d505ed4d6628c4ba +SIZE (rerrahkr-emu2149-63c0fe07_GH0.tar.gz) = 4351 diff --git a/audio/bambootracker/files/patch-BambooTracker_gui_order__list__editor_order__list__panel.cpp b/audio/bambootracker/files/patch-BambooTracker_gui_order__list__editor_order__list__panel.cpp deleted file mode 100644 index 2ebe79aa06d2..000000000000 --- a/audio/bambootracker/files/patch-BambooTracker_gui_order__list__editor_order__list__panel.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- BambooTracker/gui/order_list_editor/order_list_panel.cpp.orig 2023-02-04 06:49:52 UTC -+++ BambooTracker/gui/order_list_editor/order_list_panel.cpp -@@ -709,9 +709,8 @@ void OrderListPanel::drawBorders(int maxWidth) - QPainter painter(&backPixmap_); - painter.setPen(palette_->odrBorderColor); - painter.drawLine(rowNumWidth_, 0, rowNumWidth_, backPixmap_.height()); -- for (int x = rowNumWidth_ + trackWidth_, trackVisIdx = leftTrackVisIdx_; x <= maxWidth; ++trackVisIdx) { -+ for (int x = rowNumWidth_ + trackWidth_; x <= maxWidth; x += trackWidth_) { - painter.drawLine(x, 0, x, backPixmap_.height()); -- x += trackWidth_; - } - } -