aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/php5/Makefile3
-rw-r--r--libs/dtndht/patches/001-musl_header.patch30
-rw-r--r--libs/hidapi/Makefile4
-rw-r--r--libs/protobuf/Makefile2
-rw-r--r--sound/mpd/Makefile7
-rw-r--r--utils/crelay/Makefile5
-rw-r--r--utils/crelay/files/crelay.init9
-rw-r--r--utils/crelay/patches/010-link_with_ftdi1.patch4
8 files changed, 46 insertions, 18 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index dee218c5a..0be18c684 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=php
PKG_VERSION:=5.6.12
PKG_RELEASE:=1
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>, Michael Heimpold <mhei@heimpold.de>
PKG_LICENSE:=PHPv3.01
PKG_LICENSE_FILES:=LICENSE
@@ -55,7 +55,6 @@ define Package/php5/Default
CATEGORY:=Languages
TITLE:=PHP5 Hypertext preprocessor
URL:=http://www.php.net/
- MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
DEPENDS:=php5
endef
diff --git a/libs/dtndht/patches/001-musl_header.patch b/libs/dtndht/patches/001-musl_header.patch
new file mode 100644
index 000000000..32eeb6a0a
--- /dev/null
+++ b/libs/dtndht/patches/001-musl_header.patch
@@ -0,0 +1,30 @@
+--- a/dtndht/dtndht.h
++++ b/dtndht/dtndht.h
+@@ -7,6 +7,7 @@ extern "C" {
+
+ #include <stdio.h>
+ #include <sys/socket.h>
++#include <time.h>
+
+ enum dtn_dht_bind_type {
+ BINDNONE = 0, IPV4ONLY = 1, IPV6ONLY = 2, BINDBOTH = 3
+--- a/dtndht/blacklist.c
++++ b/dtndht/blacklist.c
+@@ -6,6 +6,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <arpa/inet.h>
++#include <sys/types.h>
+ #ifdef HAVE_OPENSSL_SHA_H
+ #include <openssl/sha.h>
+ #else
+--- a/dtndht/rating.h
++++ b/dtndht/rating.h
+@@ -12,6 +12,7 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <string.h>
++#include <time.h>
+ #ifdef HAVE_OPENSSL_SHA_H
+ #include <openssl/sha.h>
+ #else
diff --git a/libs/hidapi/Makefile b/libs/hidapi/Makefile
index efdbbf516..e8ef73359 100644
--- a/libs/hidapi/Makefile
+++ b/libs/hidapi/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hidapi
PKG_VERSION:=0.8.0-rc1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/signal11/hidapi.git
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/hidapi
SECTION:=libs
CATEGORY:=Libraries
- DEPENDS:=+libusb-1.0 +libiconv +librt
+ DEPENDS:=+libusb-1.0 +librt $(ICONV_DEPENDS)
TITLE:=Library to talk to HID devices
URL:=http://www.signal11.us/oss/hidapi/
endef
diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile
index 4f45183e2..72133be86 100644
--- a/libs/protobuf/Makefile
+++ b/libs/protobuf/Makefile
@@ -32,7 +32,7 @@ define Package/protobuf
TITLE:=A structured data encoding library
URL:=http://code.google.com/p/protobuf/
DEPENDS:=+zlib +libpthread +libstdcpp
- MAINTAINER:=Obinou <obconseil@gmail.com>
+ MAINTAINER:=Jacob Siverskog <jacob@teenageengineering.com>
endef
define Package/protobuf/description
diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 845360301..52e222867 100644
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpd
PKG_VERSION:=0.19.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.19/
@@ -28,13 +28,14 @@ PKG_CONFIG_DEPENDS:= \
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
define Package/mpd/Default
SECTION:=sound
CATEGORY:=Sound
TITLE:=Music Player Daemon
URL:=http://www.musicpd.org/
- DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient +libstdcpp \
+ DEPENDS:= +glib2 +libcurl +libpthread +libmpdclient +libstdcpp $(ICONV_DEPENDS) \
+libflac +BUILD_PATENTED:libmad +libvorbisidec +AUDIO_SUPPORT:alsa-lib \
+boost +boost-container +libexpat
endef
@@ -151,7 +152,7 @@ CONFIGURE_VARS += \
$(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
-TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv)
ifeq ($(BUILD_VARIANT),full)
diff --git a/utils/crelay/Makefile b/utils/crelay/Makefile
index 59c763f9a..8a5f7dc90 100644
--- a/utils/crelay/Makefile
+++ b/utils/crelay/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=crelay
-PKG_VERSION:=0.8-081415
+PKG_VERSION:=0.9
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ondrej1024/crelay
-PKG_SOURCE_VERSION:=037360cf143d705ea97b32ae22460f346ad2586f
+PKG_SOURCE_VERSION:=V$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -65,6 +65,7 @@ define Package/crelay/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/crelay $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/crelay.init $(1)/etc/init.d/crelay
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/crelay.conf $(1)/etc
endef
$(eval $(call BuildPackage,crelay))
diff --git a/utils/crelay/files/crelay.init b/utils/crelay/files/crelay.init
index 2f4647500..e00396118 100644
--- a/utils/crelay/files/crelay.init
+++ b/utils/crelay/files/crelay.init
@@ -8,17 +8,14 @@ PROG=/usr/bin/${NAME}
USE_PROCD=1
-# Custom relay labels (for Web GUI)
-LABEL1=""
-LABEL2=""
-LABEL3=""
-LABEL4=""
+# Custom relay labels (for Web GUI) are defined in /etc/crelay.conf
start_service() {
procd_open_instance
procd_set_param command "$PROG"
- procd_append_param command -d "$LABEL1 $LABEL2 $LABEL3 $LABEL4"
+ # daemon mode (not daemonized) - starts HTTP server
+ procd_append_param command -d
procd_close_instance
}
diff --git a/utils/crelay/patches/010-link_with_ftdi1.patch b/utils/crelay/patches/010-link_with_ftdi1.patch
index 756d45a9c..bc4ff1ed3 100644
--- a/utils/crelay/patches/010-link_with_ftdi1.patch
+++ b/utils/crelay/patches/010-link_with_ftdi1.patch
@@ -1,10 +1,10 @@
--- a/src/Makefile
+++ b/src/Makefile
-@@ -44,7 +44,7 @@ endif
+@@ -45,7 +45,7 @@ endif
#ifdef DRV_SAINSMART
ifeq ($(DRV_SAINSMART), y)
SRC += relay_drv_sainsmart.c
--LIBS += -lftdi
+-LIBS += -lftdi
+LIBS += -lftdi1
OPTS += -DDRV_SAINSMART
endif
Powered by cgit, Themed by Ted Yin.