diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
| commit | cfc70a48027b1b56231df62a30a7da888f33e3ce (patch) | |
| tree | cb2e856d51f1a79822a2b21d8c2cbaea55ae170d /package/upmpdcli | |
| parent | 70874e321dbd50203187c41214cb888507cd6df1 (diff) | |
| parent | aa016797444017d4379a139e39697e38ed2e2357 (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/upmpdcli')
| -rw-r--r-- | package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch | 32 | ||||
| -rw-r--r-- | package/upmpdcli/upmpdcli.hash | 4 | ||||
| -rw-r--r-- | package/upmpdcli/upmpdcli.mk | 2 |
3 files changed, 3 insertions, 35 deletions
diff --git a/package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch b/package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch deleted file mode 100644 index 910ee3c7e..000000000 --- a/package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 69740cf6fe35413edc4b6adc502ba70ce8de8557 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> -Date: Sun, 19 Jul 2015 08:48:13 +0200 -Subject: [PATCH 1/1] Add conditional check for __linux__ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building upmpdcli with certain toolchains using the compiler flag --std=c++0x let gcc not define "linux" or "__linux", but "__linux__". - -Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> ---- - src/closefrom.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/closefrom.cpp b/src/closefrom.cpp -index 4429b20..0cd7957 100644 ---- a/src/closefrom.cpp -+++ b/src/closefrom.cpp -@@ -111,7 +111,7 @@ int libclf_closefrom(int fd0) - } - - /*************************************************************************/ --#elif (defined(linux) || defined(__linux)) -+#elif (defined(linux) || defined(__linux) || defined(__linux__)) - - /* Use /proc/self/fd directory */ - #include <sys/types.h> --- -2.4.6 - diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 549945ee1..762b0af58 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-0.11.0.tar.gz.sha256 -sha256 0f064b7fe498ee56879e606f48b7bafa42381d25fda6b91ef2cb3677effc85b9 upmpdcli-0.11.0.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-0.11.2.tar.gz.sha256 +sha256 595865c306b0076baaff7eb4f76f779119bd8952f53a4e6662157dc83ab70d89 upmpdcli-0.11.2.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 8dde87dc7..c69e01c52 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 0.11.0 +UPMPDCLI_VERSION = 0.11.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING |