From fb1c4b450d63a24936fb762fbce0540fe684567c Mon Sep 17 00:00:00 2001 From: Kimapr Date: Sat, 26 Jul 2025 22:56:56 +0500 Subject: [PATCH] libbytebeat!! --- kimapr/packages/misc.scm | 37 ++++++++++++++++++++++++++++++++---- kimapr/packages/override.scm | 35 ++++++++++++++++++++++++---------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/kimapr/packages/misc.scm b/kimapr/packages/misc.scm index 0147252..206906c 100644 --- a/kimapr/packages/misc.scm +++ b/kimapr/packages/misc.scm @@ -1,20 +1,49 @@ (define-module (kimapr packages misc) - #:use-module (guix utils) #:use-module (guix build-system meson) - #:use-module (guix download) - #:use-module (guix packages) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) - #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages ninja) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix utils) + #:use-module (guix build-system gnu) + #:use-module (gnu packages glib) + #:use-module (gnu packages webkit) + #:use-module (gnu packages autotools) #:use-module ((guix licenses) #:prefix license:)) +(define-public libbytebeat + (package + (name "libbytebeat") + (version "1.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kimapr.net/kimapr/libbytebeat") + (commit version))) + (sha256 + (base32 "04vd0apqdfinpal9xwsx6svdqgzbc8xbj2rxc6wmfa6f3yjp1p70")))) + (build-system gnu-build-system) + (native-inputs (list automake + autoconf + libtool + pkg-config)) + (inputs (list glib + webkitgtk)) + (synopsis "ByteBeat playback library") + (home-page "https://git.kimapr.net/kimapr/libbytebeat") + (description + "LibByteBeat is a C library for processing bytebeat generative audio.") + (license license:expat))) + (define-public accerciser (package (name "accerciser") diff --git a/kimapr/packages/override.scm b/kimapr/packages/override.scm index 1ecf349..c6ac81f 100644 --- a/kimapr/packages/override.scm +++ b/kimapr/packages/override.scm @@ -1,7 +1,9 @@ (define-module (kimapr packages override) + #:use-module (kimapr packages misc) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix download) #:use-module (gnu packages) #:use-module ((gnu packages base) #:prefix gnu:) @@ -55,23 +57,36 @@ ;; packag ;; -(define (unfuck-ffmpeg ffmpeg) +(define (unfuck-ffmpeg ffmpeg comm gfh) (add-rewrite ffmpeg (package (inherit ffmpeg) - (arguments - (substitute-keyword-arguments (package-arguments ffmpeg) - ((#:configure-flags flags) - #~(cons* "--enable-libopenmpt" - #$flags)))) - (inputs (modify-inputs (package-inputs ffmpeg) - (prepend gnu:libopenmpt)))))) + (replacement (package + (inherit ffmpeg) + (source (origin + (method url-fetch) + (uri (string-append "https://git.kimapr.net/kimapr/ffmpeg-bb/archive/" + comm ".tar.gz")) + (sha256 + (base32 gfh)))) + (arguments + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags flags) + #~(cons* "--enable-libopenmpt" + "--enable-libbytebeat" + #$flags)))) + (inputs (modify-inputs (package-inputs ffmpeg) + (prepend gnu:libopenmpt libbytebeat)))))))) (define ffmpeg-7 - (unfuck-ffmpeg gnu:ffmpeg-7)) + (unfuck-ffmpeg gnu:ffmpeg-7 + "451691febac466cee37d9b836228e30c53813d60" + "0r21aaq1b7pai4f2dkbss5nshi25mv5x9fddvd2586q46g6wnhwr")) (define ffmpeg - (unfuck-ffmpeg gnu:ffmpeg)) + (unfuck-ffmpeg gnu:ffmpeg + "a4696280f8f378058d9cb1b8b9f731c738ad7ddf" + "0ca46iipffvkyilyrlaqqasyqxp03p894dq7x2ipwc31n0vhqf1j")) (define-public mpv-noprop-gnu (unpropagate-inputs gnu:mpv))