Skip to content

Commit

Permalink
qjackctl: compatible version
Browse files Browse the repository at this point in the history
  • Loading branch information
barracuda156 committed Sep 2, 2024
1 parent 7654f68 commit e8b4fc7
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 25 deletions.
53 changes: 28 additions & 25 deletions audio/qjackctl/Portfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

PortSystem 1.0
PortGroup qt5 1.0

name qjackctl
version 0.6.2
version 0.5.4
license GPL-2+
categories audio
maintainers nomaintainer
platforms darwin
homepage http://qjackctl.sourceforge.net/

description \
Expand All @@ -21,36 +19,41 @@ long_description \

master_sites http://downloads.sourceforge.net/qjackctl

checksums rmd160 b6349402c406b3d5a2eb6694c3528ef0b25350d6 \
sha256 1ec77d0e8edac1b4d60a32a08d2f4329f90571801920cb48c6147e0eae6f50e6 \
size 1027742
checksums rmd160 12e00e234d05e9617a41f5e89118091bcdfb69b6 \
sha256 982df020a9c3ba3cb4f481236d181f277c64c22b94393b0a2e7fbe91960d2763 \
size 911052

universal_variant no
depends_lib-append port:jack

depends_lib-append \
port:jack
compiler.cxx_standard 2011

qt5.depends_component \
qtbase \
qttools
configure.cxxflags-append --std=c++11
configure.args-append --with-jack=${prefix} \
--disable-alsa-seq
configure.args-delete --disable-dependency-tracking

compiler.cxx_standard 2011
configure.cxxflags-append \
-std=c++11
patchfiles-append patch-fix-no-alsa-build.diff

post-patch {
# fix jackd path
reinplace "s|\"/Server\", \"jackd\"|\"/Server\", \"${prefix}/bin/jackd\"|" ${worksrcpath}/src/qjackctlSetup.cpp
platform darwin {
if {${os_major} < 11} {
default_variants-append +qt4
}
}

configure.args-append \
--with-jack=${prefix} \
--disable-alsa-seq \
--with-qt=${qt_dir} \
--disable-debug
universal_variant no

configure.args-delete \
--disable-dependency-tracking
variant qt4 description "Enable qt4 instead of qt5 interface" {}

if {[variant_isset qt4]} {
PortGroup qt4 1.0
depends_lib-append port:qt4-mac
configure.args-append --enable-qt4
configure.args-append --with-qt4=${qt_dir} \
} else {
PortGroup qt5 1.0
depends_lib-append port:qt5
configure.args-append --with-qt5=${qt_dir}
}

variant debug description "Enable debugging" {}

Expand Down
57 changes: 57 additions & 0 deletions audio/qjackctl/files/patch-fix-no-alsa-build.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
--- src/src.pro
+++ src/src.pro 2024-07-07 08:19:46.000000000 +0800
@@ -38,8 +38,6 @@

SOURCES += \
qjackctl.cpp \
- qjackctlAlsaConnect.cpp \
- qjackctlAlsaGraph.cpp \
qjackctlConnect.cpp \
qjackctlConnectAlias.cpp \
qjackctlGraph.cpp \


--- src/qjackctlGraphForm.cpp
+++ src/qjackctlGraphForm.cpp 2024-07-07 08:21:37.000000000 +0800
@@ -217,7 +217,9 @@

m_ui.viewColorsJackAudioAction->setData(qjackctlJackGraph::audioPortType());
m_ui.viewColorsJackMidiAction->setData(qjackctlJackGraph::midiPortType());
+#ifdef CONFIG_ALSA_SEQ
m_ui.viewColorsAlsaMidiAction->setData(qjackctlAlsaGraph::midiPortType());
+#endif

QObject::connect(m_ui.viewColorsJackAudioAction,
SIGNAL(triggered(bool)),
@@ -225,9 +227,11 @@
QObject::connect(m_ui.viewColorsJackMidiAction,
SIGNAL(triggered(bool)),
SLOT(viewColorsAction()));
+#ifdef CONFIG_ALSA_SEQ
QObject::connect(m_ui.viewColorsAlsaMidiAction,
SIGNAL(triggered(bool)),
SLOT(viewColorsAction()));
+#endif
QObject::connect(m_ui.viewColorsResetAction,
SIGNAL(triggered(bool)),
SLOT(viewColorsReset()));
@@ -387,7 +391,9 @@
{
m_ui.graphCanvas->clearPortTypeColors();
m_jack->resetPortTypeColors();
+#ifdef CONFIG_ALSA_SEQ
m_alsa->resetPortTypeColors();
+#endif
m_ui.graphCanvas->updatePortTypeColors();

updateViewColors();
@@ -716,7 +722,9 @@
{
updateViewColorsAction(m_ui.viewColorsJackAudioAction);
updateViewColorsAction(m_ui.viewColorsJackMidiAction);
+#ifdef CONFIG_ALSA_SEQ
updateViewColorsAction(m_ui.viewColorsAlsaMidiAction);
+#endif
}


0 comments on commit e8b4fc7

Please sign in to comment.