From 355de8e874ac2a5455bd210545729a4fe1707a39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 29 Nov 2013 16:05:05 +0100 Subject: add httpd output plugin --- package/mpd/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 5b211bb30..016428204 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.17.6 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= d0da6a6a1d9cf1e8710b6082f6ef7849 PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia @@ -21,7 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz 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 +PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -87,7 +87,7 @@ PKGFD_WITH_SHOUT:= enable Shoutcast output support PKGFS_WITH_SHOUT:= libshout libmp3lame libvorbisenc PKGFB_WITH_SHOUT:= lame libvorbis libshout ifeq ($(ADK_PACKAGE_MPD_WITH_SHOUT),y) -PKG_FDEPENDS+= libshout liblame libvorbisenc +PKG_FDEPENDS+= libshout libmp3lame libvorbisenc endif PKGFD_WITH_CURL:= enable CURL support PKGFS_WITH_CURL:= libcurl @@ -103,6 +103,8 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_SAMPLERATE),y) PKG_FDEPENDS+= libsamplerate endif +PKGFD_WITH_HTTPD:= enable HTTP output + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -110,8 +112,7 @@ $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_F TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE TARGET_CFLAGS+= -std=gnu99 CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --disable-httpd-output \ - --disable-jack \ +CONFIGURE_ARGS+= --disable-jack \ --disable-fifo \ --disable-pulse \ --disable-oss \ @@ -123,6 +124,12 @@ CONFIGURE_ARGS+= --disable-httpd-output \ --enable-inotify \ --with-zeroconf=no +ifneq (${ADK_PACKAGE_MPD_WITH_HTTPD},) +CONFIGURE_ARGS+= --enable-httpd-output +else +CONFIGURE_ARGS+= --disable-httpd-output +endif + ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},) CONFIGURE_ARGS+= --enable-alsa else -- cgit v1.2.3 From c491653a1f9574a42965025805d472c3d145f699 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 29 Nov 2013 16:05:54 +0100 Subject: activate httpd output plugin for mpdbox --- target/packages/pkg-available/mpdbox | 1 + 1 file changed, 1 insertion(+) diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index cedb79b04..1be2e75e0 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -16,6 +16,7 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPD_WITH_SHOUT select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE + select ADK_PACKAGE_MPD_WITH_HTTPD select ADK_PACKAGE_FILE select ADK_PACKAGE_FFMPEG select ADK_PACKAGE_FFPROBE -- cgit v1.2.3 From f31d1245743f5c7616b2fafc119daaf83f0086b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Nov 2013 18:42:39 +0100 Subject: fix xbmc build, it uses distutils to find python include dir --- package/python2/Makefile | 3 +-- package/python2/files/patch-Lib_distutils_sysconfig_py | 10 ---------- package/xcb-proto/Makefile | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 package/python2/files/patch-Lib_distutils_sysconfig_py diff --git a/package/python2/Makefile b/package/python2/Makefile index 1fa0cce94..36bcdf7fc 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -97,6 +97,7 @@ CONFIGURE_ARGS:= --with-threads \ HOST_STYLE:= auto HOST_CONFIGURE_ARGS:= --with-threads \ + --enable-shared \ --disable-toolbox-glue \ --without-cxx-main @@ -105,8 +106,6 @@ hostpost-install: $(STAGING_HOST_DIR)/usr/bin/pgen pre-configure: - (cd $(WRKBUILD) && patch -p1 < \ - $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py ) (cd $(WRKBUILD) && patch -p1 < \ $(TOPDIR)/package/python2/files/patch-Misc_python-config_in ) $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/files/patch-Lib_distutils_sysconfig_py deleted file mode 100644 index 30aae0816..000000000 --- a/package/python2/files/patch-Lib_distutils_sysconfig_py +++ /dev/null @@ -1,10 +0,0 @@ ---- Python-2.7.5.orig/Lib/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200 -+++ Python-2.7.5/Lib/distutils/sysconfig.py 2013-11-03 18:03:53.000000000 +0100 -@@ -76,6 +76,7 @@ def get_python_inc(plat_specific=0, pref - """ - if prefix is None: - prefix = plat_specific and EXEC_PREFIX or PREFIX -+ prefix = re.sub('host_', 'target_', prefix) - - if os.name == "posix": - if python_build: diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 62989d836..2db4b605e 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= XML-XCB protocol descriptions PKG_SECTION:= devel PKG_MD5SUM:= 8d2cdb770129cef563088a90c5bec768 -PKG_BUILDDEP:= python2-host +PKG_BUILDDEP:= autotool python2-host PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev devonly -- cgit v1.2.3 From 4fb59c5e77bac31eecffd009a3726543be95b11e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Nov 2013 18:43:14 +0100 Subject: fix xbmc build, it uses distutils to find python include dir --- package/python2/patches/patch-Lib_distutils_sysconfig_py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 package/python2/patches/patch-Lib_distutils_sysconfig_py diff --git a/package/python2/patches/patch-Lib_distutils_sysconfig_py b/package/python2/patches/patch-Lib_distutils_sysconfig_py new file mode 100644 index 000000000..30aae0816 --- /dev/null +++ b/package/python2/patches/patch-Lib_distutils_sysconfig_py @@ -0,0 +1,10 @@ +--- Python-2.7.5.orig/Lib/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200 ++++ Python-2.7.5/Lib/distutils/sysconfig.py 2013-11-03 18:03:53.000000000 +0100 +@@ -76,6 +76,7 @@ def get_python_inc(plat_specific=0, pref + """ + if prefix is None: + prefix = plat_specific and EXEC_PREFIX or PREFIX ++ prefix = re.sub('host_', 'target_', prefix) + + if os.name == "posix": + if python_build: -- cgit v1.2.3