Merge pull request #2942 from sdwalker/variable-cleanup

packages: cleanup Makefile variables

diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile
index d3a7a4a0039f2101b54349dc48a9bd2ca5c60a8b..ba3a2afe2d6dd942e1b8d52bc218a2a9ae1b5b1c 100644 (file)
--- a/libs/libaudiofile/Makefile
+++ b/libs/libaudiofile/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,9 +12,7 @@ PKG_VERSION:=0.3.6
 PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-       http://github.com/downloads/mpruett/audiofile/ \
-       http://www.68k.org/~michael/audiofile/
+PKG_SOURCE_URL:=http://audiofile.68k.org/
 PKG_MD5SUM:=2731d79bec0acef3d30d2fc86b0b72fd
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
@@ -27,7 +25,7 @@ define Package/libaudiofile
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Audio File library
-  URL:=http://www.68k.org/~michael/audiofile/
+  URL:=http://audiofile.68k.org/
   DEPENDS:=+libflac +libstdcpp
 endef
 

diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile
index 8f6f7dcdab36ad0239c11a494179c54020b9cf0f..924809957430c23255e465e1aa9c16ae1d66c13f 100644 (file)
--- a/multimedia/grilo-plugins/Makefile
+++ b/multimedia/grilo-plugins/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=grilo-plugins
-PKG_VERSION:=0.3.1
+PKG_VERSION:=0.3.2
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/
-PKG_MD5SUM:=8e4ef3a6a8f66629d4f2c9fe7a05d8c9
+PKG_MD5SUM:=eb25fbe4be83e77f2308d086177a8f4c
 
 PKG_BUILD_DEPENDS:=glib2 grilo
 

diff --git a/multimedia/grilo-plugins/patches/0001-dmap-Add-album-disc-number-mapping.patch b/multimedia/grilo-plugins/patches/0001-dmap-Add-album-disc-number-mapping.patch
new file mode 100644 (file)
index 0000000..89c3656
--- /dev/null
+++ b/multimedia/grilo-plugins/patches/0001-dmap-Add-album-disc-number-mapping.patch
@@ -0,0 +1,58 @@
+From 3cd7fb6af73ca7fdef2557ad31b5c4180534d775 Mon Sep 17 00:00:00 2001
+From: "W. Michael Petullo" <mike@flyn.org>
+Date: Sat, 9 Jul 2016 09:50:00 -0400
+Subject: [PATCH] dmap: Add album disc number mapping
+
+Signed-off-by: W. Michael Petullo <mike@flyn.org>
+---
+ src/dmap/grl-daap-db.c | 7 +++++++
+ src/dmap/grl-daap.c    | 1 +
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/dmap/grl-daap-db.c b/src/dmap/grl-daap-db.c
+index 4850073..5bcd804 100644
+--- a/src/dmap/grl-daap-db.c
++++ b/src/dmap/grl-daap-db.c
+@@ -161,6 +161,7 @@ grl_daap_db_add (DMAPDb *_db, DMAPRecord *_record)
+ 
+   gint   duration = 0;
+   gint32  bitrate = 0,
++             disc = 0,
+             track = 0;
+   gchar  *id_s    = NULL,
+          *title   = NULL,
+@@ -186,6 +187,8 @@ grl_daap_db_add (DMAPDb *_db, DMAPRecord *_record)
+                &title,
+                "track",
+                &track,
++               "disc",
++               &disc,
+                "location",
+                &url,
+                "has-video",
+@@ -217,6 +220,10 @@ grl_daap_db_add (DMAPDb *_db, DMAPRecord *_record)
+     grl_media_set_bitrate      (media, bitrate);
+     grl_media_set_track_number (media, track);
+ 
++    if (disc != 0) {
++      grl_media_set_album_disc_number (media, disc);
++    }
++
+     if (album) {
+       grl_media_set_album (media, album);
+     }
+diff --git a/src/dmap/grl-daap.c b/src/dmap/grl-daap.c
+index 59aa981..796234d 100644
+--- a/src/dmap/grl-daap.c
++++ b/src/dmap/grl-daap.c
+@@ -365,6 +365,7 @@ grl_daap_source_supported_keys (GrlSource *source)
+ 
+   if (!keys) {
+     keys = grl_metadata_key_list_new (GRL_METADATA_KEY_ALBUM,
++                                      GRL_METADATA_KEY_ALBUM_DISC_NUMBER,
+                                       GRL_METADATA_KEY_ARTIST,
+                                       GRL_METADATA_KEY_BITRATE,
+                                       GRL_METADATA_KEY_DURATION,
+-- 
+2.7.4
+

diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile
index 7e78e3dbecb25ee4b25742664d11b9ed9335a346..66875d5dad35ea9b7a12078aa9c60fc4daa7876d 100644 (file)
--- a/multimedia/grilo/Makefile
+++ b/multimedia/grilo/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=grilo
-PKG_VERSION:=0.3.0
+PKG_VERSION:=0.3.1
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/grilo/0.3/
-PKG_MD5SUM:=f8a51aacc604dcc308e71f8bca4c57ae
+PKG_MD5SUM:=3b6733633e42143ff90fac1fef34cf42
 
 PKG_BUILD_DEPENDS:=glib2 libsoup libxml2
 

diff --git a/multimedia/lcdgrilo/Makefile b/multimedia/lcdgrilo/Makefile
index 256d9fc0fad16f26de230027538761dc42ddd7f9..2706a26178b26205adfcb2bcd4003dcb156b8df3 100644 (file)
--- a/multimedia/lcdgrilo/Makefile
+++ b/multimedia/lcdgrilo/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcdgrilo
-PKG_VERSION:=0.0.9
+PKG_VERSION:=0.0.10
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.flyn.org/projects/lcdgrilo
-PKG_MD5SUM:=61038ca4d94321c72a069749609f295e
+PKG_MD5SUM:=37b0b6519968c2949eae4abfc9030325
 PKG_BUILD_DEPENDS:=+vala
 
 PKG_INSTALL:=1

diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile
index d53c5576f5f6328eb15fada3f1cd16d67e8d885f..a29896608c7e28f10ea6bae096a94503f4c02989 100644 (file)
--- a/net/dmapd/Makefile
+++ b/net/dmapd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dmapd
-PKG_VERSION:=0.0.72
+PKG_VERSION:=0.0.73
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
-PKG_MD5SUM:=0fe290d1bf003296b1ed9dfcc0108d6f
+PKG_MD5SUM:=458adf9d0c0e434fb92ebc8bd9739f68
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=2