summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/mpd/Makefile22
-rw-r--r--package/ympd/patches/patch-CMakeLists_txt4
-rw-r--r--package/ympd/patches/patch-htdocs_mkdata_c35
-rw-r--r--target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch13
-rw-r--r--target/arm/systems/raspberry-pi2
-rw-r--r--target/collections/mpd1
-rw-r--r--target/linux/config/Config.in.audio10
-rw-r--r--target/linux/config/Config.in.i2c16
-rw-r--r--target/linux/config/Config.in.spi13
9 files changed, 90 insertions, 26 deletions
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
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 <stdlib.h>
+ #include <stdio.h>
+-#include <error.h>
+ #include <errno.h>
+ #include <string.h>
+
+@@ -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 <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]);
++ if(argc <= 1) {
++ printf("Usage: ./%s <this_file> <file1> [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)
diff --git a/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch
index a22683a31..eca3a9639 100644
--- a/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch
@@ -110217,19 +110217,6 @@ diff -Nur linux-3.16.2/sound/soc/codecs/Kconfig linux-3.16-rpi/sound/soc/codecs/
select SND_SOC_RT5631 if I2C
select SND_SOC_RT5640 if I2C
select SND_SOC_RT5645 if I2C
-@@ -428,12 +429,6 @@
- config SND_SOC_PCM512x
- tristate
-
--config SND_SOC_PCM512x_I2C
-- tristate "Texas Instruments PCM512x CODECs - I2C"
-- depends on I2C
-- select SND_SOC_PCM512x
-- select REGMAP_I2C
--
- config SND_SOC_PCM512x_SPI
- tristate "Texas Instruments PCM512x CODECs - SPI"
- depends on SPI_MASTER
@@ -449,6 +444,12 @@
default m if SND_SOC_RT5645=m
default m if SND_SOC_RT5651=m
diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi
index 45fd531d3..c0f375f68 100644
--- a/target/arm/systems/raspberry-pi
+++ b/target/arm/systems/raspberry-pi
@@ -12,6 +12,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_SD
+ select ADK_TARGET_WITH_I2C
+ select ADK_TARGET_WITH_SPI
select ADK_PACKAGE_BCM2835_BOOTLOADER
select ADK_TARGET_WITH_ROOT_RW
select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/collections/mpd b/target/collections/mpd
index be6ccf680..456386e8b 100644
--- a/target/collections/mpd
+++ b/target/collections/mpd
@@ -20,6 +20,7 @@ config ADK_PKG_MPD
select ADK_PACKAGE_MPD_WITH_SHOUT
select ADK_PACKAGE_MPD_WITH_CURL
select ADK_PACKAGE_MPD_WITH_SAMPLERATE
+ select ADK_PACKAGE_MPD_WITH_SNDFILE
select ADK_PACKAGE_MPD_WITH_HTTPD
select ADK_PACKAGE_FILE
select ADK_PACKAGE_HTOP
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index d354ba0d3..f9bea1260 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -81,6 +81,10 @@ config ADK_KERNEL_SND_SOC_PCM5102A
boolean
select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+config ADK_KERNEL_SND_SOC_PCM512x_I2C
+ boolean
+ select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+
config ADK_KERNEL_SND_PCM_DMAENGINE
boolean
@@ -165,7 +169,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
select ADK_KERNEL_SND_DMAENGINE_PCM
select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
select ADK_KERNEL_REGMAP_MMIO
- select ADK_KERNEL_SND_SOC_PCM5102A
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -174,8 +177,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
boolean
select ADK_KERNEL_DMA_BCM2708
select ADK_KERNEL_SND_BCM2708_SOC_I2S
+ select ADK_KERNEL_SND_SOC_PCM5102A
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
- default y if ADK_PKG_MPDBOX
default n
config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
@@ -193,7 +196,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
select ADK_KERNEL_DMA_BCM2708
select ADK_KERNEL_SND_BCM2708_SOC_I2S
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
- default y if ADK_PKG_MPDBOX
default n
config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
@@ -201,8 +203,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
boolean
select ADK_KERNEL_DMA_BCM2708
select ADK_KERNEL_SND_BCM2708_SOC_I2S
+ select ADK_KERNEL_SND_SOC_PCM512x_I2C
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
- default y if ADK_PKG_MPDBOX
default n
config ADK_KERNEL_SND_IMX_SOC
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index bc4da73f6..83ef3a1fa 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -7,13 +7,25 @@ config ADK_KERNEL_I2C
config ADK_KERNEL_I2C_CHARDEV
tristate
+config ADK_KERNEL_I2C_BCM2835
+ prompt "I2C driver for Raspberry PI"
+ tristate
+ select ADK_KERNEL_I2C
+ select ADK_KERNEL_REGMAP_I2C
+ select ADK_KERNEL_I2C_CHARDEV
+ depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default n
+ help
+ I2C driver for Raspberry PI.
+
config ADK_KERNEL_I2C_IMX
- prompt "I2C driver for IMX6"
+ prompt "I2C driver for Solidrun IMX6"
tristate
- depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_KERNEL_I2C
select ADK_KERNEL_REGMAP_I2C
select ADK_KERNEL_I2C_CHARDEV
+ depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default n
help
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 12637f9cb..9a6e6e337 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -26,12 +26,23 @@ config ADK_KERNEL_SPI_PXA2XX
tristate
select ADK_KERNEL_SPI
+config ADK_KERNEL_SPI_BCM2835
+ prompt "SPI driver for Raspberry PI"
+ tristate
+ select ADK_KERNEL_SPI
+ select ADK_KERNEL_SPI_MASTER
+ select ADK_KERNEL_SPI_BITBANG
+ depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default n
+
config ADK_KERNEL_SPI_IMX
- prompt "SPI driver for Solidrun Cubox-i/Hummingboard"
+ prompt "SPI driver for Solidrun IMX6"
tristate
select ADK_KERNEL_SPI
select ADK_KERNEL_SPI_MASTER
select ADK_KERNEL_SPI_BITBANG
+ depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default n
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 16:48:02 +0000