diff --git a/multimedia/sound/deadbeef/actions.py b/multimedia/sound/deadbeef/actions.py index 248301a1e5..2f87408070 100644 --- a/multimedia/sound/deadbeef/actions.py +++ b/multimedia/sound/deadbeef/actions.py @@ -4,32 +4,16 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt +from pisi.actionsapi import shelltools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get -j = "-Wno-multichar \ - -Wno-parentheses \ - -Wno-unused-value \ - -Wno-unused-result \ - -Wno-dangling-else \ - -Wno-unused-variable \ - -Wno-stringop-overflow \ - -Wno-misleading-indentation \ - -Wno-unused-but-set-variable \ - -Wno-unused-but-set-variable \ - -Wno-deprecated-declarations \ - -Wno-incompatible-pointer-types \ - " - def setup(): - pisitools.cflags.add(j) - pisitools.cxxflags.add("-Wno-deprecated-declarations -Wno-vla") - - autotools.autoreconf("-fiv") - autotools.configure("--disable-oss") - - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + shelltools.export("CC", "/usr/bin/clang") + shelltools.export("CXX", "/usr/bin/clang++") + shelltools.export("LDFLAGS", "%s -fuse-ld=lld -ldl " % get.LDFLAGS()) + autotools.configure("--disable-oss --disable-coreaudio") def build(): autotools.make() @@ -37,5 +21,5 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "README") +# pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "README") diff --git a/multimedia/sound/deadbeef/files/plugins_vfs_zip_vfs_zip_c.patch b/multimedia/sound/deadbeef/files/plugins_vfs_zip_vfs_zip_c.patch deleted file mode 100644 index b0c5eca7bd..0000000000 --- a/multimedia/sound/deadbeef/files/plugins_vfs_zip_vfs_zip_c.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/plugins/vfs_zip/vfs_zip.c b/plugins/vfs_zip/vfs_zip.c -index 752e7f5..f146867 100644 ---- a/plugins/vfs_zip/vfs_zip.c -+++ b/plugins/vfs_zip/vfs_zip.c -@@ -54,7 +54,7 @@ typedef struct { - int buffer_remaining; - int buffer_pos; - #endif --} zip_file_t; -+} ddb_zip_file_t; - - static const char *scheme_names[] = { "zip://", NULL }; - -@@ -108,8 +108,8 @@ vfs_zip_open (const char *fname) { - return NULL; - } - -- zip_file_t *f = malloc (sizeof (zip_file_t)); -- memset (f, 0, sizeof (zip_file_t)); -+ ddb_zip_file_t *f = malloc (sizeof (ddb_zip_file_t)); -+ memset (f, 0, sizeof (ddb_zip_file_t)); - f->file.vfs = &plugin; - f->z = z; - f->zf = zf; -@@ -122,7 +122,7 @@ vfs_zip_open (const char *fname) { - void - vfs_zip_close (DB_FILE *f) { - trace ("vfs_zip: close\n"); -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - if (zf->zf) { - zip_fclose (zf->zf); - } -@@ -134,7 +134,7 @@ vfs_zip_close (DB_FILE *f) { - - size_t - vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) { -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - // printf ("read: %d\n", size*nmemb); - - size_t sz = size * nmemb; -@@ -167,7 +167,7 @@ vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) { - - int - vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) { -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - // printf ("seek: %lld (%d)\n", offset, whence); - - if (whence == SEEK_CUR) { -@@ -242,13 +242,13 @@ vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) { - - int64_t - vfs_zip_tell (DB_FILE *f) { -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - return zf->offset; - } - - void - vfs_zip_rewind (DB_FILE *f) { -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - zip_fclose (zf->zf); - zf->zf = zip_fopen_index (zf->z, zf->index, 0); - assert (zf->zf); // FIXME: better error handling? -@@ -260,7 +260,7 @@ vfs_zip_rewind (DB_FILE *f) { - - int64_t - vfs_zip_getlength (DB_FILE *f) { -- zip_file_t *zf = (zip_file_t *)f; -+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; - return zf->size; - } - \ No newline at end of file diff --git a/multimedia/sound/deadbeef/pspec.xml b/multimedia/sound/deadbeef/pspec.xml index 68c59c2e43..9f86b8a271 100644 --- a/multimedia/sound/deadbeef/pspec.xml +++ b/multimedia/sound/deadbeef/pspec.xml @@ -8,22 +8,22 @@ PisiLinux Community admins@pisilinux.org + Zlib GPLv2 + LGPLv2.1 app:gui multimedia.sound Audio player for GNU/Linux systems with X11. DeaDBeeF (as in 0xDEADBEEF) is a modular audio player for GNU/Linux, *BSD, OpenSolaris, macOS, and other UNIX-like systems. - - https://sourceforge.net/projects/deadbeef/files/travis/linux/1.8.4/deadbeef-1.8.4.tar.bz2 + + mirrors://sourceforge/project/deadbeef/travis/linux/1.8.5/deadbeef-1.8.5.tar.bz2 - - - intltool atk-devel + lld-devel gtk2-devel gtk3-devel flac-devel @@ -31,6 +31,7 @@ yasm-devel dbus-devel zlib-devel + llvm-clang glib2-devel faad2-devel cairo-devel @@ -50,13 +51,19 @@ opusfile-devel alsa-lib-devel libmp4v2-devel + libsocket-devel libvorbis-devel libsndfile-devel cdparanoia-devel gdk-pixbuf-devel + llvm-clang-devel + libdispatch-devel libsamplerate-devel pulseaudio-libs-devel + + + @@ -85,12 +92,16 @@ libcdio libcddb jansson + freetype opusfile alsa-lib + harfbuzz libvorbis + fontconfig cdparanoia libsndfile gdk-pixbuf + libdispatch libsamplerate pulseaudio-libs @@ -105,6 +116,13 @@ + + 2021-01-10 + 1.8.5 + Version bump. + fury + wascheme@tuta.io + 2020-06-29 1.8.4 diff --git a/multimedia/sound/deadbeef/translations.xml b/multimedia/sound/deadbeef/translations.xml index 123def2cb0..657279b4db 100644 --- a/multimedia/sound/deadbeef/translations.xml +++ b/multimedia/sound/deadbeef/translations.xml @@ -2,7 +2,7 @@ deadbeef - X1 ile GNU / Linux sistemleri için ses çalar + X11 ile GNU / Linux sistemleri için ses çalar Lkki i przejrzysty odtwarzacz plików muzycznych DeaDBeeF (0xDEADBEEF gibi) X11 ile GNU / Linux sistemleri (şimdi olsa da FreeBSD, X olmaksızın düz konsolda çalışır ve OpenSolaris) için bir ses oynatıcısıdır. DeaDBeeF Program pozwala odtwarzać najpopularniejsze formaty muzyki, a także płyty Audio-CD i strumienie audio emitowane za pośrednictwem Internetu. Jego ogromną zaletą jest prostota, dopracowanie oraz minimalne zapotrzebowanie na zasoby systemowe. diff --git a/programming/library/libdispatch/actions.py b/programming/library/libdispatch/actions.py new file mode 100644 index 0000000000..97ea26e512 --- /dev/null +++ b/programming/library/libdispatch/actions.py @@ -0,0 +1,36 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file https://www.gnu.org/licenses/gpl-3.0.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import cmaketools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +j = "-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_THREAD_LIBS_INIT='-lpthread' \ + -DCMAKE_HAVE_THREADS_LIBRARY=ON \ + -DCMAKE_USE_PTHREADS_INIT=ON \ + -DBUILD_TESTING=OFF -LA \ + " + +def setup(): + shelltools.export("CC", "clang") + shelltools.export("CXX", "clang++") + shelltools.makedirs("build") + shelltools.cd("build") + cmaketools.configure(j, sourceDir = '..') + +def build(): + shelltools.cd("build") + cmaketools.make() + +def install(): + shelltools.cd("build") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("../CONTRIBUTING.md", "../INSTALL.md", "../README.md", "../TESTING.md") + diff --git a/programming/library/libdispatch/files/avoid-libkqueue.patch b/programming/library/libdispatch/files/avoid-libkqueue.patch new file mode 100644 index 0000000000..dc482798f7 --- /dev/null +++ b/programming/library/libdispatch/files/avoid-libkqueue.patch @@ -0,0 +1,11 @@ +--- tests/dispatch_test.c.orig ++++ tests/dispatch_test.c +@@ -30,7 +30,7 @@ + #include + #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) + #include +-#if __has_include() ++#if __has_include() && !defined(__linux__) + #define HAS_SYS_EVENT_H 1 + #include + #else diff --git a/programming/library/libdispatch/files/remove-werror.patch b/programming/library/libdispatch/files/remove-werror.patch new file mode 100644 index 0000000000..1c182360e6 --- /dev/null +++ b/programming/library/libdispatch/files/remove-werror.patch @@ -0,0 +1,10 @@ +--- cmake/modules/DispatchCompilerWarnings.cmake.orig 2020-05-12 13:13:59.619689872 +0300 ++++ cmake/modules/DispatchCompilerWarnings.cmake 2020-05-12 13:13:35.216171428 +0300 +@@ -2,7 +2,6 @@ + if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") + # TODO: someone needs to provide the msvc equivalent warning flags + else() +- add_compile_options($<$,$>:-Werror>) + add_compile_options($<$,$>:-Wall>) + add_compile_options($<$,$>:-Wextra>) + diff --git a/programming/library/libdispatch/pspec.xml b/programming/library/libdispatch/pspec.xml new file mode 100644 index 0000000000..5d70aa1774 --- /dev/null +++ b/programming/library/libdispatch/pspec.xml @@ -0,0 +1,62 @@ + + + + + libdispatch + https://apple.github.io/swift-corelibs-libdispatch/ + + fury + wascheme@tuta.io + + Apache-2 + library + programming.library + Grand Central Dispatch. + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE.tar.gz + + + cmake + llvm-clang + llvm-clang-devel + + + avoid-libkqueue.patch + remove-werror.patch + + + + + libdispatch + + + + + /usr/lib + /usr/share/man + /usr/share/doc + + + + + libdispatch-devel + + libdispatch + + + /usr/include + + + + + + 2020-12-31 + 5.3 + First build. + fury + wascheme@tuta.io + + + +