Sughosha <sughosha@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 16 Jun 2023 19:04:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 16 15:04:56 2023
Received: from localhost ([127.0.0.1]:50406 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qAEkh-0001qN-Mz
for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:04:56 -0400
Received: from mail-4318.protonmail.ch ([185.70.43.18]:46865)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1qAEkf-0001qA-7X
for 63254 <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:04:54 -0400
Date: Fri, 16 Jun 2023 19:04:43 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1686942287; x=1687201487;
bh=qGNL7+XgUDHYwdzw8CNX6TpfNAVLCKYH0/QpKaqUDG8=;
h=Date:To:From:Subject:Message-ID:In-Reply-To:References:
Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:
Message-ID:BIMI-Selector;
b=CsTJcEcjvpHEg8+LFpnmC4aVWkS8w9xyTKYciw7yX77RcwMJhUftD4mVv4rLKQsyc
dPHaPjtixkwEz2BMB1yeFvxDCOHGgHNnpCu3aTKjau8CwMXQItymTR5wtCt1ddj3R8
tz6K5W8LI5LH+vGNbzi/tIBxhryYJ1isjdeZRuoHMxMBqPDpwLCzIQBwzlNJv0b3TO
1l9sGUXXR6azDi662cPO2SgzNr1Ywrlh1/j0umEVNtc1/yoR8ffJ56x8j8KI0xPghc
atK97XpoYS4FlRMMuc/Z/hIfj44qbnwwN3nWFKXj3uVE41df5B8Oa1v8vc8en7anzJ
zaN2tkGjMadOQ==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v4 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface.
Message-ID: <eBJsLbu4dA-v0LiyuTmTvIUphWJ9pI5PsyyZjRw_08GJLRHvAmQz7Cu_6N17j4IaTCaBmJPhnzujB6Lls_X__XWBU5yLEuqLFNib-DkLlXo=@proton.me>
In-Reply-To: <pzsSb_wv2_bA8UacIkmlqyy-r5vGQl0NcslYaVN7CeXCisCJkBW6OpX64eiPUu9Bwx2-xp4QKwjEaIHkVslQYomi-PChS51hgyko0btvPYU=@proton.me>
References: <abeUfDh1ukeBZV7Nb3XctwqENL8IkxNa0TTIW_7ZuEc6WKuifLpWO_fmm_SF-rftIZ9M0JkqxPqQagOkCfD5kCaTMcBizZZhhmZsoJPQol4=@proton.me>
<pzsSb_wv2_bA8UacIkmlqyy-r5vGQl0NcslYaVN7CeXCisCJkBW6OpX64eiPUu9Bwx2-xp4QKwjEaIHkVslQYomi-PChS51hgyko0btvPYU=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/music.scm (zynaddsubfx)[source]: Add a patches.
[arguments]: Add configure flags and patch-paths phase.
[inputs]: Remove ntk and add rtosc and mruby-zest.
[native-search-paths]: Add search paths for "LV2_PATH" and "VST2_PATH".
[home-page]: Change home-page.
* gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch: New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 3 +-
gnu/packages/music.scm | 34 +++++-
.../zynaddsubfx-3.0.6-system-rtosc.patch | 106 ++++++++++++++++++
3 files changed, 138 insertions(+), 5 deletions(-)
create mode 100644 gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.pat=
ch
diff --git a/gnu/local.mk b/gnu/local.mk
index 1649398f59..e244f3174c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2098,7 +2098,8 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/yggdrasil-extra-config.patch=09\
%D%/packages/patches/zig-do-not-link-against-librt.patch=09\
%D%/packages/patches/zig-use-system-paths.patch=09=09\
- %D%/packages/patches/zsh-egrep-failing-test.patch
+ %D%/packages/patches/zsh-egrep-failing-test.patch=09=09\
+ %D%/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
=20
MISC_DISTRO_FILES =3D=09=09=09=09\
%D%/packages/ld-wrapper.in
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2e7eddafb0..cea2905bec 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -157,6 +157,7 @@ (define-module (gnu packages music)
#:use-module (gnu packages man)
#:use-module (gnu packages mp3)
#:use-module (gnu packages mpd)
+ #:use-module (gnu packages mruby-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages networking)
@@ -3177,10 +3178,18 @@ (define-public zynaddsubfx
version "/zynaddsubfx-" version ".tar.bz2"))
(sha256
(base32
- "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))))
+ "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))
+ (patches
+ (search-patches
+ "zynaddsubfx-3.0.6-system-rtosc.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
+ `(#:configure-flags `("-DGuiModule=3Dzest"
+ ,(string-append "-DZYN_DATADIR=3D"
+ (assoc-ref %outputs "out")
+ "/share/zynaddsubfx")
+ "-DZYN_SYSTEM_RTOSC=3DON")
+ #:phases
(modify-phases %standard-phases
;; Move SSE compiler optimization flags from generic target to
;; athlon64 and core2 targets, because otherwise the build would =
fail
@@ -3190,10 +3199,20 @@ (define-public zynaddsubfx
(substitute* "src/CMakeLists.txt"
(("-msse -msse2 -mfpmath=3Dsse") "")
(("-march=3D(athlon64|core2)" flag)
- (string-append flag " -msse -msse2 -mfpmath=3Dsse"))))))))
+ (string-append flag " -msse -msse2 -mfpmath=3Dsse")))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/main.cpp"
+ (("\\./zyn-fusion")
+ (search-input-file inputs "/bin/zyn-fusion")))
+ (substitute* "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp"
+ (("\\./libzest\\.so")
+ (search-input-file inputs "/lib/libzest.so"))))))))
(inputs
(list liblo
ntk
+ rtosc
+ mruby-zest
mesa
alsa-lib
jack-1
@@ -3205,7 +3224,14 @@ (define-public zynaddsubfx
(native-inputs
(list pkg-config
ruby))
- (home-page "https://zynaddsubfx.sf.net/")
+ (native-search-paths
+ (list (search-path-specification
+ (variable "LV2_PATH")
+ (files '("lib/lv2")))
+ (search-path-specification
+ (variable "VST2_PATH")
+ (files '("lib/vst")))))
+ (home-page "https://zynaddsubfx.sourceforge.io/")
(synopsis "Software synthesizer")
(description
"ZynAddSubFX is a feature heavy realtime software synthesizer. It of=
fers
diff --git a/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch b/gn=
u/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
new file mode 100644
index 0000000000..edf22c389b
--- /dev/null
+++ b/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
@@ -0,0 +1,106 @@
+Adding the option ZYN_SYSTEM_RTOSC to let the use of the system provided R=
tOsc
+instead of using the bundled one.
+
+--- a/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -10,24 +10,34 @@
+ add_definitions(-DZYN_DATADIR=3D"${ZYN_DATADIR}")
+ endif()
+=20
++option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" O=
FF)
++
+ #Include RTOSC
+-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(STATUS "RTOSC NOT FOUND")
+- message(STATUS "Attempting to checkout submodule")
+- find_package(Git REQUIRED)
+- execute_process(COMMAND git submodule update --init --recursive)
++if(ZYN_SYSTEM_RTOSC)
++ include(FindPkgConfig)
++ pkg_check_modules(RTOSC REQUIRED librtosc)
++ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp)
++ include_directories(${RTOSC_INCLUDE_DIR})
++ message(STATUS "Found system provided librtosc and librtosc-cpp...")
++else()
+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
+- "please check file permissions and your network")
++ message(STATUS "RTOSC NOT FOUND")
++ message(STATUS "Attempting to checkout submodule")
++ find_package(Git REQUIRED)
++ execute_process(COMMAND git submodule update --init --recursive)
++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
++ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
++ "please check file permissions and your network")
++ endif()
++ else()
++ message(STATUS "Found Rtosc Submodule...")
+ endif()
+-else()
+- message(STATUS "Found Rtosc Submodule...")
+-endif()
+=20
+-set(RTOSC_NO_INSTALL TRUE)
+-include("rtosc/cmake/ColorMessage.cmake")
+-add_subdirectory(rtosc)
+-include_directories(rtosc/include)
++ set(RTOSC_NO_INSTALL TRUE)
++ include("rtosc/cmake/ColorMessage.cmake")
++ add_subdirectory(rtosc)
++ include_directories(rtosc/include)
++endif()
+=20
+ enable_testing()
+ include(CTestConfig.cmake)
+--- a/src/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -575,13 +575,27 @@
+ set(PTHREAD_LIBRARY pthread)
+ endif()
+=20
+-target_link_libraries(zynaddsubfx_core
+-=09${ZLIB_LIBRARIES}
+-=09${FFTW3F_LIBRARIES}
+-=09${MXML_LIBRARIES}
+-=09${OS_LIBRARIES}
+- ${PTHREAD_LIBRARY}
+- rtosc rtosc-cpp)
++if(ZYN_SYSTEM_RTOSC)
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ ${RTOSC_LIBRARIES}
++ ${RTOSC_CPP_LIBRARIES}
++ )
++else()
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ rtosc
++ rtosc-cpp
++ )
++endif()
+=20
+ if(IwyuErr)
+ message (STATUS "Include what you use: ${IwyuErr}")
+
+
+When ZYN_SYSTEM_RTOSC is ON, port-checker file is not available and the te=
st
+fails.
+
+--- a/src/Tests/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/Tests/CMakeLists.txt=092023-05-04 00:19:01.635383149 +0200
+@@ -65,7 +65,6 @@
+=20
+ if(LIBLO_FOUND)
+ cp_script(check-ports.rb)
+- add_test(PortChecker check-ports.rb)
+ endif()
+ add_executable(save-osc SaveOSC.cpp)
+ target_link_libraries(save-osc
--=20
2.40.1
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 16 Jun 2023 19:04:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 16 15:04:24 2023
Received: from localhost ([127.0.0.1]:50402 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qAEkC-0001pb-2C
for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:04:24 -0400
Received: from mail-4027.protonmail.ch ([185.70.40.27]:57221)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1qAEkA-0001pL-Ai
for 63254 <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:04:23 -0400
Date: Fri, 16 Jun 2023 19:04:08 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1686942255; x=1687201455;
bh=OsHXrAOL3XssnbRgoccHFoDr3BVeijv3o5jkbZU7WYE=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=YdnivLEBYmYUQxGxYsDARMguD7+UIjnBx7qx2DIq01/dcFJ/40VzCGbkVnn9DulOb
Nmj49DuoaVt335ceZQQoERnE9KA8dRKSQhZ0rPzhv4O0G4nUfc+axhVRLJD01ubwuW
kxUmj7GvkS1kaW25eUqpmjh4cBVXrd1yE/F7dUD4Xu5vg/G+RZo0YyDC4kXEEPKUQD
/bWD/p76Bft5or36tRLgwfwPB2HLek04iUzZQxmB6lxomCpDiCYZaIlwZ1ZXHnxzpB
0tAZxT/rSZVWwHCN5Zrxp7vMdWPLH9p1P0f3WSx95O31T2v871azSMy0PQPvjWx7lA
23G3mD2DoEWrA==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v4 4/5] gnu: Add mruby-zest.
Message-ID: <PdMsezxBS6CK8Bj5_rHfvuvIWpgqydjoczbGv3Gf0V-fanwifw5QR7I_9zIrIIQUiN3RXvO_wc3nB6_W4eRsnc9eQxxOyyBQXPehkulzZSI=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mruby-xyz.scm: New file.
* gnu/local.mk: Register the file.
---
gnu/local.mk | 1 +
gnu/packages/mruby-xyz.scm | 176 +++++++++++++++++++++++++++++++++++++
2 files changed, 177 insertions(+)
create mode 100644 gnu/packages/mruby-xyz.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 3f516d395a..1649398f59 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -440,6 +440,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\
%D%/packages/mpd.scm=09=09=09=09\
%D%/packages/mp3.scm=09=09=09=09\
%D%/packages/mpi.scm=09=09=09=09\
+ %D%/packages/mruby-xyz.scm=09=09=09\
%D%/packages/multiprecision.scm=09=09\
%D%/packages/music.scm=09=09=09\
%D%/packages/musl.scm=09=09=09=09\
diff --git a/gnu/packages/mruby-xyz.scm b/gnu/packages/mruby-xyz.scm
new file mode 100644
index 0000000000..5524976dec
--- /dev/null
+++ b/gnu/packages/mruby-xyz.scm
@@ -0,0 +1,176 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2023 <sughosha@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages mruby-xyz)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages fonts)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages libevent)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages xorg))
+
+(define-public mruby-zest
+ (package
+ (name "mruby-zest")
+ (version "3.0.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mruby-zest/mruby-zest-build")
+ (commit version)
+ ;; Cloning recursively for and the required mruby sour=
ces
+ ;; and gems.
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dz4zv1km9805lji2q2qqdd8s8hgfd723dxdzcivbhm612szm1mc"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; This packages contains a custom "pugl". Replacing it wit=
h the
+ ;; system "pugl" fails to build.
+ ;; Delete the bundled "libuv", "nanovg" and "rtosc".
+ '(with-directory-excursion "deps"
+ (for-each delete-file-recursively
+ (list "libuv" "nanovg" "rtosc"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:make-flags
+ #~(list (string-append "CC=3D" #$(cc-for-target))
+ "CONFIG_SHELL=3Dbash")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Do not compile "nanovg" and "libuv" and use the syst=
em
+ ;; provided versions of them.
+ (substitute* "Makefile"
+ (("cd deps/nanovg") "#cd deps/nanovg")
+ (("\\$\\(AR\\) rc deps/libnanovg\\.a")
+ "#$(AR) rc deps/libnanovg.a")
+ (("\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("cd deps/libuv") "#cd deps/libuv")
+ (("\\./deps/libuv/\\.libs/libuv\\.a")
+ "-luv")
+ (("\\./deps/libuv/\\.libs/libuv-win\\.a")
+ "-luv-win"))
+ (substitute* "build_config.rb"
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libuv\\.a")
+ "-luv")
+ (("cc\\.include_paths.*\\./deps/nanovg/.*$")
+ "#")
+ (("cc\\.include_paths.*\\./deps/libuv/.*$")
+ "#"))
+ (substitute* "deps/mruby-nanovg/src/nvg_screenshot.c"
+ (("\\.\\./\\.\\./nanovg/.*/stb_image_write\\.h")
+ (search-input-file inputs "/example/stb_image_write.h=
")))
+ ;; Use the system provided "rtosc" headers.
+ (substitute* "src/mruby-widget-lib/src/gem.c"
+ (("\"\\.\\./\\.\\./\\.\\./deps/.*/rtosc\\.h\"")
+ "<rtosc/rtosc.h>"))
+ ;; Fix missing fonts.
+ (substitute*
+ "src/mruby-widget-lib/mrblib/script.rb"
+ (("sans =3D \\[")
+ (string-append
+ "sans =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Regular.ttf")
+ "\", "))
+ (("bold =3D \\[")
+ (string-append
+ "bold =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Bold.ttf")
+ "\", ")))
+ ;; Fix paths for zyn-fusion files.
+ (substitute* "src/osc-bridge/src/bridge.c"
+ (("fopen\\(\\\"schema/")
+ (string-append
+ "fopen(\"" #$output "/share/zyn-fusion/schema/")))
+ (substitute* "test-libversion.c"
+ (("./libzest.so")
+ (string-append #$output "/lib/libzest.so")))
+ (substitute* "src/mruby-widget-lib/src/api.c"
+ ((", \\\"\\./qml/") ", \"../share/zyn-fusion/qml/")
+ (("\\./qml/")
+ (string-append #$output "/share/zyn-fusion/qml")))))
+ (replace 'install
+ (lambda _
+ (rename-file "zest" "zyn-fusion")
+ (install-file "zyn-fusion" (string-append #$output "/bi=
n"))
+ (install-file "libzest.so" (string-append #$output "/li=
b"))
+ (for-each
+ (lambda (folder)
+ (for-each
+ (lambda (file)
+ (install-file file
+ (string-append #$output "/share/zyn-fusion/qml=
")))
+ (find-files folder "\\.qml$")))
+ '("src/mruby-zest/qml" "src/mruby-zest/example"))
+ (install-file "src/osc-bridge/schema/test.json"
+ (string-append #$output "/share/zyn-fusion/schema"))
+ (install-file "completions/zyn-fusion"
+ (string-append
+ #$output "/share/bash-completion/completions")))))))
+ (native-inputs
+ (list (package-source nanovg) ;for "stb_image_write.h"
+ pkg-config
+ ruby))
+ (inputs
+ (list font-google-roboto
+ libuv
+ libx11
+ mesa
+ ;; With the latest version of "nanovg" the contents are not
+ ;; displayed properly.
+ (let ((version "0")
+ (revision "0")
+ (commit "b83cf926525e7cea8d2483da2a75852b8c7b6d28"))
+ (package (inherit nanovg)
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (sha256
+ (base32
+ "1zp355pw6xnb5mjarz67cxkglv7j1s0qzv705fz1wf0gl0sjhy8f"=
))))))
+ rtosc))
+ (home-page "https://github.com/mruby-zest/mruby-zest-build")
+ (synopsis "Zyn-Fusion user interface")
+ (description
+ "This package provides user interface for Zyn-Fusion.")
+ (license
+ (list license:lgpl2.1))))
--=20
2.40.1
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 16 Jun 2023 19:03:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 16 15:03:54 2023
Received: from localhost ([127.0.0.1]:50396 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qAEji-0001oO-DM
for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:03:54 -0400
Received: from mail-40138.protonmail.ch ([185.70.40.138]:40839)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1qAEjg-0001oA-HD
for 63254 <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:03:53 -0400
Date: Fri, 16 Jun 2023 19:03:43 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1686942226; x=1687201426;
bh=ERLuGL3/FMukCOsXk5Fo+YlFTkle+vNmN0wJsRnnXIc=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=UYRcYSeyvGRTE8vX1n69Ui5jbgs/Cj+vVXbG5a67DUG643is0yfT39a9j3u6GxAsA
l2GPmfybqZ6e/Z1ci+zgEnJMS3Udv4NZFOaRHb6QvUBnDXwkptQQ6Hr4RYO9DFn085
ihNXZcgpNfYnJvYZm0XJJjxv4NT8z6NHvXJ08YXzM7Waud1h4pIfImo+n17RsqfLRL
Nu14XN47xmPFUVhpKeOBYTjXv+l6/qAPS1fULrqDKKUj2Ne2CuUgyUsDRhGOALxoob
/8OCFgKKvG4o3uiyH5An3j8GsQQ4p4EiPr9pq9lBOf6TnusDt5UdLg1ixODhkNt7D8
nT3kyaWA4dqDw==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v4 3/5] gnu: Add rtosc.
Message-ID: <Y2Fd1d3lqhtS0pqLbhOdnAFA5Y6pzjd52tlVz4_FP_Q00NuSnWB3oU_oF6DXrrOaGbAbBxTg3VbjSPUN0jRZwvZ4Vg5CpVgNmy8KsMvuNQY=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/audio.scm (rtosc): New variable.
* gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparision-operator.patch: =
New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/audio.scm | 45 +++++++++++++++++++
....3.1-fix-invalid-comparison-operator.patch | 14 ++++++
3 files changed, 60 insertions(+)
create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison=
-operator.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 3d3e54406b..3f516d395a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1867,6 +1867,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/ripperx-missing-file.patch=09=09\
%D%/packages/patches/rpcbind-CVE-2017-8779.patch=09=09\
%D%/packages/patches/rtags-separate-rct.patch=09=09=09\
+ %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch=
=09\
%D%/packages/patches/racket-chez-scheme-bin-sh.patch=09=09\
%D%/packages/patches/racket-rktio-bin-sh.patch=09=09\
%D%/packages/patches/racket-zuo-bin-sh.patch=09=09=09\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 58a981b2fe..c4c8e702b5 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2806,6 +2806,51 @@ (define-public liblo
implementation of the Open Sound Control (@dfn{OSC}) protocol.")
(license license:lgpl2.1+)))
=20
+(define-public rtosc
+ (package
+ (name "rtosc")
+ (version "0.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fundamental/rtosc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2"))
+ (patches
+ (search-patches
+ "rtosc-0.3.1-fix-invalid-comparison-operator.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list "-DPERF_TEST=3DON"
+ "-DRTOSC_BUILD_SHARED_LIBS=3DON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'build-documentation
+ (lambda _
+ (invoke "make" "rtosc-doc")))
+ (add-after 'install 'install-documentation
+ (lambda _
+ (copy-recursively "html"
+ (string-append #$output:doc
+ "/share/doc/rtosc/html")))))))
+ (native-inputs
+ (list doxygen pkg-config ruby))
+ (inputs
+ (list jack-1
+ liblo
+ libx11
+ mesa))
+ (outputs (list "out" "doc"))
+ (home-page "https://fundamental-code.com/wiki/rtosc/")
+ (synopsis "Realtime Safe OSC packet serialization and dispatch")
+ (description
+ "RtOsc is a realtime safe library for handling OSC messages.")
+ (license license:expat)))
+
(define-public rtaudio
(package
(name "rtaudio")
diff --git a/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operat=
or.patch b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator=
.patch
new file mode 100644
index 0000000000..925e39e9a1
--- /dev/null
+++ b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patc=
h
@@ -0,0 +1,14 @@
+This patch fixes the unknown version comparison operator
+
+diff --git a/librtosc-cpp.pc.cmake b/librtosc-cpp.pc.cmake
+index 0d8fda2..edbcb3a 100644
+--- a/librtosc-cpp.pc.cmake
++++ b/librtosc-cpp.pc.cmake
+@@ -9,6 +9,6 @@ includedir=3D@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: rtosc_cpp
+ Description: rtosc_cpp - a realtime safe open sound control serialization=
and dispatch system for C++
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+-Requires: librtosc =3D=3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
++Requires: librtosc =3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Libs: -L${libdir} -lrtosc -lrtosc-cpp
+ Cflags: -I${includedir}
--=20
2.40.1
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 16 Jun 2023 19:03:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 16 15:03:04 2023
Received: from localhost ([127.0.0.1]:50392 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qAEiu-0001mU-08
for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:03:04 -0400
Received: from mail-40137.protonmail.ch ([185.70.40.137]:42953)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1qAEir-0001lr-2C
for 63254 <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:03:02 -0400
Date: Fri, 16 Jun 2023 19:02:40 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1686942175; x=1687201375;
bh=14V7ZSO0kIDmqTaRDIaNVqc/Miv5ppqINUl+JbaBD4U=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=HS0YiHpp5HFbskc94snaNX/1195eMtZCPzPLDs3MVlgF+8yvEJ2lZw8o3ZfU6QgF7
o8gb/2iFWo5kjH2A5EmUiGdKBJmmZ5R8WIVKpNBghleusfCvz1RfSHsw6FJ0T43+JQ
z2s/GvFGrxf2VkEWx0n/36EcuvtRxUSl4jlAujT0rRdWJiWJ109aL9JrFQZuJRJ7E2
1OimtB6z1phiBwIs8WYlKtbdtcA999VhqpwgyhSOa0S0gtbK2tFB8MHS/cLgw2ulXh
54WSafh/dTL8G5bgZstpGabSUSDMRuUGLJbmQ3aXVUQa74CwIfUwVItnnUUUeucEnx
rXqBCKDWOvM7Q==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v4 2/5] gnu: Add nanovg.
Message-ID: <m-Yujlupi8uWApI9VwLpsTtxDJr_M9UoBCxlAZwbUGHRcA6qyoL0r34dYg9migAh5pBelMOCTYT42CqITNeeoRlVbDm94DDmY3IBiAcw7pA=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (nanovg): New variable.
---
gnu/packages/gl.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d0d48e9fc3..8abe79ed24 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -904,6 +904,52 @@ (define-public glfw
and surfaces, receiving input and events.")
(license license:zlib)))
=20
+(define-public nanovg
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "7544c114e83db7cf67bd1c9e012349b70caacc2f"))
+ (package
+ (name "nanovg")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0n29rxdp20xnvnpsjcmg3v5n6z7ya5ji4qirp18qcyls5xdxdxkc"))=
))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (replace 'build
+ (lambda _
+ (invoke #$(cc-for-target)
+ "../source/src/nanovg.c" "-c" "-fPIC")
+ (invoke #$(cc-for-target)
+ "-shared" "-olibnanovg.so" "nanovg.o")))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib"))
+ (include (string-append #$output
+ "/include")))
+ (install-file "libnanovg.so" lib)
+ (with-directory-excursion "../source"
+ (for-each
+ (lambda (file)
+ (install-file file include))
+ (find-files "src" "nanovg.*\\.h$")))))))))
+ (home-page "https://github.com/memononen/nanovg")
+ (synopsis "2D vector drawing library on top of OpenGL")
+ (description
+ "NanoVG is an antialiased vector graphics rendering library for Ope=
nGL.
+It is aimed for building scalable user interfaces and visualizations.")
+ (license license:zlib))))
+
(define-public nanovg-for-extempore
(let ((version "0.7.1")
(revision "0")
--=20
2.40.1
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 16 Jun 2023 19:02:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 16 15:02:37 2023
Received: from localhost ([127.0.0.1]:50387 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qAEiT-0001lP-Iv
for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:02:37 -0400
Received: from mail-40137.protonmail.ch ([185.70.40.137]:15757)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1qAEiR-0001lB-HO
for 63254 <at> debbugs.gnu.org; Fri, 16 Jun 2023 15:02:36 -0400
Date: Fri, 16 Jun 2023 19:02:07 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1686942148; x=1687201348;
bh=yJWh/LYLxGKpB/0Fz2zTnvpfXZkLaan1ZL2ldEr50a0=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=W+BkCyvkSsVn+e9gRn6Mu7nKVNtQgXhtRptBshy3INRkTN4z7GxjA2Djv3zlgDrBu
SFAFJdvJPYMIlov9uy4Y+YR7AA1qUUWvDZuMZKsehHjDEuP96N69mi2OMH0qH/MFwL
wB29xlMkau6hbl+dXSwEDZZI/nbJ490arnSmgpeqGlf88k4RtK+rapIstKomups0BT
lvFAwmiebv8GsajF48SYIBdQ80X5HXsXAnpTLG0r4gwxArGKi7EKy2BcVU26cCvqgD
yeCfVxXTIOC4SY6MhLRIr6y1JOZoowZNiOMqcIKCBpFunY4JUF4VJGtxQKgapzizs7
oWSUB+FJ+IEcg==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v4 1/5] gnu: Add pugl.
Message-ID: <yVBvSoJMN711u4WBWrHyczyKJUQCxQi38KGjXYlcOLuxSQ6V6D-YYIGeX9jjxXz2rDetPMdw-Ip-3_LjLF5Jxx3hA0gw1uDXPEWBXv3fkPo=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (pugl): New variable.
---
gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 9885bde712..d0d48e9fc3 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -45,6 +45,7 @@ (define-module (gnu packages gl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
@@ -933,6 +934,40 @@ (define-public nanovg-for-extempore
and visualizations.")
(license license:zlib))))
=20
+(define-public pugl
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "9b5a0871c1a8771dbe204e60f437653a67abd42a"))
+ (package
+ (name "pugl")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/lv2/pugl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16gcjz44d27j9ck7frpksy0jqscask2fvln9pb23k6xpq2lky3ar"))
+ (modules '((guix build utils)))
+ ;; Unbundle "sphinxygen".
+ (snippet
+ '(delete-file-recursively "subprojects"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;tests contain manual tests
+ #:configure-flags
+ #~(list "-Ddocs=3Ddisabled"))) ;requires "sphinxygen"
+ (native-inputs (list pkg-config))
+ (inputs (list cairo glu libx11 libxrandr libxcursor libxext mesa))
+ (home-page "http://drobilla.net/software/pugl.html")
+ (synopsis "API for embeddable GUIs")
+ (description
+ "Pugl (PlUgin Graphics Library) is a portability layer for GUIs whi=
ch is
+suitable for use in plugins and applications.")
+ (license license:bsd-0))))
+
(define-public gl2ps
(package
(name "gl2ps")
--=20
2.40.1
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.Received: (at 63254) by debbugs.gnu.org; 16 Jun 2023 18:59:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 16 14:59:33 2023 Received: from localhost ([127.0.0.1]:50382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qAEfV-0001fE-22 for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 14:59:33 -0400 Received: from mail-4318.protonmail.ch ([185.70.43.18]:40385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Sughosha@HIDDEN>) id 1qAEfR-0001ey-8m for 63254 <at> debbugs.gnu.org; Fri, 16 Jun 2023 14:59:31 -0400 Date: Fri, 16 Jun 2023 18:59:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1686941962; x=1687201162; bh=5FEA834naPODuUbR43cPHVUUL6Zm9aK+5nY+mcvjRNE=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=P+PZWuROiikibzIEj7WnBhqrYBN3xjL0AEUG22/yMeo+2VoaEChHhzLpjTPeriXrj LWzNZhW+3rHyaOGz9ufEdYF4ZhezZsDl1prEHly7h0s/VORUAMQl8/9NyuMj2RG+kx yGOC4Y6neV6mpBdvTQLHBJwZj6OGZNznpwoAHRaXeenJhgiYhHsPVb3I6/4cTe/jMd 5RI0ME/aXhU3EXjLWX//YJY302cGEQdzakMaUuJ9C3kIs97Ed/cG/5KFgU2hNorVjz Yp007BJLPc/kVSQ/N12dqN0QYUbUIYElJNpKE7FrkackPvxhnJMfN/DZ9TQlY6HRi8 Q4r+QpKMsMGoQ== To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org> From: Sughosha <Sughosha@HIDDEN> Subject: [PATCH v4 0/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface. Message-ID: <pzsSb_wv2_bA8UacIkmlqyy-r5vGQl0NcslYaVN7CeXCisCJkBW6OpX64eiPUu9Bwx2-xp4QKwjEaIHkVslQYomi-PChS51hgyko0btvPYU=@proton.me> In-Reply-To: <abeUfDh1ukeBZV7Nb3XctwqENL8IkxNa0TTIW_7ZuEc6WKuifLpWO_fmm_SF-rftIZ9M0JkqxPqQagOkCfD5kCaTMcBizZZhhmZsoJPQol4=@proton.me> References: <abeUfDh1ukeBZV7Nb3XctwqENL8IkxNa0TTIW_7ZuEc6WKuifLpWO_fmm_SF-rftIZ9M0JkqxPqQagOkCfD5kCaTMcBizZZhhmZsoJPQol4=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63254 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This series of patches are to switch ZynAddSubFX from NTK interface Zyn-Fus= ion, add native search paths for "LV2_PATH" and "VST2_PATH" variables and fix ho= me page. Sughosha (5): gnu: Add pugl. gnu: Add nanovg. gnu: Add rtosc. gnu: Add mruby-zest. gnu: zynaddsubfx: Switch to Zyn-Fusion interface. gnu/local.mk | 5 +- gnu/packages/audio.scm | 45 +++++ gnu/packages/gl.scm | 81 ++++++++ gnu/packages/mruby-xyz.scm | 176 ++++++++++++++++++ gnu/packages/music.scm | 34 +++- ....3.1-fix-invalid-comparison-operator.patch | 14 ++ .../zynaddsubfx-3.0.6-system-rtosc.patch | 106 +++++++++++ 7 files changed, 456 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/mruby-xyz.scm create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison= -operator.patch create mode 100644 gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.pat= ch base-commit: 8f0698dde351790e0bc9e905e4cd71902fd55d5f --=20 2.40.1
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:38:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:38:55 2023
Received: from localhost ([127.0.0.1]:48528 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puUUJ-00019d-6O
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:38:55 -0400
Received: from mail-4027.protonmail.ch ([185.70.40.27]:11231)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puUUG-00019Q-OE
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:38:53 -0400
Date: Thu, 04 May 2023 08:38:28 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=ktc7imdlyzbpdbecvyh2eor4qq.protonmail; t=1683189526; x=1683448726;
bh=NrhNPXXwpTzm8ENyVvyA9W8ugzPIgNInxvOEYhrDsuk=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=Sy9cwmbdleICL73kuWQEXqCJGxAQFB7gcT5Vj+llJ6q6/cOlbWqFz4J5SnOTv9GFF
+FzrJ1bXO0qtLLXAOEoXFflunsj4yr6g5gF0DRHRPkLDfl/zGv9ROusBz09A2CmnH1
x7dgPLtpJGurvSsbGwhmjMHRMe+VJrOVzTDJMC0mwVquUyXi1TpyJA8v5qdCeDwRZ8
37/hLcxQJeHqMe8PiBRlD3DEYkuFckwxnTg+a/vgStWbEbHgj++6gjAfAc4Eg927pa
+sqMS9O8WmkaG0II4Um2NW1MtWSq3HHFHY7ebzw4YQ77V7E4GjPJ5MxD6ij5L0Q4DL
95FK6skA9JsnQ==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v3 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface.
Message-ID: <abeUfDh1ukeBZV7Nb3XctwqENL8IkxNa0TTIW_7ZuEc6WKuifLpWO_fmm_SF-rftIZ9M0JkqxPqQagOkCfD5kCaTMcBizZZhhmZsoJPQol4=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/music.scm (zynaddsubfx)[source]: Add a patches.
[arguments]: Add configure flags and patch-paths phase.
[inputs]: Remove ntk and add rtosc and mruby-zest.
[home-page]: Change home-page.
* gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch: New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/music.scm | 28 ++++-
.../zynaddsubfx-3.0.6-system-rtosc.patch | 106 ++++++++++++++++++
3 files changed, 130 insertions(+), 5 deletions(-)
create mode 100644 gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.pat=
ch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6f213b2e7f..8a20f54e9f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2072,6 +2072,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/yggdrasil-extra-config.patch=09\
%D%/packages/patches/zig-do-not-link-against-librt.patch=09\
%D%/packages/patches/zig-use-system-paths.patch=09=09\
+ %D%/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch=09\
%D%/packages/patches/zsh-egrep-failing-test.patch
=20
MISC_DISTRO_FILES =3D=09=09=09=09\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 446580dc52..ec19318b6f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -157,6 +157,7 @@ (define-module (gnu packages music)
#:use-module (gnu packages man)
#:use-module (gnu packages mp3)
#:use-module (gnu packages mpd)
+ #:use-module (gnu packages mruby-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages pcre)
@@ -3175,10 +3176,18 @@ (define-public zynaddsubfx
version "/zynaddsubfx-" version ".tar.bz2"))
(sha256
(base32
- "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))))
+ "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))
+ (patches
+ (search-patches
+ "zynaddsubfx-3.0.6-system-rtosc.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
+ `(#:configure-flags `("-DGuiModule=3Dzest"
+ ,(string-append "-DZYN_DATADIR=3D"
+ (assoc-ref %outputs "out")
+ "/share/zynaddsubfx")
+ "-DZYN_SYSTEM_RTOSC=3DON")
+ #:phases
(modify-phases %standard-phases
;; Move SSE compiler optimization flags from generic target to
;; athlon64 and core2 targets, because otherwise the build would =
fail
@@ -3188,10 +3197,19 @@ (define-public zynaddsubfx
(substitute* "src/CMakeLists.txt"
(("-msse -msse2 -mfpmath=3Dsse") "")
(("-march=3D(athlon64|core2)" flag)
- (string-append flag " -msse -msse2 -mfpmath=3Dsse"))))))))
+ (string-append flag " -msse -msse2 -mfpmath=3Dsse")))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/main.cpp"
+ (("\\./zyn-fusion")
+ (search-input-file inputs "/bin/zyn-fusion")))
+ (substitute* "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp"
+ (("\\./libzest\\.so")
+ (search-input-file inputs "/lib/libzest.so"))))))))
(inputs
(list liblo
- ntk
+ rtosc
+ mruby-zest
mesa
alsa-lib
jack-1
@@ -3203,7 +3221,7 @@ (define-public zynaddsubfx
(native-inputs
(list pkg-config
ruby))
- (home-page "https://zynaddsubfx.sf.net/")
+ (home-page "https://zynaddsubfx.sourceforge.io/")
(synopsis "Software synthesizer")
(description
"ZynAddSubFX is a feature heavy realtime software synthesizer. It of=
fers
diff --git a/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch b/gn=
u/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
new file mode 100644
index 0000000000..edf22c389b
--- /dev/null
+++ b/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
@@ -0,0 +1,106 @@
+Adding the option ZYN_SYSTEM_RTOSC to let the use of the system provided R=
tOsc
+instead of using the bundled one.
+
+--- a/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -10,24 +10,34 @@
+ add_definitions(-DZYN_DATADIR=3D"${ZYN_DATADIR}")
+ endif()
+=20
++option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" O=
FF)
++
+ #Include RTOSC
+-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(STATUS "RTOSC NOT FOUND")
+- message(STATUS "Attempting to checkout submodule")
+- find_package(Git REQUIRED)
+- execute_process(COMMAND git submodule update --init --recursive)
++if(ZYN_SYSTEM_RTOSC)
++ include(FindPkgConfig)
++ pkg_check_modules(RTOSC REQUIRED librtosc)
++ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp)
++ include_directories(${RTOSC_INCLUDE_DIR})
++ message(STATUS "Found system provided librtosc and librtosc-cpp...")
++else()
+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
+- "please check file permissions and your network")
++ message(STATUS "RTOSC NOT FOUND")
++ message(STATUS "Attempting to checkout submodule")
++ find_package(Git REQUIRED)
++ execute_process(COMMAND git submodule update --init --recursive)
++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
++ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
++ "please check file permissions and your network")
++ endif()
++ else()
++ message(STATUS "Found Rtosc Submodule...")
+ endif()
+-else()
+- message(STATUS "Found Rtosc Submodule...")
+-endif()
+=20
+-set(RTOSC_NO_INSTALL TRUE)
+-include("rtosc/cmake/ColorMessage.cmake")
+-add_subdirectory(rtosc)
+-include_directories(rtosc/include)
++ set(RTOSC_NO_INSTALL TRUE)
++ include("rtosc/cmake/ColorMessage.cmake")
++ add_subdirectory(rtosc)
++ include_directories(rtosc/include)
++endif()
+=20
+ enable_testing()
+ include(CTestConfig.cmake)
+--- a/src/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -575,13 +575,27 @@
+ set(PTHREAD_LIBRARY pthread)
+ endif()
+=20
+-target_link_libraries(zynaddsubfx_core
+-=09${ZLIB_LIBRARIES}
+-=09${FFTW3F_LIBRARIES}
+-=09${MXML_LIBRARIES}
+-=09${OS_LIBRARIES}
+- ${PTHREAD_LIBRARY}
+- rtosc rtosc-cpp)
++if(ZYN_SYSTEM_RTOSC)
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ ${RTOSC_LIBRARIES}
++ ${RTOSC_CPP_LIBRARIES}
++ )
++else()
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ rtosc
++ rtosc-cpp
++ )
++endif()
+=20
+ if(IwyuErr)
+ message (STATUS "Include what you use: ${IwyuErr}")
+
+
+When ZYN_SYSTEM_RTOSC is ON, port-checker file is not available and the te=
st
+fails.
+
+--- a/src/Tests/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/Tests/CMakeLists.txt=092023-05-04 00:19:01.635383149 +0200
+@@ -65,7 +65,6 @@
+=20
+ if(LIBLO_FOUND)
+ cp_script(check-ports.rb)
+- add_test(PortChecker check-ports.rb)
+ endif()
+ add_executable(save-osc SaveOSC.cpp)
+ target_link_libraries(save-osc
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:38:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:38:04 2023
Received: from localhost ([127.0.0.1]:48524 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puUTT-00018Z-GR
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:38:04 -0400
Received: from mail-40130.protonmail.ch ([185.70.40.130]:59969)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puUTR-00017q-JV
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:38:02 -0400
Date: Thu, 04 May 2023 08:37:50 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683189475; x=1683448675;
bh=tow9qaP45caKeUEOxGNGpx6gTjF4N5MFDOxb3psDPc4=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=iYTCyFtUpBlurPsKRmLCDY2SfTmKWjsaVe/RVM4ASCnZmiuvlem2gEqqr7OXoBWl3
GVrRe1ha3lLpyY7WH2GTOumFWk/KU0i2cnYGN2hWe8MscdOMdyKdNyxYu/Vzfp6Vz1
jsNMf7f/g32YTBMepHhwAjQglQ/rCO8QNEBGh3K7QbX6mKMXETE7WILTjggB2C3sKI
VAetvhOHaplemGq9sGlq/TOTMiUCkpbKdVsZcA3h3BRCOszRDeQsGZWRPUmAlRl7vO
jEfgRQchNtDAoFOC8tQrCl4p+vELFVy7YiblXzbvFhcg30K2RvCq2T8fEPhjea+Khw
c+xkxl5Dq95nA==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v3 4/5] gnu: Add mruby-zest.
Message-ID: <4UQSmfkT8PD3IZFQBYvYwM_cjtjE7zZZ3pvjsbRTsOBm25G-XvEHHZrKG1Z46Ew_dfuhzEl3fvi3kYBnV4U-STg6mwezJv88PkPtIk3fdTc=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mruby-xyz.scm: New file.
* gnu/local.mk: Register the file.
---
gnu/local.mk | 1 +
gnu/packages/mruby-xyz.scm | 176 +++++++++++++++++++++++++++++++++++++
2 files changed, 177 insertions(+)
create mode 100644 gnu/packages/mruby-xyz.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index aa50fc0465..6f213b2e7f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -436,6 +436,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\
%D%/packages/mpd.scm=09=09=09=09\
%D%/packages/mp3.scm=09=09=09=09\
%D%/packages/mpi.scm=09=09=09=09\
+ %D%/packages/mruby-xyz.scm=09=09=09\
%D%/packages/multiprecision.scm=09=09\
%D%/packages/music.scm=09=09=09\
%D%/packages/musl.scm=09=09=09=09\
diff --git a/gnu/packages/mruby-xyz.scm b/gnu/packages/mruby-xyz.scm
new file mode 100644
index 0000000000..5524976dec
--- /dev/null
+++ b/gnu/packages/mruby-xyz.scm
@@ -0,0 +1,176 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2023 <sughosha@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages mruby-xyz)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages fonts)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages libevent)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages xorg))
+
+(define-public mruby-zest
+ (package
+ (name "mruby-zest")
+ (version "3.0.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mruby-zest/mruby-zest-build")
+ (commit version)
+ ;; Cloning recursively for and the required mruby sour=
ces
+ ;; and gems.
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dz4zv1km9805lji2q2qqdd8s8hgfd723dxdzcivbhm612szm1mc"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; This packages contains a custom "pugl". Replacing it wit=
h the
+ ;; system "pugl" fails to build.
+ ;; Delete the bundled "libuv", "nanovg" and "rtosc".
+ '(with-directory-excursion "deps"
+ (for-each delete-file-recursively
+ (list "libuv" "nanovg" "rtosc"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:make-flags
+ #~(list (string-append "CC=3D" #$(cc-for-target))
+ "CONFIG_SHELL=3Dbash")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Do not compile "nanovg" and "libuv" and use the syst=
em
+ ;; provided versions of them.
+ (substitute* "Makefile"
+ (("cd deps/nanovg") "#cd deps/nanovg")
+ (("\\$\\(AR\\) rc deps/libnanovg\\.a")
+ "#$(AR) rc deps/libnanovg.a")
+ (("\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("cd deps/libuv") "#cd deps/libuv")
+ (("\\./deps/libuv/\\.libs/libuv\\.a")
+ "-luv")
+ (("\\./deps/libuv/\\.libs/libuv-win\\.a")
+ "-luv-win"))
+ (substitute* "build_config.rb"
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libuv\\.a")
+ "-luv")
+ (("cc\\.include_paths.*\\./deps/nanovg/.*$")
+ "#")
+ (("cc\\.include_paths.*\\./deps/libuv/.*$")
+ "#"))
+ (substitute* "deps/mruby-nanovg/src/nvg_screenshot.c"
+ (("\\.\\./\\.\\./nanovg/.*/stb_image_write\\.h")
+ (search-input-file inputs "/example/stb_image_write.h=
")))
+ ;; Use the system provided "rtosc" headers.
+ (substitute* "src/mruby-widget-lib/src/gem.c"
+ (("\"\\.\\./\\.\\./\\.\\./deps/.*/rtosc\\.h\"")
+ "<rtosc/rtosc.h>"))
+ ;; Fix missing fonts.
+ (substitute*
+ "src/mruby-widget-lib/mrblib/script.rb"
+ (("sans =3D \\[")
+ (string-append
+ "sans =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Regular.ttf")
+ "\", "))
+ (("bold =3D \\[")
+ (string-append
+ "bold =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Bold.ttf")
+ "\", ")))
+ ;; Fix paths for zyn-fusion files.
+ (substitute* "src/osc-bridge/src/bridge.c"
+ (("fopen\\(\\\"schema/")
+ (string-append
+ "fopen(\"" #$output "/share/zyn-fusion/schema/")))
+ (substitute* "test-libversion.c"
+ (("./libzest.so")
+ (string-append #$output "/lib/libzest.so")))
+ (substitute* "src/mruby-widget-lib/src/api.c"
+ ((", \\\"\\./qml/") ", \"../share/zyn-fusion/qml/")
+ (("\\./qml/")
+ (string-append #$output "/share/zyn-fusion/qml")))))
+ (replace 'install
+ (lambda _
+ (rename-file "zest" "zyn-fusion")
+ (install-file "zyn-fusion" (string-append #$output "/bi=
n"))
+ (install-file "libzest.so" (string-append #$output "/li=
b"))
+ (for-each
+ (lambda (folder)
+ (for-each
+ (lambda (file)
+ (install-file file
+ (string-append #$output "/share/zyn-fusion/qml=
")))
+ (find-files folder "\\.qml$")))
+ '("src/mruby-zest/qml" "src/mruby-zest/example"))
+ (install-file "src/osc-bridge/schema/test.json"
+ (string-append #$output "/share/zyn-fusion/schema"))
+ (install-file "completions/zyn-fusion"
+ (string-append
+ #$output "/share/bash-completion/completions")))))))
+ (native-inputs
+ (list (package-source nanovg) ;for "stb_image_write.h"
+ pkg-config
+ ruby))
+ (inputs
+ (list font-google-roboto
+ libuv
+ libx11
+ mesa
+ ;; With the latest version of "nanovg" the contents are not
+ ;; displayed properly.
+ (let ((version "0")
+ (revision "0")
+ (commit "b83cf926525e7cea8d2483da2a75852b8c7b6d28"))
+ (package (inherit nanovg)
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (sha256
+ (base32
+ "1zp355pw6xnb5mjarz67cxkglv7j1s0qzv705fz1wf0gl0sjhy8f"=
))))))
+ rtosc))
+ (home-page "https://github.com/mruby-zest/mruby-zest-build")
+ (synopsis "Zyn-Fusion user interface")
+ (description
+ "This package provides user interface for Zyn-Fusion.")
+ (license
+ (list license:lgpl2.1))))
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:37:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:37:44 2023
Received: from localhost ([127.0.0.1]:48518 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puUTA-00017Q-0R
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:37:44 -0400
Received: from mail-40140.protonmail.ch ([185.70.40.140]:16485)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puUT7-00017B-8k
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:37:42 -0400
Date: Thu, 04 May 2023 08:37:21 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=74kswdphwbarvcgw3jcdjsefyu.protonmail; t=1683189455; x=1683448655;
bh=p8kWTAhFvPzCBKGo35ipKRI3qMskVRBxKtby+xoQjwg=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=nUzJJYw7NF8ajymSgcBBCGuDnbGCHqLqJNC61CbbEedf/qS7DHx3eiurUSMpCtpHo
zSvqTpbfasPtKn24lCindcdzzWkVBfmPzwfQxUVddySNrdtosmYSWltL1ZAMS8cXD7
jwD19WugdPb/PqHJZweW1qE69xT4qg99fMb40aoNuzSoE4Dn39iALdt6shRTiFLXSe
DTjX4nOmMewEoPfvUZjVb7U/ED7SCE839eIX0WTufco+kMdajVOEa8FPGQgKYmHjNm
Zec6JhXvP8rZaP3WLXkkanOVRcIH18THv+o/NzSO2B0j5H9jeWliQNVTce3DqVfjw4
IclpYuLXzVw9Q==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v3 3/5] gnu: Add rtosc.
Message-ID: <Pg6QY-F4_2N7-qf_fWyOi6ZJgAMFrDCd4Eu3VMSndMZSpOZ7RhDaIW7wfbdjJ2zxNtGq_FrHypVHbwWfNsNZYfFeb9o-yq9cDiPljxiJEZo=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/audio.scm (rtosc): New variable.
* gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparision-operator.patch: =
New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/audio.scm | 45 +++++++++++++++++++
....3.1-fix-invalid-comparison-operator.patch | 14 ++++++
3 files changed, 60 insertions(+)
create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison=
-operator.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 68a02d10b5..aa50fc0465 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1842,6 +1842,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/ripperx-missing-file.patch=09=09\
%D%/packages/patches/rpcbind-CVE-2017-8779.patch=09=09\
%D%/packages/patches/rtags-separate-rct.patch=09=09=09\
+ %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch=
=09\
%D%/packages/patches/racket-chez-scheme-bin-sh.patch=09=09\
%D%/packages/patches/racket-rktio-bin-sh.patch=09=09\
%D%/packages/patches/racket-zuo-bin-sh.patch=09=09=09\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 109133ba8e..236fc84077 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2806,6 +2806,51 @@ (define-public liblo
implementation of the Open Sound Control (@dfn{OSC}) protocol.")
(license license:lgpl2.1+)))
=20
+(define-public rtosc
+ (package
+ (name "rtosc")
+ (version "0.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fundamental/rtosc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2"))
+ (patches
+ (search-patches
+ "rtosc-0.3.1-fix-invalid-comparison-operator.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list "-DPERF_TEST=3DON"
+ "-DRTOSC_BUILD_SHARED_LIBS=3DON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'build-documentation
+ (lambda _
+ (invoke "make" "rtosc-doc")))
+ (add-after 'install 'install-documentation
+ (lambda _
+ (copy-recursively "html"
+ (string-append #$output:doc
+ "/share/doc/rtosc/html")))))))
+ (native-inputs
+ (list doxygen pkg-config ruby))
+ (inputs
+ (list jack-1
+ liblo
+ libx11
+ mesa))
+ (outputs (list "out" "doc"))
+ (home-page "https://fundamental-code.com/wiki/rtosc/")
+ (synopsis "Realtime Safe OSC packet serialization and dispatch")
+ (description
+ "RtOsc is a realtime safe library for handling OSC messages.")
+ (license license:expat)))
+
(define-public rtaudio
(package
(name "rtaudio")
diff --git a/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operat=
or.patch b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator=
.patch
new file mode 100644
index 0000000000..925e39e9a1
--- /dev/null
+++ b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patc=
h
@@ -0,0 +1,14 @@
+This patch fixes the unknown version comparison operator
+
+diff --git a/librtosc-cpp.pc.cmake b/librtosc-cpp.pc.cmake
+index 0d8fda2..edbcb3a 100644
+--- a/librtosc-cpp.pc.cmake
++++ b/librtosc-cpp.pc.cmake
+@@ -9,6 +9,6 @@ includedir=3D@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: rtosc_cpp
+ Description: rtosc_cpp - a realtime safe open sound control serialization=
and dispatch system for C++
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+-Requires: librtosc =3D=3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
++Requires: librtosc =3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Libs: -L${libdir} -lrtosc -lrtosc-cpp
+ Cflags: -I${includedir}
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:37:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:37:27 2023
Received: from localhost ([127.0.0.1]:48514 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puUSs-00016u-L2
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:37:26 -0400
Received: from mail-4027.protonmail.ch ([185.70.40.27]:22717)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puUSq-00016d-Aq
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:37:25 -0400
Date: Thu, 04 May 2023 08:37:01 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=nzph4r4okjboncjy5dggjuiedy.protonmail; t=1683189437; x=1683448637;
bh=/lVOumJgTxF6WAjZ6tJG2e4uhf+Q/F+c+k1qWSvHbTg=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=Ev4ckt+M23JDefmw3qjWSOOZbTEeop8Rti+mDtb/RSfQ9iMo4TtMudCDY/PXKC3dC
T+Z/FgrL9ZHCnqThLpbUdMfISvOeKhCzBafdMmAE9gIt+UnZRLCBz2n6JIdtVEN5P5
lvEsH9jOequel8k0GQha4KPLr2jjUCOFH9gRxstlhCXsO/IriPcXmpDpSGHOGoTYef
bLnbS2eTSN2BYO7cxQW1cC42CWkFl/Jd7lpW6MBvdpO7fWRKfNoe6578xCOVLXUp5u
qGoha5dhTqT5CCOj0dcHz4E5JNdlh4eCF3CbKUe6zuahUd7f661jJ1ZxaPsdRj6Ry/
UlNrK184h35RQ==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v3 2/5] gnu: Add nanovg.
Message-ID: <l9rzpOJnonEbGnFJpBYowIbkuqIeYUVjKhhI2OR59TjU0AootGvIB8zrST-1w4sPhCXjks0j0M07hiOoastXeLiEN0iZAwdyyiMbLtjfcxU=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (nanovg): New variable.
---
gnu/packages/gl.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e59d051f2e..b67215b406 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -893,6 +893,52 @@ (define-public glfw
and surfaces, receiving input and events.")
(license license:zlib)))
=20
+(define-public nanovg
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "7544c114e83db7cf67bd1c9e012349b70caacc2f"))
+ (package
+ (name "nanovg")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0n29rxdp20xnvnpsjcmg3v5n6z7ya5ji4qirp18qcyls5xdxdxkc"))=
))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (replace 'build
+ (lambda _
+ (invoke #$(cc-for-target)
+ "../source/src/nanovg.c" "-c" "-fPIC")
+ (invoke #$(cc-for-target)
+ "-shared" "-olibnanovg.so" "nanovg.o")))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib"))
+ (include (string-append #$output
+ "/include")))
+ (install-file "libnanovg.so" lib)
+ (with-directory-excursion "../source"
+ (for-each
+ (lambda (file)
+ (install-file file include))
+ (find-files "src" "nanovg.*\\.h$")))))))))
+ (home-page "https://github.com/memononen/nanovg")
+ (synopsis "2D vector drawing library on top of OpenGL")
+ (description
+ "NanoVG is an antialiased vector graphics rendering library for Ope=
nGL.
+It is aimed for building scalable user interfaces and visualizations.")
+ (license license:zlib))))
+
(define-public nanovg-for-extempore
(let ((version "0.7.1")
(revision "0")
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:36:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:36:24 2023
Received: from localhost ([127.0.0.1]:48506 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puURs-00014y-4i
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:36:24 -0400
Received: from mail-4325.protonmail.ch ([185.70.43.25]:32463)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puURp-00014b-Sj
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:36:23 -0400
Date: Thu, 04 May 2023 08:36:13 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683189376; x=1683448576;
bh=pAWKlZW4pDPYFfO4g0rK7sg9hsfkb4sVM7XrssgZmK0=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=gEDu3jQOL/V6tE1XUfSslKOYafwEuhVZvwOhz4NRFwGzSiF32liSPK94Cf/dX/3cu
7kC1YBXlKk7jUzI2/KHczZGFyNnFFtZs9kzlEnhqt9+B2D1yPpS6UQZiGlGPdfD/zD
tRzZVW7QlY62eR61G7hPJ2zW0hljq5AGxv3r1vjxpOH23nt0TFmoWdHI6ZCNCSlEEs
IVzCiYOwU9RbVQq39gcBaPhddFe8PjY96IHFELboZ7YhPvZPOiK5PJuHQNtqsxWXfC
J4kyiOLrwQFkfjCKzvI2q1FWIH/NHNATucQWkxuWQ2NcEPHg0FTEpl44VCS0J2w00p
rqGP2oPiyglfA==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v3 1/5] gnu: Add pugl.
Message-ID: <nEzlggnbkyGoaghPo7t2ok_3D1gYAiLh3n8L2khjGTecVXvhCnE8h3bji1EptoRx19KHduP6YhmaAfPGwsEJzwXHgsGUyoFliM0vLSrvCR0=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (pugl): New variable.
---
gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 3a63d70c7a..e59d051f2e 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages gl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
@@ -922,6 +923,40 @@ (define-public nanovg-for-extempore
and visualizations.")
(license license:zlib))))
=20
+(define-public pugl
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "9b5a0871c1a8771dbe204e60f437653a67abd42a"))
+ (package
+ (name "pugl")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/lv2/pugl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16gcjz44d27j9ck7frpksy0jqscask2fvln9pb23k6xpq2lky3ar"))
+ (modules '((guix build utils)))
+ ;; Unbundle "sphinxygen".
+ (snippet
+ '(delete-file-recursively "subprojects"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;tests contain manual tests
+ #:configure-flags
+ #~(list "-Ddocs=3Ddisabled"))) ;requires "sphinxygen"
+ (native-inputs (list pkg-config))
+ (inputs (list cairo glu libx11 libxrandr libxcursor libxext mesa))
+ (home-page "http://drobilla.net/software/pugl.html")
+ (synopsis "API for embeddable GUIs")
+ (description
+ "Pugl (PlUgin Graphics Library) is a portability layer for GUIs whi=
ch is
+suitable for use in plugins and applications.")
+ (license license:bsd-0))))
+
(define-public gl2ps
(package
(name "gl2ps")
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:36:07 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:36:07 2023 Received: from localhost ([127.0.0.1]:48496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1puURa-00014D-V8 for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:36:07 -0400 Received: from mail-4319.protonmail.ch ([185.70.43.19]:51387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Sughosha@HIDDEN>) id 1puURU-00013d-2F for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:36:05 -0400 Date: Thu, 04 May 2023 08:35:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1683189353; x=1683448553; bh=tAmXyLCUhz09lr9voJqH7xIEolH8GLuGR9/lo21l+DM=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=NBjRpmxbmd/8FjvBYevUAW67fgRE8c9l4lSF/vsdAvZdnUXVuLwIyynBWsLKQo8io rbTyogKDKllSPi0fLQKjaDTWVOY5TYmAd0VzR49n0AbeuFTsDiydwWpSg7LQY+UMHw N9a83uROnJbLLaijlimwSXQw1ZIkYfWYLpNUW3PiGSPUg1voq7gtBcRTNkeY/gIeoF 1HfgksZQj+4MIY5AFV6by35nRjp2TvunELjXcIHpFqmOqADlR9UCWXaZihaJbVjzgs a7DueJiHcRCq5oiJqxo6n+QT08SzFmM0UQdY0e/K97MBTY8BaJxKFp+3MO4U87UtIQ 7deC9e3x3z13A== To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org> From: Sughosha <Sughosha@HIDDEN> Subject: [PATCH v3 0/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface. Message-ID: <yTpMocBdVzTVrNrJ_iRNvISoSnCwxz9bFsI5kr47_C1-wNEq2KE4lcbeBKLEM787jxRvmVohbv5lsfxzONejxhxt7zQqPxVldEqLRs5DIDk=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 63254 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) In "version" of "nanovg" in the inputs of "mruby-zest", "(package-version nanovg)" is changed to the independent "version" which is "0".
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:09:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:09:04 2023
Received: from localhost ([127.0.0.1]:48442 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puU1P-0000Mr-UI
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:09:04 -0400
Received: from mail-4318.protonmail.ch ([185.70.43.18]:34885)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puU1N-0000MG-DL
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:09:02 -0400
Date: Thu, 04 May 2023 08:08:40 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683187735; x=1683446935;
bh=NrhNPXXwpTzm8ENyVvyA9W8ugzPIgNInxvOEYhrDsuk=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=Ap5jLtA/Pg4xbmotE5LpuTf//TKdS5aiwnElHcEMDVL+UCA9Q1nLjVFEk0Z8k3/bm
Lcu5yoh3uk9YYr9ziPTf+ZmkoCFweoHpcr2W+oRxt8g4cPjcp4GQZ2fK73n37TEtZj
JEsuswarXOXh1byfyRIG5dJ4vyodvIEF+lPBaWQm5FLNwIgdiTbB4E+IMxtncPRKnQ
ESj+8qWPpTo3zPbYUXgqvBg3ze90+AF6hsYJWDWtKnP/+rsYtfysAB7P3LX9jVczuT
xKI2bXukjM7NWlwYF5fkMVmwvMO6Bacff1juCStw8cVNA4ecaHGJ3b/ROmraTzJOVj
B7qAbsdmRMF5A==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v2 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface.
Message-ID: <-2siIY5xXyaTI0gYpFtMUsLXMaoxvyvIsF1dJnSezYdvH455hqiujH284uNEX17tHD3mHoMGwoGNiov6DJjVZF83T_QBzBVzqHoDORqAt-E=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/music.scm (zynaddsubfx)[source]: Add a patches.
[arguments]: Add configure flags and patch-paths phase.
[inputs]: Remove ntk and add rtosc and mruby-zest.
[home-page]: Change home-page.
* gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch: New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/music.scm | 28 ++++-
.../zynaddsubfx-3.0.6-system-rtosc.patch | 106 ++++++++++++++++++
3 files changed, 130 insertions(+), 5 deletions(-)
create mode 100644 gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.pat=
ch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6f213b2e7f..8a20f54e9f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2072,6 +2072,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/yggdrasil-extra-config.patch=09\
%D%/packages/patches/zig-do-not-link-against-librt.patch=09\
%D%/packages/patches/zig-use-system-paths.patch=09=09\
+ %D%/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch=09\
%D%/packages/patches/zsh-egrep-failing-test.patch
=20
MISC_DISTRO_FILES =3D=09=09=09=09\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 446580dc52..ec19318b6f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -157,6 +157,7 @@ (define-module (gnu packages music)
#:use-module (gnu packages man)
#:use-module (gnu packages mp3)
#:use-module (gnu packages mpd)
+ #:use-module (gnu packages mruby-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages pcre)
@@ -3175,10 +3176,18 @@ (define-public zynaddsubfx
version "/zynaddsubfx-" version ".tar.bz2"))
(sha256
(base32
- "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))))
+ "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))
+ (patches
+ (search-patches
+ "zynaddsubfx-3.0.6-system-rtosc.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
+ `(#:configure-flags `("-DGuiModule=3Dzest"
+ ,(string-append "-DZYN_DATADIR=3D"
+ (assoc-ref %outputs "out")
+ "/share/zynaddsubfx")
+ "-DZYN_SYSTEM_RTOSC=3DON")
+ #:phases
(modify-phases %standard-phases
;; Move SSE compiler optimization flags from generic target to
;; athlon64 and core2 targets, because otherwise the build would =
fail
@@ -3188,10 +3197,19 @@ (define-public zynaddsubfx
(substitute* "src/CMakeLists.txt"
(("-msse -msse2 -mfpmath=3Dsse") "")
(("-march=3D(athlon64|core2)" flag)
- (string-append flag " -msse -msse2 -mfpmath=3Dsse"))))))))
+ (string-append flag " -msse -msse2 -mfpmath=3Dsse")))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/main.cpp"
+ (("\\./zyn-fusion")
+ (search-input-file inputs "/bin/zyn-fusion")))
+ (substitute* "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp"
+ (("\\./libzest\\.so")
+ (search-input-file inputs "/lib/libzest.so"))))))))
(inputs
(list liblo
- ntk
+ rtosc
+ mruby-zest
mesa
alsa-lib
jack-1
@@ -3203,7 +3221,7 @@ (define-public zynaddsubfx
(native-inputs
(list pkg-config
ruby))
- (home-page "https://zynaddsubfx.sf.net/")
+ (home-page "https://zynaddsubfx.sourceforge.io/")
(synopsis "Software synthesizer")
(description
"ZynAddSubFX is a feature heavy realtime software synthesizer. It of=
fers
diff --git a/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch b/gn=
u/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
new file mode 100644
index 0000000000..edf22c389b
--- /dev/null
+++ b/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
@@ -0,0 +1,106 @@
+Adding the option ZYN_SYSTEM_RTOSC to let the use of the system provided R=
tOsc
+instead of using the bundled one.
+
+--- a/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -10,24 +10,34 @@
+ add_definitions(-DZYN_DATADIR=3D"${ZYN_DATADIR}")
+ endif()
+=20
++option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" O=
FF)
++
+ #Include RTOSC
+-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(STATUS "RTOSC NOT FOUND")
+- message(STATUS "Attempting to checkout submodule")
+- find_package(Git REQUIRED)
+- execute_process(COMMAND git submodule update --init --recursive)
++if(ZYN_SYSTEM_RTOSC)
++ include(FindPkgConfig)
++ pkg_check_modules(RTOSC REQUIRED librtosc)
++ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp)
++ include_directories(${RTOSC_INCLUDE_DIR})
++ message(STATUS "Found system provided librtosc and librtosc-cpp...")
++else()
+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
+- "please check file permissions and your network")
++ message(STATUS "RTOSC NOT FOUND")
++ message(STATUS "Attempting to checkout submodule")
++ find_package(Git REQUIRED)
++ execute_process(COMMAND git submodule update --init --recursive)
++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
++ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
++ "please check file permissions and your network")
++ endif()
++ else()
++ message(STATUS "Found Rtosc Submodule...")
+ endif()
+-else()
+- message(STATUS "Found Rtosc Submodule...")
+-endif()
+=20
+-set(RTOSC_NO_INSTALL TRUE)
+-include("rtosc/cmake/ColorMessage.cmake")
+-add_subdirectory(rtosc)
+-include_directories(rtosc/include)
++ set(RTOSC_NO_INSTALL TRUE)
++ include("rtosc/cmake/ColorMessage.cmake")
++ add_subdirectory(rtosc)
++ include_directories(rtosc/include)
++endif()
+=20
+ enable_testing()
+ include(CTestConfig.cmake)
+--- a/src/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -575,13 +575,27 @@
+ set(PTHREAD_LIBRARY pthread)
+ endif()
+=20
+-target_link_libraries(zynaddsubfx_core
+-=09${ZLIB_LIBRARIES}
+-=09${FFTW3F_LIBRARIES}
+-=09${MXML_LIBRARIES}
+-=09${OS_LIBRARIES}
+- ${PTHREAD_LIBRARY}
+- rtosc rtosc-cpp)
++if(ZYN_SYSTEM_RTOSC)
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ ${RTOSC_LIBRARIES}
++ ${RTOSC_CPP_LIBRARIES}
++ )
++else()
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ rtosc
++ rtosc-cpp
++ )
++endif()
+=20
+ if(IwyuErr)
+ message (STATUS "Include what you use: ${IwyuErr}")
+
+
+When ZYN_SYSTEM_RTOSC is ON, port-checker file is not available and the te=
st
+fails.
+
+--- a/src/Tests/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/Tests/CMakeLists.txt=092023-05-04 00:19:01.635383149 +0200
+@@ -65,7 +65,6 @@
+=20
+ if(LIBLO_FOUND)
+ cp_script(check-ports.rb)
+- add_test(PortChecker check-ports.rb)
+ endif()
+ add_executable(save-osc SaveOSC.cpp)
+ target_link_libraries(save-osc
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:08:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:08:06 2023
Received: from localhost ([127.0.0.1]:48436 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puU0U-0000L7-7Y
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:08:06 -0400
Received: from mail-4325.protonmail.ch ([185.70.43.25]:64111)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puU0S-0000Ju-DP
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:08:05 -0400
Date: Thu, 04 May 2023 08:07:54 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683187678; x=1683446878;
bh=1vxv588CCvi6ue6pVBZjg+1by+beECDT1huYN4iCWDY=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=R7U1N4B7oZcHUVT4CCLEPqvcOL+yY1rWYxsa7QbVC0MiqNqV22ucCDNVBrcIIudql
Y2s7yKJZ5PXIU2OMZpyFAcMRgjGykhG/x5YOQ8LPWYUrEPc7BNjtP4JveyUMXs5udy
8dh7uiHGC5jnUFsgkmZM70vUaotPDyVV9POQzAMgVaLbSad4xQ2kBMkxTQNxqf60rO
ZV7Pn9GQPN79dN5AiWXblbbnxKR8/hFY9Ukf6spZhsLZqmHXp+hbiqG4snCCTH46Fb
A6BWpFE4eBI9c/SBBWWK4871ceXXo9BhOybAvXpzxnhyyoa8gpNHnJtpMdGtlnx17E
S85KJnaFO9YSg==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v2 4/5] gnu: Add mruby-zest.
Message-ID: <JNKsik-iBd80vl-f1Y5XQsXUC4lRwQ7XlCpK0KZ4u_Orkd0oMm5DG-EJBBArDue3vTRfL5dxihkZbHq72aft5tKXaI_hI1BK1UeG6MVUbrI=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mruby-xyz.scm: New file.
* gnu/local.mk: Register the file.
---
gnu/local.mk | 1 +
gnu/packages/mruby-xyz.scm | 175 +++++++++++++++++++++++++++++++++++++
2 files changed, 176 insertions(+)
create mode 100644 gnu/packages/mruby-xyz.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index aa50fc0465..6f213b2e7f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -436,6 +436,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\
%D%/packages/mpd.scm=09=09=09=09\
%D%/packages/mp3.scm=09=09=09=09\
%D%/packages/mpi.scm=09=09=09=09\
+ %D%/packages/mruby-xyz.scm=09=09=09\
%D%/packages/multiprecision.scm=09=09\
%D%/packages/music.scm=09=09=09\
%D%/packages/musl.scm=09=09=09=09\
diff --git a/gnu/packages/mruby-xyz.scm b/gnu/packages/mruby-xyz.scm
new file mode 100644
index 0000000000..9c4a1746f3
--- /dev/null
+++ b/gnu/packages/mruby-xyz.scm
@@ -0,0 +1,175 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2023 <sughosha@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages mruby-xyz)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages fonts)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages libevent)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages xorg))
+
+(define-public mruby-zest
+ (package
+ (name "mruby-zest")
+ (version "3.0.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mruby-zest/mruby-zest-build")
+ (commit version)
+ ;; Cloning recursively for and the required mruby sour=
ces
+ ;; and gems.
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dz4zv1km9805lji2q2qqdd8s8hgfd723dxdzcivbhm612szm1mc"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; This packages contains a custom "pugl". Replacing it wit=
h the
+ ;; system "pugl" fails to build.
+ ;; Delete the bundled "libuv", "nanovg" and "rtosc".
+ '(with-directory-excursion "deps"
+ (for-each delete-file-recursively
+ (list "libuv" "nanovg" "rtosc"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:make-flags
+ #~(list (string-append "CC=3D" #$(cc-for-target))
+ "CONFIG_SHELL=3Dbash")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Do not compile "nanovg" and "libuv" and use the syst=
em
+ ;; provided versions of them.
+ (substitute* "Makefile"
+ (("cd deps/nanovg") "#cd deps/nanovg")
+ (("\\$\\(AR\\) rc deps/libnanovg\\.a")
+ "#$(AR) rc deps/libnanovg.a")
+ (("\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("cd deps/libuv") "#cd deps/libuv")
+ (("\\./deps/libuv/\\.libs/libuv\\.a")
+ "-luv")
+ (("\\./deps/libuv/\\.libs/libuv-win\\.a")
+ "-luv-win"))
+ (substitute* "build_config.rb"
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libuv\\.a")
+ "-luv")
+ (("cc\\.include_paths.*\\./deps/nanovg/.*$")
+ "#")
+ (("cc\\.include_paths.*\\./deps/libuv/.*$")
+ "#"))
+ (substitute* "deps/mruby-nanovg/src/nvg_screenshot.c"
+ (("\\.\\./\\.\\./nanovg/.*/stb_image_write\\.h")
+ (search-input-file inputs "/example/stb_image_write.h=
")))
+ ;; Use the system provided "rtosc" headers.
+ (substitute* "src/mruby-widget-lib/src/gem.c"
+ (("\"\\.\\./\\.\\./\\.\\./deps/.*/rtosc\\.h\"")
+ "<rtosc/rtosc.h>"))
+ ;; Fix missing fonts.
+ (substitute*
+ "src/mruby-widget-lib/mrblib/script.rb"
+ (("sans =3D \\[")
+ (string-append
+ "sans =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Regular.ttf")
+ "\", "))
+ (("bold =3D \\[")
+ (string-append
+ "bold =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Bold.ttf")
+ "\", ")))
+ ;; Fix paths for zyn-fusion files.
+ (substitute* "src/osc-bridge/src/bridge.c"
+ (("fopen\\(\\\"schema/")
+ (string-append
+ "fopen(\"" #$output "/share/zyn-fusion/schema/")))
+ (substitute* "test-libversion.c"
+ (("./libzest.so")
+ (string-append #$output "/lib/libzest.so")))
+ (substitute* "src/mruby-widget-lib/src/api.c"
+ ((", \\\"\\./qml/") ", \"../share/zyn-fusion/qml/")
+ (("\\./qml/")
+ (string-append #$output "/share/zyn-fusion/qml")))))
+ (replace 'install
+ (lambda _
+ (rename-file "zest" "zyn-fusion")
+ (install-file "zyn-fusion" (string-append #$output "/bi=
n"))
+ (install-file "libzest.so" (string-append #$output "/li=
b"))
+ (for-each
+ (lambda (folder)
+ (for-each
+ (lambda (file)
+ (install-file file
+ (string-append #$output "/share/zyn-fusion/qml=
")))
+ (find-files folder "\\.qml$")))
+ '("src/mruby-zest/qml" "src/mruby-zest/example"))
+ (install-file "src/osc-bridge/schema/test.json"
+ (string-append #$output "/share/zyn-fusion/schema"))
+ (install-file "completions/zyn-fusion"
+ (string-append
+ #$output "/share/bash-completion/completions")))))))
+ (native-inputs
+ (list (package-source nanovg) ;for "stb_image_write.h"
+ pkg-config
+ ruby))
+ (inputs
+ (list font-google-roboto
+ libuv
+ libx11
+ mesa
+ ;; With the latest version of "nanovg" the contents are not
+ ;; displayed properly.
+ (let ((revision "0")
+ (commit "b83cf926525e7cea8d2483da2a75852b8c7b6d28"))
+ (package (inherit nanovg)
+ (version (git-version (package-version nanovg) revision com=
mit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (sha256
+ (base32
+ "1zp355pw6xnb5mjarz67cxkglv7j1s0qzv705fz1wf0gl0sjhy8f"=
))))))
+ rtosc))
+ (home-page "https://github.com/mruby-zest/mruby-zest-build")
+ (synopsis "Zyn-Fusion user interface")
+ (description
+ "This package provides user interface for Zyn-Fusion.")
+ (license
+ (list license:lgpl2.1))))
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:07:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:07:29 2023
Received: from localhost ([127.0.0.1]:48422 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puTzt-0000Ix-Az
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:07:29 -0400
Received: from mail-4027.protonmail.ch ([185.70.40.27]:45255)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puTzr-0000Ij-Nz
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:07:28 -0400
Date: Thu, 04 May 2023 08:07:15 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683187641; x=1683446841;
bh=p8kWTAhFvPzCBKGo35ipKRI3qMskVRBxKtby+xoQjwg=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=RPXVMg6CtUcrd7nB4X1sAms3nKjOoXE9S13+HH7IB5tcravfJUJZoWpfpesj6EYHD
mDYIkb4yq3c9LZye+j5P9xP+VPZ7EvuHifvZTPC1G4AXXOyvSNGvLUqjuKjGvlee7A
tupbRnplAErvi+2Otu82vvh8ANrJgsimb/w6NruRwXiQ5Afaq/mlRKr+iG10V8pD2t
pgnwp/4cwm2u6w+w4CeLf8Ag2uWifVeA1lz5Scpw4LdYRN4WwUGr5+Gla3hP1O39sW
W8S5Xh+5guKpPXVx1KDESVH1UttmlZ7YHYOEVumMH2JKUUCabOGg2CxFxKs4p4Bwwm
yvzJ2G7Wmi/4w==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v2 3/5] gnu: Add rtosc.
Message-ID: <Kj2DEVEDXzPCEgC2vAZGdEZI_n02lauL1fhNeg0CUuSI5IsYtWfHK3L1AyqNVJ-TBl2JfLAqvRZPksVpeu4xU17MeykH_d97S4JxFByIk5c=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/audio.scm (rtosc): New variable.
* gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparision-operator.patch: =
New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/audio.scm | 45 +++++++++++++++++++
....3.1-fix-invalid-comparison-operator.patch | 14 ++++++
3 files changed, 60 insertions(+)
create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison=
-operator.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 68a02d10b5..aa50fc0465 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1842,6 +1842,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/ripperx-missing-file.patch=09=09\
%D%/packages/patches/rpcbind-CVE-2017-8779.patch=09=09\
%D%/packages/patches/rtags-separate-rct.patch=09=09=09\
+ %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch=
=09\
%D%/packages/patches/racket-chez-scheme-bin-sh.patch=09=09\
%D%/packages/patches/racket-rktio-bin-sh.patch=09=09\
%D%/packages/patches/racket-zuo-bin-sh.patch=09=09=09\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 109133ba8e..236fc84077 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2806,6 +2806,51 @@ (define-public liblo
implementation of the Open Sound Control (@dfn{OSC}) protocol.")
(license license:lgpl2.1+)))
=20
+(define-public rtosc
+ (package
+ (name "rtosc")
+ (version "0.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fundamental/rtosc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2"))
+ (patches
+ (search-patches
+ "rtosc-0.3.1-fix-invalid-comparison-operator.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list "-DPERF_TEST=3DON"
+ "-DRTOSC_BUILD_SHARED_LIBS=3DON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'build-documentation
+ (lambda _
+ (invoke "make" "rtosc-doc")))
+ (add-after 'install 'install-documentation
+ (lambda _
+ (copy-recursively "html"
+ (string-append #$output:doc
+ "/share/doc/rtosc/html")))))))
+ (native-inputs
+ (list doxygen pkg-config ruby))
+ (inputs
+ (list jack-1
+ liblo
+ libx11
+ mesa))
+ (outputs (list "out" "doc"))
+ (home-page "https://fundamental-code.com/wiki/rtosc/")
+ (synopsis "Realtime Safe OSC packet serialization and dispatch")
+ (description
+ "RtOsc is a realtime safe library for handling OSC messages.")
+ (license license:expat)))
+
(define-public rtaudio
(package
(name "rtaudio")
diff --git a/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operat=
or.patch b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator=
.patch
new file mode 100644
index 0000000000..925e39e9a1
--- /dev/null
+++ b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patc=
h
@@ -0,0 +1,14 @@
+This patch fixes the unknown version comparison operator
+
+diff --git a/librtosc-cpp.pc.cmake b/librtosc-cpp.pc.cmake
+index 0d8fda2..edbcb3a 100644
+--- a/librtosc-cpp.pc.cmake
++++ b/librtosc-cpp.pc.cmake
+@@ -9,6 +9,6 @@ includedir=3D@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: rtosc_cpp
+ Description: rtosc_cpp - a realtime safe open sound control serialization=
and dispatch system for C++
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+-Requires: librtosc =3D=3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
++Requires: librtosc =3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Libs: -L${libdir} -lrtosc -lrtosc-cpp
+ Cflags: -I${includedir}
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:07:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:07:06 2023
Received: from localhost ([127.0.0.1]:48418 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puTzV-0000IL-Vu
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:07:06 -0400
Received: from mail-4318.protonmail.ch ([185.70.43.18]:12597)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puTzS-0000Hf-MF
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:07:04 -0400
Date: Thu, 04 May 2023 08:06:36 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=7ugxoxrqmfb5bpqbrppkepv5w4.protonmail; t=1683187616; x=1683446816;
bh=/lVOumJgTxF6WAjZ6tJG2e4uhf+Q/F+c+k1qWSvHbTg=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=WtAIjqwO5/SEW+FZC6jfzX8Y7l99e2nbLvHq++kp+9HJBeBnTFhGBCFwFQHvzM9rb
QOGgQhKwIgrDVXTaabXvhyKSuKBDWZr+9f6Wqd0TsRIMrFy+e87F3QNnemY2fP1kBB
I9ljkXD4bzfHlCr3Zfl8w1uj7+WQKuYMI+HAGCWMC4evZ8CwMnanuWLTzVP0UBWqfK
hfP60EqNziBguO51wwxAmJIlhW4MupS6fyXd0/dLQB7Zj1KAxT75rFXxtKrn9ZCZAR
ol1gXZgT/7ZfSNgvHCRaS6k5pLANOLg276+mOuuwixqAWA2u2cvqk29mob723IsGYn
urBg/ajU9+h+w==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v2 2/5] gnu: Add nanovg.
Message-ID: <d7xMkbjrb0oDxBl7bXpGj7MNBaiExYKODbLt1SIrPKrduk_A_anU7ccCI2J3K8PAO8Hs0EHhy_DvS85L1HJb8Y98X61byD5whPwIJNMFpjc=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (nanovg): New variable.
---
gnu/packages/gl.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e59d051f2e..b67215b406 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -893,6 +893,52 @@ (define-public glfw
and surfaces, receiving input and events.")
(license license:zlib)))
=20
+(define-public nanovg
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "7544c114e83db7cf67bd1c9e012349b70caacc2f"))
+ (package
+ (name "nanovg")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0n29rxdp20xnvnpsjcmg3v5n6z7ya5ji4qirp18qcyls5xdxdxkc"))=
))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (replace 'build
+ (lambda _
+ (invoke #$(cc-for-target)
+ "../source/src/nanovg.c" "-c" "-fPIC")
+ (invoke #$(cc-for-target)
+ "-shared" "-olibnanovg.so" "nanovg.o")))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib"))
+ (include (string-append #$output
+ "/include")))
+ (install-file "libnanovg.so" lib)
+ (with-directory-excursion "../source"
+ (for-each
+ (lambda (file)
+ (install-file file include))
+ (find-files "src" "nanovg.*\\.h$")))))))))
+ (home-page "https://github.com/memononen/nanovg")
+ (synopsis "2D vector drawing library on top of OpenGL")
+ (description
+ "NanoVG is an antialiased vector graphics rendering library for Ope=
nGL.
+It is aimed for building scalable user interfaces and visualizations.")
+ (license license:zlib))))
+
(define-public nanovg-for-extempore
(let ((version "0.7.1")
(revision "0")
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:06:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:06:11 2023
Received: from localhost ([127.0.0.1]:48404 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puTyd-0000GH-FF
for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:06:11 -0400
Received: from mail-40137.protonmail.ch ([185.70.40.137]:43069)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puTyY-0000F1-6D
for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:06:09 -0400
Date: Thu, 04 May 2023 08:05:55 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683187559; x=1683446759;
bh=pAWKlZW4pDPYFfO4g0rK7sg9hsfkb4sVM7XrssgZmK0=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=RT1UZiglVevH2zrWZtAZQsx7c/DumrtoI/Mk8jCU4mhOkw1ZzrTRr+TGYiwa0E3L8
8QmC9Hcthc4oF2DxNMnAuXYyxN/fG+TZJRYelp93K7+RYxUD9ZUFBsKq5esB9QtIa/
KsOsQCl1+NPRwrsYQZ++puRUoT8uODy9qsQjOLtZRb4Mh5UtI1/Flw4YIIGk5/ERDT
VeG/ElrWVB8bCgsAUXwzbIOn2AlT7VFg7PTMbx0n4NhHg8z1cbSfCgXob4B9lEIeDQ
n5DkgtAvtnkukY2wYyG4wSRkVYppsGw7B1n4X85NBFSPD7SFts9ND4okgx8l9ge84+
On+AfZA9sC+uA==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH v2 1/5] gnu: Add pugl.
Message-ID: <cqH3Q5w4uNBwReMUHzANQ3jkEGL8QAqMm1LYmvjtqfPriyv5xay0o4w4P86KY5VTXacR-QS45gNgT1yxbqDUC4D16KXt8A3Reg9GztYvKtE=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (pugl): New variable.
---
gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 3a63d70c7a..e59d051f2e 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages gl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
@@ -922,6 +923,40 @@ (define-public nanovg-for-extempore
and visualizations.")
(license license:zlib))))
=20
+(define-public pugl
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "9b5a0871c1a8771dbe204e60f437653a67abd42a"))
+ (package
+ (name "pugl")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/lv2/pugl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16gcjz44d27j9ck7frpksy0jqscask2fvln9pb23k6xpq2lky3ar"))
+ (modules '((guix build utils)))
+ ;; Unbundle "sphinxygen".
+ (snippet
+ '(delete-file-recursively "subprojects"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;tests contain manual tests
+ #:configure-flags
+ #~(list "-Ddocs=3Ddisabled"))) ;requires "sphinxygen"
+ (native-inputs (list pkg-config))
+ (inputs (list cairo glu libx11 libxrandr libxcursor libxext mesa))
+ (home-page "http://drobilla.net/software/pugl.html")
+ (synopsis "API for embeddable GUIs")
+ (description
+ "Pugl (PlUgin Graphics Library) is a portability layer for GUIs whi=
ch is
+suitable for use in plugins and applications.")
+ (license license:bsd-0))))
+
(define-public gl2ps
(package
(name "gl2ps")
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:05:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 04 04:05:02 2023 Received: from localhost ([127.0.0.1]:48379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1puTxW-0000Ct-68 for submit <at> debbugs.gnu.org; Thu, 04 May 2023 04:05:02 -0400 Received: from mail-4319.protonmail.ch ([185.70.43.19]:48565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Sughosha@HIDDEN>) id 1puTxT-0000C6-3q for 63254 <at> debbugs.gnu.org; Thu, 04 May 2023 04:05:00 -0400 Date: Thu, 04 May 2023 08:04:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1683187492; x=1683446692; bh=uUIFpvn8n9F1Hr7oUxZLw+gEtO7Tc7vli8KqMtMqrHU=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=lrqWoymsj8hdpjl7uNMMZPLew5ILfUkuSRpipdgAtn+5wvNkpKqVJ6NKu0odAxXNW 7CWutCt7dWf1jPXx7qNccwbQ1ZkHQeeNL+FP9TKvFjw2nBptiCUL8kELa8CJwDx+24 mARLDINL6JYKVmP2VuYlq3uPfytqIJ3DZbFtEmA11osClsmdLv/t94E1FB0Y856NzK bmfPELSioa8m8OAbH8xHQGJqPclcMnqZ37q+nmQHFxQ0ltPJqw+rpUZTHkYHqrVmUB 91+AD0/au94+a52TC5NX7kJ8dk/XmguX1Xjd+/ykdDqOaXAYaP62Xcr5DObrBqifX9 bt9A98kwcRwgg== To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org> From: Sughosha <Sughosha@HIDDEN> Subject: [PATCH v2 0/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface. Message-ID: <FSTBbaQOzaWYWU9f-wNmbxp-9FLyhMVIMwVQ0l2P1sfXbfUfBFLseYQwaLEjzgp2HS093RnmkwOxV9F-afDZouigS38mjoVDCNJzt-r-Kuw=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 63254 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) These V2 patches contain no changes but improved comments in the package definitions.
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:03:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 03 19:03:09 2023
Received: from localhost ([127.0.0.1]:48059 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puLV7-0001KD-4z
for submit <at> debbugs.gnu.org; Wed, 03 May 2023 19:03:09 -0400
Received: from mail-40140.protonmail.ch ([185.70.40.140]:19197)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puLV4-0001Ja-E6
for 63254 <at> debbugs.gnu.org; Wed, 03 May 2023 19:03:07 -0400
Date: Wed, 03 May 2023 23:02:46 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=5m5pudrrbjg6bps65b26zurvjm.protonmail; t=1683154979; x=1683414179;
bh=zHLhI/rLoZ1hDphi4RpT2FktTr2skmDrYhQEVenhIBo=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=j9mpCFEFpz4Tp+JXcKC7Kvpd1QAg0EtNbRvMyWTZ9OxM3uAUD6Wkvc/8dePELLtWA
mLvsZuIkJlNz2Yh1XuG6PvELogqkwjbYWdYr3mDq2cRXFIH1YCT58xVNLwgL1Z67a8
AC0WiphehvSK4wUEYQDPj4dcj8DyCIh+jBX8TA3gEO9bRvELEdbSHk0q197X3LKvm9
MyNgbZSb5GA5rmISwPFJJ+bV3u/2YhqcTAhLFJ8Dx0h8FkwHs5g+gcE1tEE2nGY7Yj
4Nnc7R01qPlC3zMKB4lT6wQ38w0Mi0G9bsuTitjIoRkBu5b3HKk6j0vjDMFuwN9dVz
srZhjwZwy1W2g==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface.
Message-ID: <K5ymmkzIsFxl8K1vZ42ydALwt6yYxJjz67ffMZu-uVFHVQEtNRi5vix2mOgxajLy2Qoas4kJooxCIb0-6Fub_35ZyzCLCC7GTqTseeZs64E=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
From f454e2f8af61e9ab593fbf5cc3fdccf6d390ab7c Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@HIDDEN>
Date: Thu, 4 May 2023 00:49:01 +0200
Subject: [PATCH 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface.
* gnu/packages/music.scm (zynaddsubfx)[source]: Add a patches.
[arguments]: Add configure flags and patch-paths phase.
[inputs]: Remove ntk and add rtosc and mruby-zest.
[home-page]: Change home-page.
* gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch: New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/music.scm | 28 ++++-
.../zynaddsubfx-3.0.6-system-rtosc.patch | 106 ++++++++++++++++++
3 files changed, 130 insertions(+), 5 deletions(-)
create mode 100644 gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.pat=
ch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6f213b2e7f..8a20f54e9f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2072,6 +2072,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/yggdrasil-extra-config.patch=09\
%D%/packages/patches/zig-do-not-link-against-librt.patch=09\
%D%/packages/patches/zig-use-system-paths.patch=09=09\
+ %D%/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch=09\
%D%/packages/patches/zsh-egrep-failing-test.patch
=20
MISC_DISTRO_FILES =3D=09=09=09=09\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 446580dc52..ec19318b6f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -157,6 +157,7 @@ (define-module (gnu packages music)
#:use-module (gnu packages man)
#:use-module (gnu packages mp3)
#:use-module (gnu packages mpd)
+ #:use-module (gnu packages mruby-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages pcre)
@@ -3175,10 +3176,18 @@ (define-public zynaddsubfx
version "/zynaddsubfx-" version ".tar.bz2"))
(sha256
(base32
- "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))))
+ "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))
+ (patches
+ (search-patches
+ "zynaddsubfx-3.0.6-system-rtosc.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
+ `(#:configure-flags `("-DGuiModule=3Dzest"
+ ,(string-append "-DZYN_DATADIR=3D"
+ (assoc-ref %outputs "out")
+ "/share/zynaddsubfx")
+ "-DZYN_SYSTEM_RTOSC=3DON")
+ #:phases
(modify-phases %standard-phases
;; Move SSE compiler optimization flags from generic target to
;; athlon64 and core2 targets, because otherwise the build would =
fail
@@ -3188,10 +3197,19 @@ (define-public zynaddsubfx
(substitute* "src/CMakeLists.txt"
(("-msse -msse2 -mfpmath=3Dsse") "")
(("-march=3D(athlon64|core2)" flag)
- (string-append flag " -msse -msse2 -mfpmath=3Dsse"))))))))
+ (string-append flag " -msse -msse2 -mfpmath=3Dsse")))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/main.cpp"
+ (("\\./zyn-fusion")
+ (search-input-file inputs "/bin/zyn-fusion")))
+ (substitute* "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp"
+ (("\\./libzest\\.so")
+ (search-input-file inputs "/lib/libzest.so"))))))))
(inputs
(list liblo
- ntk
+ rtosc
+ mruby-zest
mesa
alsa-lib
jack-1
@@ -3203,7 +3221,7 @@ (define-public zynaddsubfx
(native-inputs
(list pkg-config
ruby))
- (home-page "https://zynaddsubfx.sf.net/")
+ (home-page "https://zynaddsubfx.sourceforge.io/")
(synopsis "Software synthesizer")
(description
"ZynAddSubFX is a feature heavy realtime software synthesizer. It of=
fers
diff --git a/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch b/gn=
u/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
new file mode 100644
index 0000000000..edf22c389b
--- /dev/null
+++ b/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
@@ -0,0 +1,106 @@
+Adding the option ZYN_SYSTEM_RTOSC to let the use of the system provided R=
tOsc
+instead of using the bundled one.
+
+--- a/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -10,24 +10,34 @@
+ add_definitions(-DZYN_DATADIR=3D"${ZYN_DATADIR}")
+ endif()
+=20
++option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" O=
FF)
++
+ #Include RTOSC
+-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(STATUS "RTOSC NOT FOUND")
+- message(STATUS "Attempting to checkout submodule")
+- find_package(Git REQUIRED)
+- execute_process(COMMAND git submodule update --init --recursive)
++if(ZYN_SYSTEM_RTOSC)
++ include(FindPkgConfig)
++ pkg_check_modules(RTOSC REQUIRED librtosc)
++ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp)
++ include_directories(${RTOSC_INCLUDE_DIR})
++ message(STATUS "Found system provided librtosc and librtosc-cpp...")
++else()
+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
+- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
+- "please check file permissions and your network")
++ message(STATUS "RTOSC NOT FOUND")
++ message(STATUS "Attempting to checkout submodule")
++ find_package(Git REQUIRED)
++ execute_process(COMMAND git submodule update --init --recursive)
++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
++ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
++ "please check file permissions and your network")
++ endif()
++ else()
++ message(STATUS "Found Rtosc Submodule...")
+ endif()
+-else()
+- message(STATUS "Found Rtosc Submodule...")
+-endif()
+=20
+-set(RTOSC_NO_INSTALL TRUE)
+-include("rtosc/cmake/ColorMessage.cmake")
+-add_subdirectory(rtosc)
+-include_directories(rtosc/include)
++ set(RTOSC_NO_INSTALL TRUE)
++ include("rtosc/cmake/ColorMessage.cmake")
++ add_subdirectory(rtosc)
++ include_directories(rtosc/include)
++endif()
+=20
+ enable_testing()
+ include(CTestConfig.cmake)
+--- a/src/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/CMakeLists.txt=092023-05-03 23:17:58.411667901 +0200
+@@ -575,13 +575,27 @@
+ set(PTHREAD_LIBRARY pthread)
+ endif()
+=20
+-target_link_libraries(zynaddsubfx_core
+-=09${ZLIB_LIBRARIES}
+-=09${FFTW3F_LIBRARIES}
+-=09${MXML_LIBRARIES}
+-=09${OS_LIBRARIES}
+- ${PTHREAD_LIBRARY}
+- rtosc rtosc-cpp)
++if(ZYN_SYSTEM_RTOSC)
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ ${RTOSC_LIBRARIES}
++ ${RTOSC_CPP_LIBRARIES}
++ )
++else()
++ target_link_libraries(zynaddsubfx_core
++ ${ZLIB_LIBRARIES}
++ ${FFTW3F_LIBRARIES}
++ ${MXML_LIBRARIES}
++ ${OS_LIBRARIES}
++ ${PTHREAD_LIBRARY}
++ rtosc
++ rtosc-cpp
++ )
++endif()
+=20
+ if(IwyuErr)
+ message (STATUS "Include what you use: ${IwyuErr}")
+
+
+When ZYN_SYSTEM_RTOSC is ON, port-checker file is not available and the te=
st
+fails.
+
+--- a/src/Tests/CMakeLists.txt=092022-01-22 02:46:21.000000000 +0100
++++ b/src/Tests/CMakeLists.txt=092023-05-04 00:19:01.635383149 +0200
+@@ -65,7 +65,6 @@
+=20
+ if(LIBLO_FOUND)
+ cp_script(check-ports.rb)
+- add_test(PortChecker check-ports.rb)
+ endif()
+ add_executable(save-osc SaveOSC.cpp)
+ target_link_libraries(save-osc
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:02:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 03 19:02:32 2023
Received: from localhost ([127.0.0.1]:48054 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puLUV-0001Iv-CB
for submit <at> debbugs.gnu.org; Wed, 03 May 2023 19:02:31 -0400
Received: from mail-4325.protonmail.ch ([185.70.43.25]:16199)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puLUT-0001Ij-LN
for 63254 <at> debbugs.gnu.org; Wed, 03 May 2023 19:02:30 -0400
Date: Wed, 03 May 2023 23:02:09 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683154943; x=1683414143;
bh=FlcN0O1JruygbfCCuOQU/isMsQECH8HP6L9PeDdXuzc=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=kwu1CHeGic95UFgEbpBaLLbNA6qh8FyQehDj5mMPmdG5SbmsSPneS2UzZv/OHDRkF
/AyWKxMITGPFIgl/4Sb9OPKYmmHNEMVGOiAsYETLDbRPORKI+Tyc5yPKDOpStOkjzR
vB/Zr6MN89vpb1/3F+Nd5yiQq0IpcW+ag6YgVTRf7UaSCa9eQfD+dDMUCvJFoU9XbU
gAJkwjwWSMXYLFSk2apIMznIjrhuv/vpcGkKzQYdtVUMgBwUwH/5FS5G+dfEQMZDxb
Z3RvwPdCr6USfF0JQdB+vvNX1h3bXaauSgHe+mqpSMt/q/sKOcCe/N+3TBh7rgEiC4
xJEQRfWt4tEvQ==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH 4/5] gnu: Add mruby-zest.
Message-ID: <c3UHmKur36skF0fC6mQ2JdD12u_SbDIdMufOEA1eMJNAqE0_O5xdaa9T-Oxe6uiTwIlmxSyoNtWThVPT95jNvQGm2pwc2DSFCNsiSm-_3XQ=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mruby-xyz.scm: New file.
* gnu/packages/local.mk: Register the file.
---
gnu/local.mk | 1 +
gnu/packages/mruby-xyz.scm | 176 +++++++++++++++++++++++++++++++++++++
2 files changed, 177 insertions(+)
create mode 100644 gnu/packages/mruby-xyz.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index aa50fc0465..6f213b2e7f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -436,6 +436,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\
%D%/packages/mpd.scm=09=09=09=09\
%D%/packages/mp3.scm=09=09=09=09\
%D%/packages/mpi.scm=09=09=09=09\
+ %D%/packages/mruby-xyz.scm=09=09=09\
%D%/packages/multiprecision.scm=09=09\
%D%/packages/music.scm=09=09=09\
%D%/packages/musl.scm=09=09=09=09\
diff --git a/gnu/packages/mruby-xyz.scm b/gnu/packages/mruby-xyz.scm
new file mode 100644
index 0000000000..08e7268f14
--- /dev/null
+++ b/gnu/packages/mruby-xyz.scm
@@ -0,0 +1,176 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright =C2=A9 2023 <sughosha@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages mruby-xyz)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages audio)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages fonts)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages libevent)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages xorg))
+
+(define-public mruby-zest
+ (package
+ (name "mruby-zest")
+ (version "3.0.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/mruby-zest/mruby-zest-build")
+ (commit version)
+ ;; Cloning recursively for the required mruby gems and=
also
+ ;; for these packages:
+ ;; "mruby": for building "mruby" with the provided
+ ;; "build_config.rb".
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0dz4zv1km9805lji2q2qqdd8s8hgfd723dxdzcivbhm612szm1mc"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; This packages contains a custom "pugl". Replacing it wit=
h the
+ ;; system "pugl" fails to build.
+ ;; Delete bundled "nanovg" and "rtosc".
+ '(with-directory-excursion "deps"
+ (for-each delete-file-recursively
+ (list "libuv" "nanovg" "rtosc"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:make-flags
+ #~(list (string-append "CC=3D" #$(cc-for-target))
+ "CONFIG_SHELL=3Dbash")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Do not compile "nanovg" again and use system "nanovg=
".
+ (substitute* "Makefile"
+ (("cd deps/nanovg") "#cd deps/nanovg")
+ (("\\$\\(AR\\) rc deps/libnanovg\\.a")
+ "#$(AR) rc deps/libnanovg.a")
+ (("\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("cd deps/libuv") "#cd deps/libuv")
+ (("\\./deps/libuv/\\.libs/libuv\\.a")
+ "-luv")
+ (("\\./deps/libuv/\\.libs/libuv-win\\.a")
+ "-luv-win"))
+ (substitute* "build_config.rb"
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libnanovg\\.a")
+ "-lnanovg")
+ (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libuv\\.a")
+ "-luv")
+ (("cc\\.include_paths.*\\./deps/nanovg/.*$")
+ "#")
+ (("cc\\.include_paths.*\\./deps/libuv/.*$")
+ "#"))
+ (substitute* "deps/mruby-nanovg/src/nvg_screenshot.c"
+ (("\\.\\./\\.\\./nanovg/.*/stb_image_write\\.h")
+ (search-input-file inputs "/example/stb_image_write.h=
")))
+ ;; Use system "rtosc" headers.
+ (substitute* "src/mruby-widget-lib/src/gem.c"
+ (("\"\\.\\./\\.\\./\\.\\./deps/.*/rtosc\\.h\"")
+ "<rtosc/rtosc.h>"))
+ ;; Fix missing fonts.
+ (substitute*
+ "src/mruby-widget-lib/mrblib/script.rb"
+ (("sans =3D \\[")
+ (string-append
+ "sans =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Regular.ttf")
+ "\", "))
+ (("bold =3D \\[")
+ (string-append
+ "bold =3D [\""
+ (search-input-file inputs
+ "/share/fonts/truetype/Roboto-Bold.ttf")
+ "\", ")))
+ ;; Fix paths for zyn-fusion files.
+ (substitute* "src/osc-bridge/src/bridge.c"
+ (("fopen\\(\\\"schema/")
+ (string-append
+ "fopen(\"" #$output "/share/zyn-fusion/schema/")))
+ (substitute* "test-libversion.c"
+ (("./libzest.so")
+ (string-append #$output "/lib/libzest.so")))
+ (substitute* "src/mruby-widget-lib/src/api.c"
+ ((", \\\"\\./qml/") ", \"../share/zyn-fusion/qml/")
+ (("\\./qml/")
+ (string-append #$output "/share/zyn-fusion/qml")))))
+ (replace 'install
+ (lambda _
+ (rename-file "zest" "zyn-fusion")
+ (install-file "zyn-fusion" (string-append #$output "/bi=
n"))
+ (install-file "libzest.so" (string-append #$output "/li=
b"))
+ (for-each
+ (lambda (folder)
+ (for-each
+ (lambda (file)
+ (install-file file
+ (string-append #$output "/share/zyn-fusion/qml=
")))
+ (find-files folder "\\.qml$")))
+ '("src/mruby-zest/qml" "src/mruby-zest/example"))
+ (install-file "src/osc-bridge/schema/test.json"
+ (string-append #$output "/share/zyn-fusion/schema"))
+ (install-file "completions/zyn-fusion"
+ (string-append
+ #$output "/share/bash-completion/completions")))))))
+ (native-inputs
+ (list (package-source nanovg) ;for "stb_image_write.h"
+ pkg-config
+ ruby))
+ (inputs
+ (list font-google-roboto
+ libuv
+ libx11
+ mesa
+ ;; With the latest version of "nanovg" the contents are not
+ ;; displayed properly.
+ (let ((revision "0")
+ (commit "b83cf926525e7cea8d2483da2a75852b8c7b6d28"))
+ (package (inherit nanovg)
+ (version (git-version (package-version nanovg) revision com=
mit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (sha256
+ (base32
+ "1zp355pw6xnb5mjarz67cxkglv7j1s0qzv705fz1wf0gl0sjhy8f"=
))))))
+ rtosc))
+ (home-page "https://github.com/mruby-zest/mruby-zest-build")
+ (synopsis "Zyn-Fusion user interface")
+ (description
+ "This package provides user interface for Zyn-Fusion.")
+ (license
+ (list license:lgpl2.1))))
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:01:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 03 19:01:49 2023
Received: from localhost ([127.0.0.1]:48048 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puLTo-0001HV-SF
for submit <at> debbugs.gnu.org; Wed, 03 May 2023 19:01:49 -0400
Received: from mail-4319.protonmail.ch ([185.70.43.19]:37139)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puLTm-0001HG-VJ
for 63254 <at> debbugs.gnu.org; Wed, 03 May 2023 19:01:47 -0400
Date: Wed, 03 May 2023 23:01:34 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683154900; x=1683414100;
bh=p8kWTAhFvPzCBKGo35ipKRI3qMskVRBxKtby+xoQjwg=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=Ichb7aStjZiev78nP8v8kZwLiLvdtou2YWCZtetw+26OcRZtzL1SSBI903hHgiinp
N/W3Zw6yxpONn5yp+ZIohNwYxY0JGYf3q3cJoNkR2yCmZHn/0M8mym/buUr8UM0Vf8
fAwcL+DGg5uzR7y+n9Fc3h9zOaSo2Qu4aQZSetnv/UX+qk7MK+bKqHYn78gemCZ6zX
YMwkJQyF3sMXMi9BfxkOxdAnzqL2yrUjgUvuTV0As4J5dln762MthnLsWBuAL+hK1o
kmN0bIum7Kq8l5orizpwu+LyhLIl0Xt9ZRWQlCl4YERrgkyngLiJG5tkqH8M+UVWrx
dNgf9KMe2n/UQ==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH 3/5] gnu: Add rtosc.
Message-ID: <C_c9gAFzyKhe_8_8-GectLNWOMV8-D8YV2Ld2rmLZu6NWT0lZ_7WnBW3J7NwF1WRfE_mmDRdTXjH-WKjpFeKCHcln2p1wCBmGEO9MyaxMzo=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/audio.scm (rtosc): New variable.
* gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparision-operator.patch: =
New file.
* gnu/local.mk: Register the patch file.
---
gnu/local.mk | 1 +
gnu/packages/audio.scm | 45 +++++++++++++++++++
....3.1-fix-invalid-comparison-operator.patch | 14 ++++++
3 files changed, 60 insertions(+)
create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison=
-operator.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 68a02d10b5..aa50fc0465 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1842,6 +1842,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\
%D%/packages/patches/ripperx-missing-file.patch=09=09\
%D%/packages/patches/rpcbind-CVE-2017-8779.patch=09=09\
%D%/packages/patches/rtags-separate-rct.patch=09=09=09\
+ %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch=
=09\
%D%/packages/patches/racket-chez-scheme-bin-sh.patch=09=09\
%D%/packages/patches/racket-rktio-bin-sh.patch=09=09\
%D%/packages/patches/racket-zuo-bin-sh.patch=09=09=09\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 109133ba8e..236fc84077 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2806,6 +2806,51 @@ (define-public liblo
implementation of the Open Sound Control (@dfn{OSC}) protocol.")
(license license:lgpl2.1+)))
=20
+(define-public rtosc
+ (package
+ (name "rtosc")
+ (version "0.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fundamental/rtosc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2"))
+ (patches
+ (search-patches
+ "rtosc-0.3.1-fix-invalid-comparison-operator.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags
+ #~(list "-DPERF_TEST=3DON"
+ "-DRTOSC_BUILD_SHARED_LIBS=3DON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'build-documentation
+ (lambda _
+ (invoke "make" "rtosc-doc")))
+ (add-after 'install 'install-documentation
+ (lambda _
+ (copy-recursively "html"
+ (string-append #$output:doc
+ "/share/doc/rtosc/html")))))))
+ (native-inputs
+ (list doxygen pkg-config ruby))
+ (inputs
+ (list jack-1
+ liblo
+ libx11
+ mesa))
+ (outputs (list "out" "doc"))
+ (home-page "https://fundamental-code.com/wiki/rtosc/")
+ (synopsis "Realtime Safe OSC packet serialization and dispatch")
+ (description
+ "RtOsc is a realtime safe library for handling OSC messages.")
+ (license license:expat)))
+
(define-public rtaudio
(package
(name "rtaudio")
diff --git a/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operat=
or.patch b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator=
.patch
new file mode 100644
index 0000000000..925e39e9a1
--- /dev/null
+++ b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patc=
h
@@ -0,0 +1,14 @@
+This patch fixes the unknown version comparison operator
+
+diff --git a/librtosc-cpp.pc.cmake b/librtosc-cpp.pc.cmake
+index 0d8fda2..edbcb3a 100644
+--- a/librtosc-cpp.pc.cmake
++++ b/librtosc-cpp.pc.cmake
+@@ -9,6 +9,6 @@ includedir=3D@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: rtosc_cpp
+ Description: rtosc_cpp - a realtime safe open sound control serialization=
and dispatch system for C++
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+-Requires: librtosc =3D=3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
++Requires: librtosc =3D @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Libs: -L${libdir} -lrtosc -lrtosc-cpp
+ Cflags: -I${includedir}
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:01:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 03 19:01:18 2023
Received: from localhost ([127.0.0.1]:48044 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puLTK-0001Gl-H2
for submit <at> debbugs.gnu.org; Wed, 03 May 2023 19:01:18 -0400
Received: from mail-4325.protonmail.ch ([185.70.43.25]:36513)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puLTI-0001GY-Qy
for 63254 <at> debbugs.gnu.org; Wed, 03 May 2023 19:01:17 -0400
Date: Wed, 03 May 2023 23:01:08 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=aegbomfjcjgoply5v65uhaza3u.protonmail; t=1683154870; x=1683414070;
bh=/lVOumJgTxF6WAjZ6tJG2e4uhf+Q/F+c+k1qWSvHbTg=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=d+eFMgND5FdCPCjJCGPeLO5uNAlktOpxw+0EQU/HeKYUKw7ZWKk0+nmk02haRErQd
rsouUmEtN6BlQolBP5aqB76WZQ6oRIWznTuovht7eXycuj1rQCtXWQn0eNZcbFLa4s
MMfQu4bzDYX4m34+ygivsEQoKFE/sb6adWXK+EyHoWGMYePIvbMYawk5pOJxKtMJkL
CTFYeMnesiedVn/9puXrGDBTTW2za+cX8d/tPos2S2ngvvnbb/14/ROHKpUGKfFOa+
yFy0RRAIlNj6/NyEb2szTByyEWHFJHUIYIJ0DkgU6Vq8ty17iZ1LW1WPj4RQeRoa+B
snVbOGzhXQxxg==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH 2/5] gnu: Add nanovg.
Message-ID: <gdYJrz3z_pMNYxrs5tLWWep-1NOw_9UvNX3R8JudPhOtdie5TJFpSaQLGS3JJioQCxxAruojjo31AAVo1BRUMR_iTUhUXxmAzAquJyNyHmU=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (nanovg): New variable.
---
gnu/packages/gl.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e59d051f2e..b67215b406 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -893,6 +893,52 @@ (define-public glfw
and surfaces, receiving input and events.")
(license license:zlib)))
=20
+(define-public nanovg
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "7544c114e83db7cf67bd1c9e012349b70caacc2f"))
+ (package
+ (name "nanovg")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/memononen/nanovg")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0n29rxdp20xnvnpsjcmg3v5n6z7ya5ji4qirp18qcyls5xdxdxkc"))=
))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (replace 'build
+ (lambda _
+ (invoke #$(cc-for-target)
+ "../source/src/nanovg.c" "-c" "-fPIC")
+ (invoke #$(cc-for-target)
+ "-shared" "-olibnanovg.so" "nanovg.o")))
+ (replace 'install
+ (lambda _
+ (let ((lib (string-append #$output "/lib"))
+ (include (string-append #$output
+ "/include")))
+ (install-file "libnanovg.so" lib)
+ (with-directory-excursion "../source"
+ (for-each
+ (lambda (file)
+ (install-file file include))
+ (find-files "src" "nanovg.*\\.h$")))))))))
+ (home-page "https://github.com/memononen/nanovg")
+ (synopsis "2D vector drawing library on top of OpenGL")
+ (description
+ "NanoVG is an antialiased vector graphics rendering library for Ope=
nGL.
+It is aimed for building scalable user interfaces and visualizations.")
+ (license license:zlib))))
+
(define-public nanovg-for-extempore
(let ((version "0.7.1")
(revision "0")
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:00:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 03 19:00:57 2023
Received: from localhost ([127.0.0.1]:48039 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1puLSz-0001Fg-2w
for submit <at> debbugs.gnu.org; Wed, 03 May 2023 19:00:57 -0400
Received: from mail-4324.protonmail.ch ([185.70.43.24]:47939)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <Sughosha@HIDDEN>) id 1puLSw-0001FT-La
for 63254 <at> debbugs.gnu.org; Wed, 03 May 2023 19:00:56 -0400
Date: Wed, 03 May 2023 23:00:36 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me;
s=protonmail; t=1683154847; x=1683414047;
bh=pAWKlZW4pDPYFfO4g0rK7sg9hsfkb4sVM7XrssgZmK0=;
h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=Zmh/dNZfQhZhYjGSSssQOZShlQ4dFrqNFdyyVQUsHLrThZcVwpPYxsOApBHGOPAK+
QYn+XA13S+2JuteA4HRfi5Lik9J/cTaf6qE37u+iKcUvN2EXcEFcMOvx73ZW2toUL2
rpyhKbEM2viD3eUmgcVfmxUh4S9w/JbKkvCDnmK6+MhdpIzHWeqZ+as62OwEjE4S4H
rGcJlx+qVN27wmTFTepo33URisUrYewnFqQi7imQ+9WyosG34T9fsfOFFYIBiTuU9x
X0kfONDNGzSxTrRdbAys7rn5b/ifVsto42UzKVll8Lt79v1FWezBZthFSrzYycvxUd
YZ6PCxZcqm+Fg==
To: "63254 <at> debbugs.gnu.org" <63254 <at> debbugs.gnu.org>
From: Sughosha <Sughosha@HIDDEN>
Subject: [PATCH 1/5] gnu: Add pugl.
Message-ID: <yam_D4n4lLdVjffGQoRhvsJCQNzWNePJspf8iI1YbvpUrL9zrqXJHzj2t1g4UMUkwTwTUcH0mzuXcwd2e3rp_c1oroSKn2iV2YEORepR1xY=@proton.me>
Feedback-ID: 45211691:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 63254
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/gl.scm (pugl): New variable.
---
gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 3a63d70c7a..e59d051f2e 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages gl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
@@ -922,6 +923,40 @@ (define-public nanovg-for-extempore
and visualizations.")
(license license:zlib))))
=20
+(define-public pugl
+ ;; No tags are available.
+ (let ((revision "0")
+ (commit "9b5a0871c1a8771dbe204e60f437653a67abd42a"))
+ (package
+ (name "pugl")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/lv2/pugl")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "16gcjz44d27j9ck7frpksy0jqscask2fvln9pb23k6xpq2lky3ar"))
+ (modules '((guix build utils)))
+ ;; Unbundle "sphinxygen".
+ (snippet
+ '(delete-file-recursively "subprojects"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;tests contain manual tests
+ #:configure-flags
+ #~(list "-Ddocs=3Ddisabled"))) ;requires "sphinxygen"
+ (native-inputs (list pkg-config))
+ (inputs (list cairo glu libx11 libxrandr libxcursor libxext mesa))
+ (home-page "http://drobilla.net/software/pugl.html")
+ (synopsis "API for embeddable GUIs")
+ (description
+ "Pugl (PlUgin Graphics Library) is a portability layer for GUIs whi=
ch is
+suitable for use in plugins and applications.")
+ (license license:bsd-0))))
+
(define-public gl2ps
(package
(name "gl2ps")
--=20
2.39.2
guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 3 May 2023 22:58:29 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 03 18:58:29 2023 Received: from localhost ([127.0.0.1]:48033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1puLQb-0001A9-Jw for submit <at> debbugs.gnu.org; Wed, 03 May 2023 18:58:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:40422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <Sughosha@HIDDEN>) id 1puLQX-00019y-D0 for submit <at> debbugs.gnu.org; Wed, 03 May 2023 18:58:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Sughosha@HIDDEN>) id 1puLQW-0005r4-7V for guix-patches@HIDDEN; Wed, 03 May 2023 18:58:25 -0400 Received: from mail-40141.protonmail.ch ([185.70.40.141]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Sughosha@HIDDEN>) id 1puLQT-0001aA-Pw for guix-patches@HIDDEN; Wed, 03 May 2023 18:58:24 -0400 Date: Wed, 03 May 2023 22:58:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1683154697; x=1683413897; bh=iQTTWDhkX0ljIBVSdwyaYmE25mMjPs5C4pVVle1S0Fs=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=G3NnPEKI9QKDPjcLICEVWPkCWX8ZFKX44kqoeiL8wkinXw5BRIyL/JMtTx1FVnGFC ip+5iAoh3S7+t04/GyVwoYUdM55FLkle4UGvMmQMnYvBY8wnwapIP1HvRIt99X8mTU HXc/ngqzVHF+Kz7vOsvl2IGSNQe8UARb0rAb4GEsHTqjHhNT+Yn+wM068+z0xi75CU 0gOSYwFiCC9AajYcTGESsnl8N4rUTNWZAzhmtHbn0OsTlbp0tmhvhyzQQ7H6W94hTy oa0bNb2TAeJux2rbbFowBK5dKRaHYFBlSHE3xsvJCik9YznHA5p7Cohy8JFgpScq/8 98GrWQEtUwQDQ== To: "guix-patches@HIDDEN" <guix-patches@HIDDEN> From: Sughosha <Sughosha@HIDDEN> Subject: [PATCH 0/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface. Message-ID: <xFwn-qV2bLvixSdTGGbORhvuP891xykYhD_AoAITAeE8IZ30TMVhpOthI979E6g9Lz58sV-jrnzgWICclGC2AXR0ZWvWbwGzvI3SxrKSREU=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.141; envelope-from=Sughosha@HIDDEN; helo=mail-40141.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) These are the patches to switch to Zyn-Fusion interface provided by "mruby-zest" and using the system provided "rtosc".
Sughosha <Sughosha@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#63254; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.