From patchwork Tue Jan 3 22:09:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 45831 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 610B627BBED; Tue, 3 Jan 2023 22:10:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1FE2227BBE9 for ; Tue, 3 Jan 2023 22:10:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCpTx-00032k-3u; Tue, 03 Jan 2023 17:10:05 -0500 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 ) id 1pCpTu-00032N-SH for guix-patches@gnu.org; Tue, 03 Jan 2023 17:10:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pCpTu-0005J9-Jc for guix-patches@gnu.org; Tue, 03 Jan 2023 17:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCpTu-00058M-A5 for guix-patches@gnu.org; Tue, 03 Jan 2023 17:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60201] [PATCH v8] gnu: Add wdl. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jan 2023 22:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "60201@debbugs.gnu.org" <60201@debbugs.gnu.org> Received: via spool by 60201-submit@debbugs.gnu.org id=B60201.167278375619676 (code B ref 60201); Tue, 03 Jan 2023 22:10:02 +0000 Received: (at 60201) by debbugs.gnu.org; 3 Jan 2023 22:09:16 +0000 Received: from localhost ([127.0.0.1]:46925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCpTA-00057H-5G for submit@debbugs.gnu.org; Tue, 03 Jan 2023 17:09:16 -0500 Received: from mail-40135.protonmail.ch ([185.70.40.135]:19105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCpT5-000570-LQ for 60201@debbugs.gnu.org; Tue, 03 Jan 2023 17:09:14 -0500 Date: Tue, 03 Jan 2023 22:09:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=d4b3ad54yrg3vl7x7rfzbqvvgi.protonmail; t=1672783745; x=1673042945; bh=cJiDfxwP9dlp0mZwhd8lLcvV+CGGo1w56wHR/SzP1mA=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=YIVmIawcRfI0b3KQyq4mnsmcGQ4oDtnlTHDcNQcUtSBhx31Rf+yZlITivJa3+9oRZ h5MxCPeuKzTevHeamYOHh65sz9wR1Gxe8iZFj25hzWhw57EvHRDfPY6fSVDB8QDVoJ lGbfBLf75f4hL1Wvva68RwLI6SFHekaHBJFfUWX0Qd5twhPYQb1s/GahtzTwICUKAg 5GrSXCkY1aP/9ZGHMUpgUDtbRYryHYRz5fE7BFBY/EgU8GvMoflg+rA+6u/zzKC5+r 3NUR8PZxkrT0A0AOyh37uNYVTOv2qEzI4tFrCoIRElHozbZ46E6XPa+7h8FbhYXlur wJYJKDe/dPKvQ== Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches I finally moved the whole thing to cpp.scm and hope that this is the right place. I also changed the name to wdl and included header files, but I don't know if I should install .cpp files also, and if yes, I don't know where, so I left them. * gnu/packages/cpp.scm (wdl): New public variable. * gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) create mode 100644 gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch -- libgit2 1.4.3 diff --git a/gnu/local.mk b/gnu/local.mk index f0b1b3f..4b6ef75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1987,6 +1987,7 @@ dist_patch_DATA = \ %D%/packages/patches/wacomtablet-add-missing-includes.patch \ %D%/packages/patches/wacomtablet-qt5.15.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ + %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a3df706..f7254e2 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -63,6 +63,7 @@ #:use-module (guix modules) #:use-module (guix gexp) #:use-module (gnu packages) + #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) @@ -73,7 +74,11 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) @@ -91,6 +96,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module (ice-9 match)) (define-public argagg @@ -2231,3 +2237,120 @@ also includes a C library that checks casting, multiplication, division, addition and subtraction for all combinations of signed and unsigned 32-bit and 64-bit integers.") (license license:expat))) + +(define-public wdl + (let ((commit "da86a62d11e46e4ecd8b16f9775cb5188340a0e2") + (revision "0")) + (package + (name "wdl") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/justinfrankel/WDL") + (commit commit))) + (file-name (git-file-name name version)) + (patches + (search-patches "wdl-link-libs-and-fix-jnetlib.patch")) + (sha256 + (base32 + "0hdb604szkbrlyffiw94rz8wx4nvmk3zdkycfirqgjs7mh0l6vbq")) + (modules '((guix build utils))) + ;; Unbundle third party libraries which are not needed. + (snippet '(for-each (lambda (dir) + (delete-file-recursively (string-append + "WDL/" dir))) + (list "cmath" + "libpng" + "lice/glew" + "giflib" + "jpeglib" + "zlib"))))) + (build-system gnu-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (with-directory-excursion "WDL/swell" + (invoke "make" "SWELL_SUPPORT_GTK=true") + (invoke "make" "libSwell.colortheme")) + (invoke "make" "-CWDL/eel2") + (invoke "make" "-CWDL/jnetlib"))) + (replace 'check + (lambda _ + (with-directory-excursion "WDL/swell" + (invoke "make" "test")))) + (replace 'install + (lambda _ + (let ((include (string-append #$output + "/include/WDL"))) + (with-directory-excursion "WDL" + (delete-file-recursively "lice/test") + (delete-file-recursively + "swell/sample_project") + (for-each (lambda (file) + (mkdir-p (string-append include + "/" + file))) + (list "eel2" + "jnetlib" + "lice" + "localize" + "plush2" + "prvhash" + "swell" + "win32_curses" + "wingui/scrollbar")) + (for-each (lambda (file) + (copy-file file + (string-append + include "/" file))) + (find-files "." "\\.h$"))) + (with-directory-excursion "WDL/swell" + (install-file "libSwell.so" + (string-append #$output + "/lib")) + (install-file "libSwell.colortheme" + (string-append #$output + "/share/WDL"))) + (install-file "WDL/eel2/loose_eel" + (string-append #$output + "/libexec")) + (install-file "WDL/jnetlib/jnl.a" + (string-append #$output + "/lib")))))))) + (native-inputs (list pkg-config nasm)) + (inputs (list cairo + fontconfig + freetype + gdk-pixbuf + glib + gtk+ + libxi + libx11 + mesa + zlib)) + (home-page "https://www.cockos.com/wdl/") + (synopsis "Modestly reusable C++ libraries") + (description + "WDL is a C++ library that is designed to be easily used by other code. + +WDL includes the following: +@itemize +@item Inline classes for cleanly managing memory allocations, lists, +queues, resource pools, strings, etc. +@item File reading/writing wrappers +@item Directory scanning API +@item SHA-1 implementation +@item Mergesort implementation +@item Blowfish implementation +@item Fast FFT implementation (based on DJBFFT) +@item Audio tools +@item LICE - Lightweight Image Compositing Engine +@item WDL Virtual Window system +@item Plush2 - Portable, lightweight software 3d rendering engine +@item SWELL - Simple Windows Emulation Layer +@item And more. +@end itemize") + (license license:zlib)))) diff --git a/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch b/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch new file mode 100644 index 0000000..29ec0f0 --- /dev/null +++ b/gnu/packages/patches/wdl-link-libs-and-fix-jnetlib.patch @@ -0,0 +1,53 @@ +From 2d129502354da4fe39dac13463ea742f8026ab91 Mon Sep 17 00:00:00 2001 +From: Sughosha +Date: Tue, 3 Jan 2023 22:15:09 +0100 +Subject: [PATCH] Link libs and fix jnetlib. + +--- + WDL/eel2/Makefile | 2 +- + WDL/jnetlib/Makefile | 2 +- + WDL/swell/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/WDL/eel2/Makefile b/WDL/eel2/Makefile +index ac2e41f1..0ffca97a 100644 +--- a/WDL/eel2/Makefile ++++ b/WDL/eel2/Makefile +@@ -153,7 +153,7 @@ gen-lex: # the output of this, lex.nseel.c, is unused because we have a handwri + $(CXX) $(CXXFLAGS) -c -o $@ $^ + + loose_eel: loose_eel.o $(OBJS) $(OBJS2) +- g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) ++ g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) -lGL + + clean: + -rm -f -- loose_eel loose_eel.o $(OBJS) +diff --git a/WDL/jnetlib/Makefile b/WDL/jnetlib/Makefile +index 10d9fe8a..85570c5a 100644 +--- a/WDL/jnetlib/Makefile ++++ b/WDL/jnetlib/Makefile +@@ -7,7 +7,7 @@ CC = gcc + CPP = g++ + CXX = g++ + +-OBJS = asyncdns.o connection.o httpget.o httpserv.o listen.o util.o sercon.o ++OBJS = asyncdns.o connection.o httpget.o httpserv.o listen.o util.o + + jnl.a: ${OBJS} + -rm -f jnl.a +diff --git a/WDL/swell/Makefile b/WDL/swell/Makefile +index 9e7e2d87..8e98a543 100644 +--- a/WDL/swell/Makefile ++++ b/WDL/swell/Makefile +@@ -167,7 +167,7 @@ libSwell$(DLL_EXT): $(OBJS) + $(CXX) -shared -o $@ $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) + + test: $(OBJS) test.o +- $(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) ++ $(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) -lpthread -ldl $(shell $(PKG_CONFIG) --libs gtk+-3.0 freetype2) -lfontconfig -lGL -lXi -lX11 + + libSwell.colortheme: swell-gdi-generic.cpp $(SWELL_HEADERS) + $(CXX) $(CFLAGS) -o make-theme -DSWELL__MAKE_THEME swell-gdi-generic.cpp -lpthread +-- +2.38.1 +