From 0705de50421e905142d42e0c54ae5bcb6b1d7279 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 6 Oct 2014 07:32:01 +0200 Subject: fix cross-compile on Darwin --- package/ympd/patches/patch-CMakeLists_txt | 4 ++-- package/ympd/patches/patch-htdocs_mkdata_c | 35 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/ympd/patches/patch-htdocs_mkdata_c (limited to 'package') diff --git a/package/ympd/patches/patch-CMakeLists_txt b/package/ympd/patches/patch-CMakeLists_txt index 779a5d26b..762e46601 100644 --- a/package/ympd/patches/patch-CMakeLists_txt +++ b/package/ympd/patches/patch-CMakeLists_txt @@ -1,5 +1,5 @@ --- ympd-1.2.2.orig/CMakeLists.txt 2014-09-28 13:39:27.000000000 +0200 -+++ ympd-1.2.2/CMakeLists.txt 2014-09-28 16:12:53.000000000 +0200 ++++ ympd-1.2.2/CMakeLists.txt 2014-10-05 00:46:09.000000000 +0200 @@ -16,9 +16,6 @@ include_directories(${PROJECT_BINARY_DIR include(CheckCSourceCompiles) @@ -10,7 +10,7 @@ file(GLOB RESOURCES RELATIVE ${PROJECT_SOURCE_DIR} htdocs/js/* -@@ -28,11 +25,11 @@ file(GLOB RESOURCES +@@ -28,11 +25,11 @@ file(GLOB RESOURCES htdocs/index.html ) diff --git a/package/ympd/patches/patch-htdocs_mkdata_c b/package/ympd/patches/patch-htdocs_mkdata_c new file mode 100644 index 000000000..e285e5dc3 --- /dev/null +++ b/package/ympd/patches/patch-htdocs_mkdata_c @@ -0,0 +1,35 @@ +--- ympd-1.2.2.orig/htdocs/mkdata.c 2014-09-28 13:39:27.000000000 +0200 ++++ ympd-1.2.2/htdocs/mkdata.c 2014-10-05 08:52:52.000000000 +0200 +@@ -7,7 +7,6 @@ + + #include + #include +-#include + #include + #include + +@@ -58,16 +57,20 @@ int main(int argc, char *argv[]) + int i, j, buf; + FILE *fd; + +- if(argc <= 1) +- error(EXIT_FAILURE, 0, "Usage: ./%s [file2, ...] > embedded_data.c", argv[0]); ++ if(argc <= 1) { ++ printf("Usage: ./%s [file2, ...] > embedded_data.c", argv[0]); ++ exit(EXIT_FAILURE); ++ } + + for(i = 1; i < argc; i++) + { + printf("static const unsigned char v%d[] = {", i); + + fd = fopen(argv[i], "r"); +- if(!fd) +- error(EXIT_FAILURE, errno, "Failed open file %s", argv[i]); ++ if(!fd) { ++ printf("Failed open file %s", argv[i]); ++ exit(EXIT_FAILURE); ++ } + + j = 0; + while((buf = fgetc(fd)) != EOF) -- cgit v1.2.3 From b0f246e707703580bfe774d357de54ccd1af95d0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 6 Oct 2014 07:32:12 +0200 Subject: fix unresolved dependency to libsndfile --- package/mpd/Makefile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 3b423d3b4..3d7152bcc 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -16,11 +16,12 @@ PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_BUILDDEP_UCLIBC:= libiconv-tiny +PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD -PKG_FLAVOURS_MPD+= WITH_OPUS WITH_PULSE WITH_AVAHI +PKG_FLAVOURS_MPD+= WITH_SNDFILE WITH_OPUS WITH_PULSE WITH_AVAHI PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -109,21 +110,28 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y) PKG_FDEPENDS+= libopus endif -PKGFD_WITH_PULSE:= enable PULSE support +PKGFD_WITH_SNDFILE:= enable sndfile support +PKGFS_WITH_SNDFILE:= libsndfile +PKGFB_WITH_SNDFILE:= libsndfile +ifeq ($(ADK_PACKAGE_MPD_WITH_SNDFILE),y) +PKG_FDEPENDS+= libsndfile +endif + +PKGFD_WITH_PULSE:= enable pulse support PKGFS_WITH_PULSE:= pulseaudio PKGFB_WITH_PULSE:= pulseaudio ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y) PKG_FDEPENDS+= pulseaudio endif -PKGFD_WITH_AVAHI:= enable AVAHI/zeroconf support +PKGFD_WITH_AVAHI:= enable avahi/zeroconf support PKGFS_WITH_AVAHI:= libavahi libdbus PKGFB_WITH_AVAHI:= avahi ifeq ($(ADK_PACKAGE_MPD_WITH_AVAHI),y) PKG_FDEPENDS+= libavahi endif -PKGFD_WITH_HTTPD:= enable HTTP output +PKGFD_WITH_HTTPD:= enable http output include ${ADK_TOPDIR}/mk/package.mk @@ -145,6 +153,12 @@ CONFIGURE_ARGS+= --disable-jack \ --disable-soundcloud \ --enable-inotify +ifneq (${ADK_PACKAGE_MPD_WITH_SNDFILE},) +CONFIGURE_ARGS+= --enable-sndfile +else +CONFIGURE_ARGS+= --disable-sndfile +endif + ifneq (${ADK_PACKAGE_MPD_WITH_HTTPD},) CONFIGURE_ARGS+= --enable-httpd-output else -- cgit v1.2.3 From d4507e62316fd52811181185212bee952db76804 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 5 Oct 2014 11:05:08 -0500 Subject: add basic support to preconfigure wpa2 --- package/base-files/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5ce14b176..0ca11d180 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -110,6 +110,12 @@ endif ifeq (${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP},y) printf "\nauto wlan0\niface wlan0 inet dhcp\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces +ifeq (${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2},y) + printf "\twireless-mode sta\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces + printf "\twireless-ssid ${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID}\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces + printf "\twireless-security wpa2\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces + printf "\twireless-passphrase ${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW}\n\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces +endif endif ifeq (${ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC},y) printf "\nauto wlan0\niface wlan0 inet static\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces -- cgit v1.2.3 From 51985248cd56c21aba0c0f3c980a4141090f4907 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 6 Oct 2014 12:38:52 -0500 Subject: packages should not create anything in /var. this breaks bootup. add an initscript for that. --- package/tcpdump/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'package') diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index c1f06c305..018d0524e 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump PKG_VERSION:= 4.6.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= dab267ec30216a069747d10314079ec7 PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug @@ -43,9 +43,6 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS=s tcpdump-install: ${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin/ -ifneq (${ADK_PACKAGE_TCPDUMP_WITH_CHROOT},) - ${INSTALL_DIR} ${IDIR_TCPDUMP}/var/lib/tcpdump -endif + ${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin include ${ADK_TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From b4d9f7c5bd8873de52128fbd27a2895485399762 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 7 Oct 2014 05:35:58 +0200 Subject: update to latest git --- package/kodi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/kodi/Makefile b/package/kodi/Makefile index a2727cc53..3b9dbeafa 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -5,8 +5,8 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi PKG_VERSION:= 14.0alpha4 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 5bd39942150249d9eccf792d77b92554 +PKG_RELEASE:= 4 +PKG_MD5SUM:= ac54bdac1f5c6dd2a2c75818391740a4 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv -- cgit v1.2.3 From c730821d5684bcde26e262937382a8ceb7615357 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 6 Oct 2014 15:30:02 -0500 Subject: fix perl module loading --- package/p5-image-scale/Makefile | 5 ++++- package/p5-image-scale/patches/patch-src_png_c | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 package/p5-image-scale/patches/patch-src_png_c (limited to 'package') diff --git a/package/p5-image-scale/Makefile b/package/p5-image-scale/Makefile index c21edb1a3..a894e0182 100644 --- a/package/p5-image-scale/Makefile +++ b/package/p5-image-scale/Makefile @@ -25,8 +25,11 @@ include $(ADK_TOPDIR)/mk/perl.mk CONFIG_STYLE:= perl XAKE_FLAGS+= $(PERL_ENV) CONFIGURE_ARGS+= --with-jpeg-includes=${STAGING_TARGET_DIR}/usr/include \ + --with-jpeg-libs=${STAGING_TARGET_DIR}/usr/lib \ --with-png-includes=${STAGING_TARGET_DIR}/usr/include \ - --with-gif-includes=${STAGING_TARGET_DIR}/usr/include + --with-png-libs=${STAGING_TARGET_DIR}/usr/lib \ + --with-gif-includes=${STAGING_TARGET_DIR}/usr/include \ + --with-gif-libs=${STAGING_TARGET_DIR}/usr/lib \ p5-image-scale-install: $(INSTALL_DIR) $(IDIR_P5_IMAGE_SCALE)$(PERL_SITEDIR) diff --git a/package/p5-image-scale/patches/patch-src_png_c b/package/p5-image-scale/patches/patch-src_png_c new file mode 100644 index 000000000..a17a509c1 --- /dev/null +++ b/package/p5-image-scale/patches/patch-src_png_c @@ -0,0 +1,11 @@ +--- Image-Scale-0.08.orig/src/png.c 2011-07-11 10:03:28.000000000 -0500 ++++ Image-Scale-0.08/src/png.c 2014-10-06 15:07:14.824434687 -0500 +@@ -40,7 +40,7 @@ image_png_read_buf(png_structp png_ptr, + } + } + +- png_memcpy(data, buffer_ptr(im->buf), len); ++ memcpy(data, buffer_ptr(im->buf), len); + buffer_consume(im->buf, len); + + goto ok; -- cgit v1.2.3 From 4c469b594cac236767599a778b92c1d16049ef82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 6 Oct 2014 22:39:35 -0500 Subject: some minor fixes for lms, still broken. --- package/logitechmediaserver/Makefile | 5 +++++ package/logitechmediaserver/files/logitechmediaserver.init | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile index daafeefb0..fe339a175 100644 --- a/package/logitechmediaserver/Makefile +++ b/package/logitechmediaserver/Makefile @@ -32,5 +32,10 @@ INSTALL_STYLE:= manual logitechmediaserver-install: $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms $(CP) $(WRKSRC)/* $(IDIR_LOGITECHMEDIASERVER)/opt/lms + @find $(IDIR_LOGITECHMEDIASERVER)/opt/lms -type f -exec chmod 644 {} \; + @find $(IDIR_LOGITECHMEDIASERVER)/opt/lms -type d -exec chmod 755 {} \; + $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms/prefs/plugin + $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms/Logs + $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms/Cache include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/logitechmediaserver/files/logitechmediaserver.init b/package/logitechmediaserver/files/logitechmediaserver.init index 86c3148b2..267c88bb9 100644 --- a/package/logitechmediaserver/files/logitechmediaserver.init +++ b/package/logitechmediaserver/files/logitechmediaserver.init @@ -12,7 +12,7 @@ autostart) exec sh $0 start ;; start) - chown -R squeezeboxserver /opt/lms/prefs + chown -R squeezeboxserver /opt/lms/prefs /opt/lms/Logs /opt/lms/Cache perl /opt/lms/slimserver.pl ;; stop) -- cgit v1.2.3