summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackage/base-files/src/etc/init.d/umount2
-rw-r--r--package/mpd/Makefile3
-rw-r--r--package/pcre/Makefile4
-rw-r--r--package/polarssl/Makefile2
-rw-r--r--package/xbmc/Makefile4
5 files changed, 8 insertions, 7 deletions
diff --git a/package/base-files/src/etc/init.d/umount b/package/base-files/src/etc/init.d/umount
index bcd545999..49bd5a020 100755
--- a/package/base-files/src/etc/init.d/umount
+++ b/package/base-files/src/etc/init.d/umount
@@ -5,7 +5,7 @@ case $1 in
autostop)
cd /
sync
- for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }');do
+ for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }'|grep -v none);do
umount $i 2>/dev/null
done
;;
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index abd47f4e7..39cf4b0c8 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mpd
PKG_VERSION:= 0.17.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b68be330deeb23989c08a9fefd9fcdeb
PKG_DESCR:= A music player daemon
PKG_SECTION:= multimedia
@@ -117,6 +117,7 @@ CONFIGURE_ARGS+= --disable-httpd-output \
--disable-wavpack \
--disable-sqlite \
--disable-mpg123 \
+ --disable-soundcloud \
--with-zeroconf=no
ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 3ff017f6e..80e856b57 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -20,8 +20,8 @@ PKGSD_LIBPCRECPP:= PCRE c++ library
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRE_DEV},${PKGSC_LIBPCRE_DEV}))
XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
diff --git a/package/polarssl/Makefile b/package/polarssl/Makefile
index 145ae67ef..ade6f273f 100644
--- a/package/polarssl/Makefile
+++ b/package/polarssl/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 985151639b1ca037293f06da44fbc6bc
PKG_DESCR:= embedded SSL/TLS library
PKG_SECTION:= libs
PKG_URL:= https://polarssl.org/
-PKG_SITES:= https://polarssl.org/download/
+PKG_SITES:= http://www.openadk.org/distfiles/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-gpl.tgz
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 5efdbfb40..3712c7336 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
PKG_DEPENDS:= boost boost-shared libffmpeg python2 libstdcxx
-PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad
+PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus
PKG_DEPENDS+= libjpeg libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng
@@ -21,7 +21,7 @@ PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+= bcm2835-vc libgpg-error
+PKG_BUILDDEP+= bcm2835-vc libgpg-error dbus
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://mirrors.xbmc.org/releases/source/