From 6a2b91479cefc4cbaa228191ab058d805ca43f2d Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 15 Oct 2012 19:12:12 +0800 Subject: [PATCH 1/5] avrdude: fix depends --- avrdude/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avrdude/Makefile b/avrdude/Makefile index 669d128..1091763 100644 --- a/avrdude/Makefile +++ b/avrdude/Makefile @@ -19,7 +19,7 @@ define Package/avrdude CATEGORY:=Utilities TITLE:=AVR Downloader/UploaDEr URL:=http://www.bsdhome.com/avrdude/ - DEPENDS:=+libncurses +libusb +libreadline +libftdi + DEPENDS:=+libncurses +libusb +libreadline +libftdi +libusb-1.0 endef define Package/avrdude/description From f7f72e3071d3dc28e01af74034ed28e05ef0045e Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 15 Oct 2012 22:04:54 +0800 Subject: [PATCH 2/5] nanonote-files: mtd.nn: improvement on mount --- nanonote-files/base-files/usr/bin/mtd.nn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nanonote-files/base-files/usr/bin/mtd.nn b/nanonote-files/base-files/usr/bin/mtd.nn index aa62ae7..d5c7739 100755 --- a/nanonote-files/base-files/usr/bin/mtd.nn +++ b/nanonote-files/base-files/usr/bin/mtd.nn @@ -1,6 +1,6 @@ #!/bin/sh -__VERSION__=2011-03-07 +__VERSION__=2012-10-15 if [ "$1" == "flash" ] && [ "$#" == "3" ]; then case "$2" in @@ -43,8 +43,8 @@ if [ "$1" == "mount" ] && [ "$#" == "3" ]; then exit 1 fi - ubiattach /dev/ubi_ctrl -m ${PARTITION} - DEV_UBI=`dmesg | grep "UBI: attached mtd${PARTITION} to" | cut -d ":" -f 2 | cut -d " " -f 5` + ubiattach /dev/ubi_ctrl -m ${PARTITION} > /dev/null 2>&1 + DEV_UBI=`dmesg | grep "UBI: attached mtd${PARTITION} to" | tail -n 1 | cut -d ":" -f 2 | cut -d " " -f 5` mount -t ubifs ${DEV_UBI}_0 $MOUNT_POINT exit 0 fi From e0f74ab25434faf9c88ed46aadb8dac8c399e101 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Tue, 16 Oct 2012 10:15:45 +0800 Subject: [PATCH 3/5] mplayer disable libgsm --- mplayer/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/mplayer/Makefile b/mplayer/Makefile index 9aeacf6..74d83b7 100644 --- a/mplayer/Makefile +++ b/mplayer/Makefile @@ -83,6 +83,7 @@ CONFIGURE_ARGS := --target=mips \ --disable-vm \ --disable-vdpau \ --disable-gl \ + --disable-libgsm \ --disable-xf86keysym \ --disable-ossaudio \ --enable-alsa \ From 5faa9e4d0ce9938b716249c4d997e0ace104e6b1 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Tue, 16 Oct 2012 10:15:54 +0800 Subject: [PATCH 4/5] libggi: fix depends --- libggi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libggi/Makefile b/libggi/Makefile index c3ca1c1..c1d7edd 100644 --- a/libggi/Makefile +++ b/libggi/Makefile @@ -39,7 +39,7 @@ endef define Package/libggi $(call Package/libggi/Default) TITLE += (library) - DEPENDS:=+libgii +libncurses +svgalib + DEPENDS:=+libgii +libncurses +svgalib +libaa #+directfb endef From fe641a39a23b7cba913826851f556b813e227f52 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Tue, 16 Oct 2012 11:12:44 +0800 Subject: [PATCH 5/5] mplayer: fix deps --- mplayer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mplayer/Makefile b/mplayer/Makefile index 74d83b7..fd828e9 100644 --- a/mplayer/Makefile +++ b/mplayer/Makefile @@ -48,7 +48,7 @@ define Package/MPlayer CATEGORY:=Multimedia TITLE:=MPlayer, the movie player URL:=http://www.mplayerhq.hu - DEPENDS:=+libjpeg +libpng +directfb +zlib +libsdl +libfreetype +fontconfig $(ICONV_DEPENDS) +BUILD_PATENTED:libmad +BUILD_PATENTED:libmpg123 +libaa +giflib +fribidi +libtheora +libggi +PACKAGE_libspeex:libspeex + DEPENDS:=+libjpeg +libpng +directfb +zlib +libsdl +libfreetype +fontconfig $(ICONV_DEPENDS) +BUILD_PATENTED:libmad +BUILD_PATENTED:libmpg123 +libaa +giflib +fribidi +libtheora +libggi +PACKAGE_libspeex:libspeex +liblzo endef define Package/MPlayer/description