Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8930 from 4fury-c3440d8/updates

Browse Source 
deadbeef.
This commit is contained in:
Kamil ATLI
2021-01-14 12:29:34 +03:00
committed by GitHub
parent 901e86854f baa9881b55
commit d09c03a781
8 changed files with 149 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/sound/deadbeef/actions.py
+6 -22
View File
@@ -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")
multimedia/sound/deadbeef/files/plugins_vfs_zip_vfs_zip_c.patch
-76
View File
@@ -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;
}
multimedia/sound/deadbeef/pspec.xml
+23 -5
View File
@@ -8,22 +8,22 @@
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>Zlib</License>
<License>GPLv2</License>
<License>LGPLv2.1</License>
<IsA>app:gui</IsA>
<PartOf>multimedia.sound</PartOf>
<Summary>Audio player for GNU/Linux systems with X11.</Summary>
<Description>
DeaDBeeF (as in 0xDEADBEEF) is a modular audio player for GNU/Linux, *BSD, OpenSolaris, macOS, and other UNIX-like systems.
</Description>
<Archive sha1sum="798970ac4fe82f87f8ab1a2e135356ab0701e194" type="tarbz2">
https://sourceforge.net/projects/deadbeef/files/travis/linux/1.8.4/deadbeef-1.8.4.tar.bz2
<Archive sha1sum="2d4281a647f3b218965bd4efc6808cfb641dd079" type="tarbz2">
mirrors://sourceforge/project/deadbeef/travis/linux/1.8.5/deadbeef-1.8.5.tar.bz2
</Archive>
<Patches>
<!-- <Patch level="1">plugins_vfs_zip_vfs_zip_c.patch</Patch> -->
</Patches>
<BuildDependencies>
<Dependency>intltool</Dependency>
<Dependency>atk-devel</Dependency>
<Dependency>lld-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>flac-devel</Dependency>
@@ -31,6 +31,7 @@
<Dependency>yasm-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>faad2-devel</Dependency>
<Dependency>cairo-devel</Dependency>
@@ -50,13 +51,19 @@
<Dependency>opusfile-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>libmp4v2-devel</Dependency>
<Dependency>libsocket-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>libsndfile-devel</Dependency>
<Dependency>cdparanoia-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>llvm-clang-devel</Dependency>
<Dependency>libdispatch-devel</Dependency>
<Dependency>libsamplerate-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">missing.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -85,12 +92,16 @@
<Dependency>libcdio</Dependency>
<Dependency>libcddb</Dependency>
<Dependency>jansson</Dependency>
<Dependency>freetype</Dependency>
<Dependency>opusfile</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>libvorbis</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>cdparanoia</Dependency>
<Dependency>libsndfile</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libdispatch</Dependency>
<Dependency>libsamplerate</Dependency>
<Dependency>pulseaudio-libs</Dependency>
</RuntimeDependencies>
@@ -105,6 +116,13 @@
</Package>
<History>
<Update release="14">
<Date>2021-01-10</Date>
<Version>1.8.5</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>wascheme@tuta.io</Email>
</Update>
<Update release="13">
<Date>2020-06-29</Date>
<Version>1.8.4</Version>
multimedia/sound/deadbeef/translations.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<PISI>
<Source>
<Name>deadbeef</Name>
<Summary xml:lang="tr">X1 ile GNU / Linux sistemleri için ses çalar</Summary>
<Summary xml:lang="tr">X11 ile GNU / Linux sistemleri için ses çalar</Summary>
<Summary xml:lang="pl">Lkki i przejrzysty odtwarzacz plików muzycznych</Summary>
<Description xml:lang="tr">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.</Description>
<Description xml:lang="pl">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.</Description>
programming/library/libdispatch/actions.py
+36
View File
@@ -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")
programming/library/libdispatch/files/avoid-libkqueue.patch
+11
View File
@@ -0,0 +1,11 @@
--- tests/dispatch_test.c.orig
+++ tests/dispatch_test.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <unistd.h>
-#if __has_include(<sys/event.h>)
+#if __has_include(<sys/event.h>) && !defined(__linux__)
#define HAS_SYS_EVENT_H 1
#include <sys/event.h>
#else
programming/library/libdispatch/files/remove-werror.patch
+10
View File
@@ -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($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
programming/library/libdispatch/pspec.xml
+62
View File
@@ -0,0 +1,62 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libdispatch</Name>
<Homepage>https://apple.github.io/swift-corelibs-libdispatch/</Homepage>
<Packager>
<Name>fury</Name>
<Email>wascheme@tuta.io</Email>
</Packager>
<License>Apache-2</License>
<IsA>library</IsA>
<PartOf>programming.library</PartOf>
<Summary>Grand Central Dispatch.</Summary>
<Description>Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description>
<Archive sha1sum="f25bc698285cfa84bf24bd8bd5ef9103c4668e0a" type="targz">
https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE.tar.gz
</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency>llvm-clang-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="0">avoid-libkqueue.patch</Patch>
<Patch level="0">remove-werror.patch</Patch>
</Patches>
</Source>
<Package>
<Name>libdispatch</Name>
<RuntimeDependencies>
<!-- <Dependency></Dependency> -->
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libdispatch-devel</Name>
<RuntimeDependencies>
<Dependency release="current">libdispatch</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-12-31</Date>
<Version>5.3</Version>
<Comment>First build.</Comment>
<Name>fury</Name>
<Email>wascheme@tuta.io</Email>
</Update>
</History>
</PISI>