From ad017c1401b7fbce74007602c14e7883194218f8 Mon Sep 17 00:00:00 2001 From: Mamay Alexander Date: Wed, 3 Feb 2016 12:11:41 +0600 Subject: [PATCH] deadbeef: update to 0.7.0. --- srcpkgs/deadbeef/files/deadbeef-queue.desktop | 15 --- srcpkgs/deadbeef/patches/musl.patch | 40 ------- srcpkgs/deadbeef/patches/musl_limits_h.patch | 109 ++++++++---------- srcpkgs/deadbeef/template | 13 +-- 4 files changed, 56 insertions(+), 121 deletions(-) delete mode 100644 srcpkgs/deadbeef/files/deadbeef-queue.desktop delete mode 100644 srcpkgs/deadbeef/patches/musl.patch diff --git a/srcpkgs/deadbeef/files/deadbeef-queue.desktop b/srcpkgs/deadbeef/files/deadbeef-queue.desktop deleted file mode 100644 index 2fc76082549..00000000000 --- a/srcpkgs/deadbeef/files/deadbeef-queue.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Name=DeaDBeeF-Enqueue -GenericName=Audio Player -GenericName[pt_BR]=Reprodutor de áudio -GenericName[ru]=Аудио плеер -Comment=Enqueue music to playlist -Comment[pt_BR]=Escute músicas -Comment[ru]=Слушай музыку -Exec=deadbeef --queue %F -MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;audio/x-mpegurl;audio/x-scpls; -Categories=AudioVideo;Player;GTK; -Terminal=false -Type=Application -Icon=deadbeef - diff --git a/srcpkgs/deadbeef/patches/musl.patch b/srcpkgs/deadbeef/patches/musl.patch deleted file mode 100644 index 3de7b1d61a9..00000000000 --- a/srcpkgs/deadbeef/patches/musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6d39333448dd7c48fb3f4e07ff5d7e05d0527fff Mon Sep 17 00:00:00 2001 -From: Carlo Landmeter -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 - #include - #include --#ifdef __linux__ -+#ifdef __GLIBC__ - #include - #endif - #include -@@ -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, ""); diff --git a/srcpkgs/deadbeef/patches/musl_limits_h.patch b/srcpkgs/deadbeef/patches/musl_limits_h.patch index 7a2b6661092..8abbe9c015d 100644 --- a/srcpkgs/deadbeef/patches/musl_limits_h.patch +++ b/srcpkgs/deadbeef/patches/musl_limits_h.patch @@ -1,52 +1,52 @@ -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 - #include - #include -+#include - #include - #include - #include -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 +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 - #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 @@ + #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 #include -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 - #endif - #include -+#include - #include - #include - #include -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 + +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 @@ -55,9 +55,9 @@ diff -ru ./plugins/flac/flac.c ../_patched_deadbeef-0.6.2/plugins/flac/flac.c #include #include #include -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 +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 @@ -65,10 +65,11 @@ diff -ru ./plugins/liboggedit/oggedit_flac.c ../_patched_deadbeef-0.6.2/plugins/ +#include #include #include - #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 + #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 @@ -77,9 +78,9 @@ diff -ru ./plugins/liboggedit/oggedit_internal.c ../_patched_deadbeef-0.6.2/plug #include #include #include -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 +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 @@ -87,15 +88,5 @@ diff -ru ./plugins/liboggedit/oggedit_vorbis.c ../_patched_deadbeef-0.6.2/plugin +#include #include #include - #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 - #include -+#include - #include // for ceil - #if HAVE_SYS_SYSLIMITS_H - #include + #include +Only in ../deadbeef-0.7.0_/plugins/liboggedit: oggedit_vorbis.c.orig diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index 83d7b0f906d..8e31f4f2e5b 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,23 +1,23 @@ # Template file for 'deadbeef'. pkgname=deadbeef -version=0.6.2 -revision=4 +version=0.7.0 +revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-gtk3 --disable-gtk2" +configure_args="--disable-static --disable-gtk2 --disable-oss" hostmakedepends="pkg-config intltool yasm" 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 gtk+3-devel" + pulseaudio-devel faad2-devel libsamplerate-devel imlib2-devel gtk+3-devel + jansson-devel mpg123-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Ultimate Music Player For GNU/Linux" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://deadbeef.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=3433b966683286c03ffbcc79b2201cd517f8dbf6b41da8600778dfa93cd64e1a -patch_args="-p1" +checksum=1dab69d00695b830724dfd8aa38f5cab851dbd02a3d95bce8b7720fdc38dd868 post_configure() { # XXX @@ -26,7 +26,6 @@ post_configure() { post_install() { - vinstall ${FILESDIR}/deadbeef-queue.desktop 644 usr/share/applications # Remove devel stuff. rm -rf ${DESTDIR}/usr/include }