git: 7abd012d3874 - main - audio/bambootracker: Unbreak
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Aug 2023 19:29:56 UTC
The branch main has been updated by ehaupt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7abd012d3874470c4785471e5c4bb3a3112f6947
commit 7abd012d3874470c4785471e5c4bb3a3112f6947
Author: Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2023-08-01 19:29:44 +0000
Commit: Emanuel Haupt <ehaupt@FreeBSD.org>
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_;
- }
- }
-