From nobody Sat Jan 29 17:57:58 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 6B6151983A68; Sat, 29 Jan 2022 17:58:00 +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 4JmMVv0vXfz3mL1; Sat, 29 Jan 2022 17:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643479079; 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=EqlamIHj4soy4P3s+I2Wm4ZPmQHLlH68rsnTUwxPxhc=; b=W+nxrWKKV5eNmop5HOjvN6iNEk3azQ7SrBNNMnfcUaravN+pLAXulGmfs3A7CM2fOBtMz+ yf9CyWQu5txloVcom2MstKhGaWTuO+H3pzh+U1iPuYFvDsZ6VbkbNP/X+aazg+prj8cBK7 qID1LR0bVrvPLZ7ND4G6qFBghNUfsyDr7PGhCe00o4eR0YBPBzW1t2fGhIM30T3DB3t017 obLELqXIKOppiafbBY1oEsjHE6KUkOwc/IPhRnBKh1Uu6EPFFp3reLmJfamTkiTyqLaqkR G9XdGhraIIGX+JusxgF9tFovurFmapKQjVJt3qZtf5EOZYAxHlO/R6TcvfaKcA== 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 A0E851A137; Sat, 29 Jan 2022 17:57:58 +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 20THvwmo079461; Sat, 29 Jan 2022 17:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20THvw1a079460; Sat, 29 Jan 2022 17:57:58 GMT (envelope-from git) Date: Sat, 29 Jan 2022 17:57:58 GMT Message-Id: <202201291757.20THvw1a079460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 60fe38c09945 - main - audio/musescore: Enable support for ALSA MIDI under FreeBSD. 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: hselasky X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60fe38c099458bc1afcb8983c7bdeed0872f438c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643479079; 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=EqlamIHj4soy4P3s+I2Wm4ZPmQHLlH68rsnTUwxPxhc=; b=QkDEawyXhZeDPw8rYgvcxSufCB++JON6c/YUUjM79XLTfCaX91NH8s62yck1WYIulg/TTX 2E6ELWIqJgocdJz6UzltCzWIqJSpcFoqBYPGEKXj8u+7U2Frzm0jdD5h070WbhW33a2vSa R5ihkfMkgkIKzhvJv9jMXyoDxXgSNXePqHbE7ACDFIKUDOCNGW9/qROHmiszJdmW0GU3Kl nVnIiKTfckdTsGWMEccIILBaOsVkwhU/eoN53LNAElptBvbBE3kDbi2gtCSMFk3RDmKhZf aCs9jCRXFosuSgrGoLqdtR9rC+4ZeOIhEFCULB7L13aQdNHs5KkBykumTu9maQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643479079; a=rsa-sha256; cv=none; b=VcO4oeXIuiN1JeRbBrKHDZngP+I6eGVd1AvNkJD1p0PDxb80PdYvhoIN8kPFIo5AqQGJ7y txrGAPD0Slb+EFxZrfPfcg7Y0BKE5LoH1Y+KFmZCEziJO/BlxCQ9jbwCYy/M01iy5yHWJz olqrdoZ/V3/ZRtYZEu1dV3CULsyR5tr1YumznOG/x8DoczloMN5db0nCNHfvSqnCzlh9le vlhoS3RGvePOMXtuIEBrv5mbkB2VrlW5/9vXp4+jsijGFx0Sg9h19P2VICzKjWvp7A8yp/ a62nd+o78WXzoUdWLYghaOHCGnjaWbxWIYBBcJn8YIfDEI+Z7SB2J//shuN3OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/ports/commit/?id=60fe38c099458bc1afcb8983c7bdeed0872f438c commit 60fe38c099458bc1afcb8983c7bdeed0872f438c Author: Hans Petter Selasky AuthorDate: 2022-01-29 16:41:09 +0000 Commit: Hans Petter Selasky CommitDate: 2022-01-29 17:56:52 +0000 audio/musescore: Enable support for ALSA MIDI under FreeBSD. Discussed with: adridg (maintainer) Approved by: pi (implicit) --- audio/musescore/Makefile | 4 ++-- audio/musescore/files/patch-audio_drivers_alsa.cpp | 10 ++++++++++ .../musescore/files/patch-audio_drivers_mididriver.cpp | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile index 56dde276ba5f..f1d31827c9a8 100644 --- a/audio/musescore/Makefile +++ b/audio/musescore/Makefile @@ -1,7 +1,7 @@ PORTNAME= ${GH_PROJECT:tl} DISTVERSIONPREFIX= v DISTVERSION= 3.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org @@ -49,7 +49,7 @@ OPTIONS_DEFAULT_i386= WEBENGINE WEBENGINE_DESC= Use WebEngine in the welcome panel ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_BOOL= BUILD_ALSA +ALSA_CMAKE_BOOL= BUILD_ALSA HAS_MIDI JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= BUILD_JACK PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio diff --git a/audio/musescore/files/patch-audio_drivers_alsa.cpp b/audio/musescore/files/patch-audio_drivers_alsa.cpp new file mode 100644 index 000000000000..6894e7f3b4ac --- /dev/null +++ b/audio/musescore/files/patch-audio_drivers_alsa.cpp @@ -0,0 +1,10 @@ +--- audio/drivers/alsa.cpp.orig 2022-01-29 16:19:41 UTC ++++ audio/drivers/alsa.cpp +@@ -616,6 +616,7 @@ AlsaAudio::~AlsaAudio() + { + stop(); + delete alsa; ++ delete midiDriver; + } + + //--------------------------------------------------------- diff --git a/audio/musescore/files/patch-audio_drivers_mididriver.cpp b/audio/musescore/files/patch-audio_drivers_mididriver.cpp new file mode 100644 index 000000000000..448f6158424e --- /dev/null +++ b/audio/musescore/files/patch-audio_drivers_mididriver.cpp @@ -0,0 +1,18 @@ +--- audio/drivers/mididriver.cpp.orig 2022-01-29 16:09:37 UTC ++++ audio/drivers/mididriver.cpp +@@ -112,8 +112,14 @@ static const unsigned int outCap = SND_SEQ_PORT_CAP_SU + //--------------------------------------------------------- + + AlsaMidiDriver::AlsaMidiDriver(Seq* s) +- : MidiDriver(s) ++ : MidiDriver(s), alsaSeq(0) + { ++ } ++ ++AlsaMidiDriver::~AlsaMidiDriver() ++ { ++ if (alsaSeq) ++ snd_seq_close(alsaSeq); + } + + //---------------------------------------------------------