Merge pull request #2189 from MamayAlexander/deadbeef

deadbeef: unbreak musl

srcpkgs/deadbeef/patches/musl.patch

@@ -0,0 +1,40 @@
+From 6d39333448dd7c48fb3f4e07ff5d7e05d0527fff Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Wed, 29 Oct 2014 10:36:57 +0100
+Subject: [PATCH] musl libc does not have execinfo.h
+
+---
+ main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/main.c b/main.c
+index d7dab49..797889c 100644
+--- a/main.c
++++ b/main.c
+@@ -51,7 +51,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/errno.h>
+ #include <signal.h>
+-#ifdef __linux__
++#ifdef __GLIBC__
+ #include <execinfo.h>
+ #endif
+ #include <unistd.h>
+@@ -642,7 +642,7 @@ player_mainloop (void) {
+     }
+ }
+ 
+-#ifdef __linux__
++#ifdef __GLIBC__
+ void
+ sigsegv_handler (int sig) {
+     fprintf (stderr, "Segmentation Fault\n");
+@@ -761,7 +761,7 @@ main (int argc, char *argv[]) {
+     }
+ #endif
+ 
+-#ifdef __linux__
++#ifdef __GLIBC__
+     signal (SIGSEGV, sigsegv_handler);
+ #endif
+     setlocale (LC_ALL, "");

srcpkgs/deadbeef/patches/musl_limits_h.patch

@@ -0,0 +1,101 @@
+diff -ru ./conf.c ../_patched_deadbeef-0.6.2/conf.c
+--- ./conf.c	2014-08-05 17:54:03.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/conf.c	2015-08-05 13:56:05.209000000 +0000
+@@ -29,6 +29,7 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <inttypes.h>
+ #include <errno.h>
+ #include <unistd.h>
+Only in ../_patched_deadbeef-0.6.2/: main.c.orig
+Only in ./: musl_limits_h.patch
+diff -ru ./plugins/artwork/artwork.c ../_patched_deadbeef-0.6.2/plugins/artwork/artwork.c
+--- ./plugins/artwork/artwork.c	2014-07-31 19:03:51.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/artwork/artwork.c	2015-08-05 14:20:35.774000000 +0000
+@@ -27,6 +27,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #ifdef __linux__
+diff -ru ./plugins/cdda/cdda.c ../_patched_deadbeef-0.6.2/plugins/cdda/cdda.c
+--- ./plugins/cdda/cdda.c	2014-07-12 20:30:07.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/cdda/cdda.c	2015-08-05 14:17:37.715000000 +0000
+@@ -23,6 +23,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ #include <assert.h>
+ #include <sys/types.h>
+diff -ru ./plugins/converter/converter.c ../_patched_deadbeef-0.6.2/plugins/converter/converter.c
+--- ./plugins/converter/converter.c	2014-07-31 19:16:23.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/converter/converter.c	2015-08-05 13:56:05.209000000 +0000
+@@ -26,6 +26,7 @@
+ #include <sys/syslimits.h>
+ #endif
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -ru ./plugins/flac/flac.c ../_patched_deadbeef-0.6.2/plugins/flac/flac.c
+--- ./plugins/flac/flac.c	2014-08-05 17:54:03.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/flac/flac.c	2015-08-05 14:15:56.192000000 +0000
+@@ -36,6 +36,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <stdbool.h>
+ #include <math.h>
+ #include <FLAC/stream_decoder.h>
+diff -ru ./plugins/liboggedit/oggedit_flac.c ../_patched_deadbeef-0.6.2/plugins/liboggedit/oggedit_flac.c
+--- ./plugins/liboggedit/oggedit_flac.c	2014-07-31 19:02:29.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/liboggedit/oggedit_flac.c	2015-08-05 14:13:00.237000000 +0000
+@@ -28,6 +28,7 @@
+ #include <config.h>
+ #endif
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include "oggedit_internal.h"
+diff -ru ./plugins/liboggedit/oggedit_internal.c ../_patched_deadbeef-0.6.2/plugins/liboggedit/oggedit_internal.c
+--- ./plugins/liboggedit/oggedit_internal.c	2014-07-31 19:02:29.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/liboggedit/oggedit_internal.c	2015-08-05 14:10:49.465000000 +0000
+@@ -29,6 +29,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <libgen.h>
+diff -ru ./plugins/liboggedit/oggedit_vorbis.c ../_patched_deadbeef-0.6.2/plugins/liboggedit/oggedit_vorbis.c
+--- ./plugins/liboggedit/oggedit_vorbis.c	2014-07-31 19:02:29.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/liboggedit/oggedit_vorbis.c	2015-08-05 14:12:05.786000000 +0000
+@@ -28,6 +28,7 @@
+ #include <config.h>
+ #endif
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include "oggedit_internal.h"
+diff -ru ./plugins/m3u/m3u.c ../_patched_deadbeef-0.6.2/plugins/m3u/m3u.c
+--- ./plugins/m3u/m3u.c	2014-07-31 19:02:29.000000000 +0000
++++ ../_patched_deadbeef-0.6.2/plugins/m3u/m3u.c	2015-08-05 13:56:05.209000000 +0000
+@@ -26,6 +26,7 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <math.h> // for ceil
+ #if HAVE_SYS_SYSLIMITS_H
+ #include <sys/syslimits.h>

srcpkgs/deadbeef/template

@@ -1,7 +1,7 @@
 # Template file for 'deadbeef'.
 pkgname=deadbeef
 version=0.6.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3 --disable-gtk2"
 hostmakedepends="pkg-config intltool yasm"
@@ -17,11 +17,14 @@ license="GPL-2, LGPL-2.1"
 homepage="http://deadbeef.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3433b966683286c03ffbcc79b2201cd517f8dbf6b41da8600778dfa93cd64e1a
+patch_args="-p1"
 
 post_configure() {
 	# XXX
 	sed -i 's,^OBJCLD =.*,OBJCLD = $(COMPILE),g' plugins/gtkui/Makefile
 }
+
+
 post_install() {
 	vinstall ${FILESDIR}/deadbeef-queue.desktop 644 usr/share/applications
 	# Remove devel stuff.