[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
69/86: gnu: Add libofa.
From: |
guix-commits |
Subject: |
69/86: gnu: Add libofa. |
Date: |
Sun, 5 Jul 2020 16:17:10 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit 9fb0b75a24323d62190ef6ccd08c80599873e71f
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Fri Jul 3 09:16:01 2020 -0400
gnu: Add libofa.
* gnu/packages/audio.scm (libofa): New variable.
* gnu/packages/patches/libofa-ftbfs-1.diff: New file.
* gnu/packages/patches/libofa-curl.diff: New file.
* gnu/packages/patches/libofa-ftbfs-2.diff: New file.
* gnu/local.mk (dist_patch_DATA): Add them.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/local.mk | 3 +++
gnu/packages/audio.scm | 32 +++++++++++++++++++++++
gnu/packages/patches/libofa-curl.diff | 15 +++++++++++
gnu/packages/patches/libofa-ftbfs-1.diff | 45 ++++++++++++++++++++++++++++++++
gnu/packages/patches/libofa-ftbfs-2.diff | 27 +++++++++++++++++++
5 files changed, 122 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1a0cf57..149e6f8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1183,6 +1183,9 @@ dist_patch_DATA =
\
%D%/packages/patches/libgnomeui-utf8.patch \
%D%/packages/patches/libjxr-fix-function-signature.patch \
%D%/packages/patches/libjxr-fix-typos.patch \
+ %D%/packages/patches/libofa-ftbfs-1.diff \
+ %D%/packages/patches/libofa-curl.diff \
+ %D%/packages/patches/libofa-ftbfs-2.diff \
%D%/packages/patches/libotr-test-auth-fix.patch \
%D%/packages/patches/libksieve-Fix-missing-link-libraries.patch \
%D%/packages/patches/libmad-armv7-thumb-pt1.patch \
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8a6fa70..1cd0e90 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -126,6 +126,38 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
+(define-public libofa
+ (package
+ (name "libofa")
+ (version "0.9.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://storage.googleapis.com/"
+ "google-code-archive-downloads/v2/code.google.com/"
+ "musicip-libofa/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"))
+ (patches
+ (search-patches
+ "libofa-ftbfs-1.diff"
+ "libofa-curl.diff"
+ "libofa-ftbfs-2.diff"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)))
+ (propagated-inputs
+ `(("fftw" ,fftw)))
+ (synopsis "Open Fingerprint Architecture")
+ (description "LibOFA is an audio fingerprint library, created and provided
+by MusicIP.")
+ (home-page "https://code.google.com/archive/p/musicip-libofa/")
+ (license license:gpl2+)))
+
(define-public faac
(package
(name "faac")
diff --git a/gnu/packages/patches/libofa-curl.diff
b/gnu/packages/patches/libofa-curl.diff
new file mode 100644
index 0000000..6b1e824
--- /dev/null
+++ b/gnu/packages/patches/libofa-curl.diff
@@ -0,0 +1,15 @@
+Description: Fix FTBFS due to unexisting and useless include. (Closes: #637896)
+Author: Regis Boudin <regis@debian.org>
+Last-Update: 2011-10-03
+Index: libofa-0.9.3/examples/protocol.cpp
+===================================================================
+--- libofa-0.9.3.orig/examples/protocol.cpp
++++ libofa-0.9.3/examples/protocol.cpp
+@@ -13,7 +13,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ using namespace std;
diff --git a/gnu/packages/patches/libofa-ftbfs-1.diff
b/gnu/packages/patches/libofa-ftbfs-1.diff
new file mode 100644
index 0000000..4aa7123
--- /dev/null
+++ b/gnu/packages/patches/libofa-ftbfs-1.diff
@@ -0,0 +1,45 @@
+Description: fix FTBFS with GCC 4.3. (Closes: #417355)
+Author: Martin Michlmayr <tbm@cyrius.com>
+Last-Update: 2007-04-02
+
+Description: add a missing include. (Closes: #441557)
+Author: Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+Last-Update: 2007-12-29
+
+Index: libofa-0.9.3/lib/signal_op.cpp
+===================================================================
+--- libofa-0.9.3.orig/lib/signal_op.cpp
++++ libofa-0.9.3/lib/signal_op.cpp
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+
+
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
+Index: libofa-0.9.3/examples/example.cpp
+===================================================================
+--- libofa-0.9.3.orig/examples/example.cpp
++++ libofa-0.9.3/examples/example.cpp
+@@ -8,6 +8,8 @@
+ -------------------------------------------------------------------*/
+
+ #include "protocol.h"
++#include <cctype>
++#include <string.h>
+
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+Index: libofa-0.9.3/examples/protocol.cpp
+===================================================================
+--- libofa-0.9.3.orig/examples/protocol.cpp
++++ libofa-0.9.3/examples/protocol.cpp
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
diff --git a/gnu/packages/patches/libofa-ftbfs-2.diff
b/gnu/packages/patches/libofa-ftbfs-2.diff
new file mode 100644
index 0000000..ad61573
--- /dev/null
+++ b/gnu/packages/patches/libofa-ftbfs-2.diff
@@ -0,0 +1,27 @@
+Description: ftbfs with GCC-4.7. (Closes: #667250)
+Author: Matthias Klose <doko@debian.org>
+Last-Update: 2012-04-17
+Index: libofa-0.9.3/examples/uselame.cpp
+===================================================================
+--- libofa-0.9.3.orig/examples/uselame.cpp
++++ libofa-0.9.3/examples/uselame.cpp
+@@ -11,6 +11,7 @@
+ #include "windows.h"
+ #else
+ #include <sys/wait.h>
++#include <unistd.h>
+ #endif
+
+ AudioData *loadWaveFile(char *file);
+Index: libofa-0.9.3/examples/wavefile.cpp
+===================================================================
+--- libofa-0.9.3.orig/examples/wavefile.cpp
++++ libofa-0.9.3/examples/wavefile.cpp
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+ int ct = 0;
- 68/86: gnu: Add mjpegtools., (continued)
- 68/86: gnu: Add mjpegtools., guix-commits, 2020/07/05
- 85/86: gnu: gtk+-2: Update package definition., guix-commits, 2020/07/05
- 58/86: gnu: Add libtimidity., guix-commits, 2020/07/05
- 51/86: gnu: Add nng., guix-commits, 2020/07/05
- 52/86: gnu: Add ccextractor., guix-commits, 2020/07/05
- 55/86: gnu: Add libmpeg3., guix-commits, 2020/07/05
- 62/86: gnu: Add ffmpeg-2.8., guix-commits, 2020/07/05
- 20/86: gnu: dconf: Update to 0.36.0., guix-commits, 2020/07/05
- 63/86: gnu: Add libvideogfx., guix-commits, 2020/07/05
- 64/86: gnu: Add libde265., guix-commits, 2020/07/05
- 69/86: gnu: Add libofa.,
guix-commits <=
- 74/86: gnu: Add mediasdk., guix-commits, 2020/07/05
- 80/86: gnu: Add zxing-cpp., guix-commits, 2020/07/05
- 86/86: gnu: Add libcloudproviders., guix-commits, 2020/07/05
- 72/86: gnu: Add lksctp-tools., guix-commits, 2020/07/05
- 24/86: gnu: enchant-1.6: Update package definition., guix-commits, 2020/07/05
- 27/86: gnu: fcitx: Update package definition., guix-commits, 2020/07/05
- 36/86: gnu: Add mutest., guix-commits, 2020/07/05
- 47/86: gnu: Add libvisual-plugins., guix-commits, 2020/07/05
- 42/86: gnu: glib-with-documentation: Update package definition., guix-commits, 2020/07/05
- 57/86: gnu: Add flux., guix-commits, 2020/07/05