diff --git a/srcpkgs/deadbeef/patches/fix-narrowing_arm.patch b/srcpkgs/deadbeef/patches/fix-narrowing_arm.patch deleted file mode 100644 index 611099309f..0000000000 --- a/srcpkgs/deadbeef/patches/fix-narrowing_arm.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur ./plugins/adplug/adplug/s3m.cpp ../deadbeef-0.7.2/plugins/adplug/adplug/s3m.cpp ---- ./plugins/adplug/adplug/s3m.cpp 2016-06-19 13:26:18.000000000 +0200 -+++ ../deadbeef-0.7.2/plugins/adplug/adplug/s3m.cpp 2017-07-22 10:38:22.694537750 +0200 -@@ -26,7 +26,7 @@ - #include - #include "s3m.h" - --const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion -+const signed char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; - - const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table -diff -Naur ./plugins/adplug/adplug/s3m.h ../deadbeef-0.7.2/plugins/adplug/adplug/s3m.h ---- ./plugins/adplug/adplug/s3m.h 2016-06-19 13:26:18.000000000 +0200 -+++ ../deadbeef-0.7.2/plugins/adplug/adplug/s3m.h 2017-07-22 10:43:59.836740736 +0200 -@@ -92,7 +92,7 @@ - char filetype[30]; - - private: -- static const char chnresolv[]; -+ static const signed char chnresolv[]; - static const unsigned short notetable[12]; - static const unsigned char vibratotab[32]; - -diff -Naur ./plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp ../deadbeef.old/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp ---- ./plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp 2017-07-22 11:09:15.117275762 +0200 -+++ ../deadbeef.old/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp 2016-06-19 13:26:18.000000000 +0200 -@@ -81,7 +81,7 @@ - '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f' - }; - */ --const int8_t XSID::sampleConvertTable[16] = -+const char XSID::sampleConvertTable[16] = - { - '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03', - '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f' -diff -Naur ./plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h ../deadbeef.old/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h ---- ./plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h 2017-07-22 11:08:43.054046487 +0200 -+++ ../deadbeef.old/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h 2016-06-19 13:26:18.000000000 +0200 -@@ -234,7 +234,7 @@ - uint8_t sidData0x18; - bool _sidSamples; - int8_t sampleOffset; -- static const int8_t sampleConvertTable[16]; -+ static const char sampleConvertTable[16]; - bool wasRunning; - - private: diff --git a/srcpkgs/deadbeef/patches/musl_limits_h.patch b/srcpkgs/deadbeef/patches/musl_limits_h.patch deleted file mode 100644 index 8abbe9c015..0000000000 --- a/srcpkgs/deadbeef/patches/musl_limits_h.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -ru ./plugins/artwork/artwork.c ../deadbeef-0.7.0_/plugins/artwork/artwork.c ---- ./plugins/artwork/artwork.c 2016-01-17 23:10:44.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/artwork/artwork.c 2016-02-03 17:41:23.000000000 +0600 -@@ -27,6 +27,7 @@ - #endif - #include - #include -+#include - #include - #include - #include -Only in ../deadbeef-0.7.0_/plugins/artwork: artwork.c.orig -diff -ru ./plugins/artwork/artwork_internal.c ../deadbeef-0.7.0_/plugins/artwork/artwork_internal.c ---- ./plugins/artwork/artwork_internal.c 2016-01-03 02:28:08.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/artwork/artwork_internal.c 2016-02-03 17:46:29.000000000 +0600 -@@ -26,6 +26,7 @@ - #include "../../config.h" - #endif - #include -+#include - #include - #include - #include -diff -ru ./plugins/artwork/cache.c ../deadbeef-0.7.0_/plugins/artwork/cache.c ---- ./plugins/artwork/cache.c 2016-01-03 02:28:08.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/artwork/cache.c 2016-02-03 17:46:05.000000000 +0600 -@@ -25,6 +25,7 @@ - #include "../../config.h" - #endif - #include -+#include - #include - #include - #include -diff -ru ./plugins/cdda/cdda.c ../deadbeef-0.7.0_/plugins/cdda/cdda.c ---- ./plugins/cdda/cdda.c 2015-07-15 13:06:25.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/cdda/cdda.c 2016-02-03 17:41:23.000000000 +0600 -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - -Only in ../deadbeef-0.7.0_/plugins/cdda: cdda.c.orig -diff -ru ./plugins/flac/flac.c ../deadbeef-0.7.0_/plugins/flac/flac.c ---- ./plugins/flac/flac.c 2016-01-03 02:27:39.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/flac/flac.c 2016-02-03 17:41:23.000000000 +0600 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -ru ./plugins/liboggedit/oggedit_flac.c ../deadbeef-0.7.0_/plugins/liboggedit/oggedit_flac.c ---- ./plugins/liboggedit/oggedit_flac.c 2016-01-03 02:28:08.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/liboggedit/oggedit_flac.c 2016-02-03 17:41:23.000000000 +0600 -@@ -28,6 +28,7 @@ - #include - #endif - #include -+#include - #include - #include - #include -Only in ../deadbeef-0.7.0_/plugins/liboggedit: oggedit_flac.c.orig -diff -ru ./plugins/liboggedit/oggedit_internal.c ../deadbeef-0.7.0_/plugins/liboggedit/oggedit_internal.c ---- ./plugins/liboggedit/oggedit_internal.c 2016-01-03 02:28:08.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/liboggedit/oggedit_internal.c 2016-02-03 17:41:23.000000000 +0600 -@@ -29,6 +29,7 @@ - #endif - #include - #include -+#include - #include - #include - #include -diff -ru ./plugins/liboggedit/oggedit_vorbis.c ../deadbeef-0.7.0_/plugins/liboggedit/oggedit_vorbis.c ---- ./plugins/liboggedit/oggedit_vorbis.c 2016-01-03 02:28:08.000000000 +0600 -+++ ../deadbeef-0.7.0_/plugins/liboggedit/oggedit_vorbis.c 2016-02-03 17:41:23.000000000 +0600 -@@ -28,6 +28,7 @@ - #include - #endif - #include -+#include - #include - #include - #include -Only in ../deadbeef-0.7.0_/plugins/liboggedit: oggedit_vorbis.c.orig diff --git a/srcpkgs/deadbeef/patches/musl_strdupa.patch b/srcpkgs/deadbeef/patches/musl_strdupa.patch new file mode 100644 index 0000000000..6188e10078 --- /dev/null +++ b/srcpkgs/deadbeef/patches/musl_strdupa.patch @@ -0,0 +1,16 @@ +musl strdupa() fails to compile in c++ due to a missing cast +use deadbeef's fallback version instead + +--- strdupa.h ++++ strdupa.h +@@ -26,6 +26,10 @@ + + #include + ++#if defined(__linux__) && !defined(__GLIBC__) ++# undef strdupa ++#endif ++ + #ifndef strdupa + # define strdupa(s) \ + ({ \ diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index 426eedb5b0..740ebe66e1 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,31 +1,28 @@ -# Template file for 'deadbeef'. +# Template file for 'deadbeef' pkgname=deadbeef -version=0.7.2 -revision=7 +version=1.8.0 +revision=1 build_style=gnu-configure -build_options="gtk3" -build_options_default="gtk3" configure_args="--disable-static --disable-oss $(vopt_if gtk3 '--enable-gtk3 --disable-gtk2' '--enable-gtk2 --disable-gtk3')" -hostmakedepends="pkg-config intltool yasm" +hostmakedepends="automake gettext-devel intltool libtool pkg-config sndio yasm + $(vopt_if gtk3 glib-devel)" makedepends=" libSM-devel alsa-lib-devel ffmpeg-devel libvorbis-devel libcurl-devel libjpeg-turbo-devel libpng-devel libmad-devel libflac-devel wavpack-devel libsndfile-devel libcdio-devel libcddb-devel dbus-devel glu-devel pulseaudio-devel faad2-devel libsamplerate-devel imlib2-devel jansson-devel - mpg123-devel libzip-devel $(vopt_if gtk3 gtk+3-devel gtk+-devel)" + mpg123-devel libzip-devel opusfile-devel sndio-devel + $(vopt_if gtk3 gtk+3-devel gtk+-devel)" depends="desktop-file-utils hicolor-icon-theme" short_desc="Ultimate Music Player for GNU/Linux" maintainer="Juan RP " license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://deadbeef.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=8a63abdf00c2f37c33e018ae0b39d391873e037434074b84bb47381bf283c884 - -post_configure() { - # XXX - sed -i 's,^OBJCLD =.*,OBJCLD = $(COMPILE),g' plugins/gtkui/Makefile -} +checksum=8559e53e95bd85172d96bf9a8e7079dc36c16390110470ee1ea7b5d01c431608 +build_options="gtk3" +build_options_default="gtk3" post_install() { vlicense COPYING