diff options
| author | Denis Kozadaev <denis@dilos.org> | 2019-08-25 21:27:14 +0300 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-09-16 01:37:55 +0200 |
| commit | 9bf9f1c773b7427c91457be8d0c714ca9cfc9e3a (patch) | |
| tree | f13370cef5cc76892c28d30394768b2dbe0db4dc /dilos/dependencies/arts/debian/patches | |
| parent | 00eca181440878499643c6ead8d2b407e469db45 (diff) | |
| download | tde-packaging-9bf9f1c773b7427c91457be8d0c714ca9cfc9e3a.tar.gz tde-packaging-9bf9f1c773b7427c91457be8d0c714ca9cfc9e3a.zip | |
DilOS: build arts
Signed-off-by: Denis Kozadaev <denis@dilos.org>
(cherry picked from commit 5efc93b08b19f9942cf616311b05cf1b18538dd2)
Diffstat (limited to 'dilos/dependencies/arts/debian/patches')
| -rw-r--r-- | dilos/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff | 11 | ||||
| -rw-r--r-- | dilos/dependencies/arts/debian/patches/dilos.patch | 52 | ||||
| -rw-r--r-- | dilos/dependencies/arts/debian/patches/series | 2 |
3 files changed, 65 insertions, 0 deletions
diff --git a/dilos/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff b/dilos/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff new file mode 100644 index 000000000..cae8f366d --- /dev/null +++ b/dilos/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff @@ -0,0 +1,11 @@ +Index: b/artsc/artsc.pc.in +=================================================================== +--- a/artsc/artsc.pc.in ++++ b/artsc/artsc.pc.in +@@ -7,5 +7,5 @@ + Name: aRtsC + Description: aRts sound system C support library (TDE) + Version: 0.9.5 +-Libs: -L${libdir} -lartsc @LIBDL@ @USE_THREADS@ @LIBPTHREAD@ @GLIB_LDFLAGS@ @GLIB_LIBADD@ ++Libs: -L${libdir} -lartsc + Cflags: -I${includedir} @GLIB_CFLAGS@ diff --git a/dilos/dependencies/arts/debian/patches/dilos.patch b/dilos/dependencies/arts/debian/patches/dilos.patch new file mode 100644 index 000000000..1f5a84cc7 --- /dev/null +++ b/dilos/dependencies/arts/debian/patches/dilos.patch @@ -0,0 +1,52 @@ +Index: arts/mcop/iomanager.cc +=================================================================== +--- arts.orig/mcop/iomanager.cc ++++ arts/mcop/iomanager.cc +@@ -29,6 +29,9 @@ + #include "thread.h" + #include <stdio.h> + #include <fcntl.h> ++#ifdef __dilos__ ++#include <strings.h> ++#endif /* __dilos__ */ + + #ifdef HAVE_SYS_SELECT_H + #include <sys/select.h> // Needed on some systems. +Index: arts/mcop/CMakeLists.txt +=================================================================== +--- arts.orig/mcop/CMakeLists.txt ++++ arts/mcop/CMakeLists.txt +@@ -67,6 +67,6 @@ set( ${target}_SRCS + tde_add_library( ${target} SHARED + SOURCES ${${target}_SRCS} + VERSION 1.0.0 +- LINK ltdlc-static ${ESOUND_LIBRARIES} ++ LINK ltdlc-static ${ESOUND_LIBRARIES} socket nsl + DESTINATION ${LIB_INSTALL_DIR} + ) +Index: arts/artsc/artsdsp.c +=================================================================== +--- arts.orig/artsc/artsdsp.c ++++ arts/artsc/artsdsp.c +@@ -75,7 +75,7 @@ static int speed = 0; + static int channels = 0; + static int frags; + +-#if defined(HAVE_IOCTL_INT_INT_DOTS) ++#if defined(HAVE_IOCTL_INT_INT_DOTS) || defined(__dilos__) + typedef int ioctl_request_t; + #elif defined(HAVE_IOCTL_INT_ULONG_DOTS) + typedef unsigned long ioctl_request_t; +@@ -120,9 +120,12 @@ static orig_access_ptr orig_access; + static int artsdsp_debug = 0; + static int artsdsp_init = 0; + ++#ifndef __dilos__ + void *mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset); + int munmap(void *start, size_t length); ++#endif /* !__dilos__ */ ++ + #define CHECK_INIT() if(!artsdsp_init) artsdsp_doinit(); + + /* diff --git a/dilos/dependencies/arts/debian/patches/series b/dilos/dependencies/arts/debian/patches/series new file mode 100644 index 000000000..04c06fba2 --- /dev/null +++ b/dilos/dependencies/arts/debian/patches/series @@ -0,0 +1,2 @@ +dilos.patch +12_cleanup_artsc-config.diff |