diff options
author | Raghav Gururajan <raghavgururajan@disroot.org> | 2020-07-03 09:16:01 -0400 |
---|---|---|
committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-08-18 22:56:32 +0200 |
commit | 38375ce952902931f626ce6440368dee1ff4f68c (patch) | |
tree | e5ff640fe9b07d363030055086ac76f4b13f926d | |
parent | 502114de11aa6590bdbe8edfff5a6337d39a1e39 (diff) | |
download | guix-38375ce952902931f626ce6440368dee1ff4f68c.tar guix-38375ce952902931f626ce6440368dee1ff4f68c.tar.gz |
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>
-rw-r--r-- | gnu/local.mk | 3 | ||||
-rw-r--r-- | gnu/packages/audio.scm | 32 | ||||
-rw-r--r-- | gnu/packages/patches/libofa-curl.diff | 15 | ||||
-rw-r--r-- | gnu/packages/patches/libofa-ftbfs-1.diff | 45 | ||||
-rw-r--r-- | gnu/packages/patches/libofa-ftbfs-2.diff | 27 |
5 files changed, 122 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d61f272f3e..2a2ac2fa62 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1216,6 +1216,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 d2ffa54e83..f3e94e8eb0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -128,6 +128,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 0000000000..6b1e824fad --- /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 0000000000..4aa712320c --- /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 0000000000..ad61573578 --- /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; |