diff options
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | package/cifs-utils/Makefile | 1 | ||||
| -rw-r--r-- | package/ffmpeg/Makefile | 6 | ||||
| -rw-r--r-- | package/ffmpeg/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/mpd/Makefile | 2 | ||||
| -rw-r--r-- | package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c | 11 | ||||
| -rw-r--r-- | package/php/Makefile | 4 | ||||
| -rwxr-xr-x | scripts/install-rpi.sh | 19 | ||||
| -rw-r--r-- | target/packages/pkg-available/mpdbox | 2 |
9 files changed, 34 insertions, 23 deletions
diff --git a/mk/build.mk b/mk/build.mk index ffafca786..5dcfa0818 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -46,6 +46,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_VIRTINST=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ + ADK_PKG_DESKTOP=n \ ADK_PKG_LAPTOP=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 5e77fafb5..189a460be 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 371e007a201be90c16497cd9bd5e2553 PKG_DESCR:= CIFS utilities PKG_SECTION:= net/fs +PKG_DEPENDS:= kmod-cifs PKG_URL:= https://wiki.samba.org/index.php/LinuxCIFS_utils PKG_SITES:= ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 99b5cb558..bedb412b9 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 0.10 -PKG_RELEASE:= 2 -PKG_MD5SUM:= dc665cc599a739e3c5262ccdac13d129 +PKG_VERSION:= 2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 13a0feb74474f89052f6b8ba1bce46be PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure deleted file mode 100644 index a2b80f82c..000000000 --- a/package/ffmpeg/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- ffmpeg-0.8.3.orig/configure 2011-09-07 15:34:40.000000000 +0200 -+++ ffmpeg-0.8.3/configure 2011-09-16 05:19:35.928726043 +0200 -@@ -2947,7 +2947,7 @@ enabled libxavs && require libxavs x - enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore - enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib - --SDL_CONFIG="${cross_prefix}sdl-config" -+SDL_CONFIG="${sysroot}/usr/bin/sdl-config" - if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then - check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && - enable sdl && diff --git a/package/mpd/Makefile b/package/mpd/Makefile index d76fd684c..e1e4cad3c 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.17.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ab408a61f49f215ce77ed0cf1deed6e1 PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia diff --git a/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c b/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c new file mode 100644 index 000000000..0114216ad --- /dev/null +++ b/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c @@ -0,0 +1,11 @@ +--- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c 2013-04-08 20:01:53.000000000 +0200 ++++ mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c 2013-07-10 11:02:20.000000000 +0200 +@@ -44,6 +44,8 @@ + #include <libavutil/dict.h> + #endif + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + #undef G_LOG_DOMAIN + #define G_LOG_DOMAIN "ffmpeg" + diff --git a/package/php/Makefile b/package/php/Makefile index b553c5c35..05b97257b 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.4.14 +PKG_VERSION:= 5.4.17 PKG_RELEASE:= 1 -PKG_MD5SUM:= 08df8196af12bc850409a7bff13bf8f0 +PKG_MD5SUM:= cc698032dcdcb9ad158edcc90fe798d6 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang PKG_DEPENDS:= libpthread librt libgcc diff --git a/scripts/install-rpi.sh b/scripts/install-rpi.sh index a8aa22f2d..d104f5431 100755 --- a/scripts/install-rpi.sh +++ b/scripts/install-rpi.sh @@ -17,6 +17,16 @@ else exit 1 fi +printf "Checking if sfdisk is installed" +sfdisk=$(which sfdisk) + +if [ ! -z $sfdisk -a -x $sfdisk ];then + printf "...okay\n" +else + printf "...failed\n" + exit 1 +fi + printf "Checking if mke2fs is installed" mke2fs=$(which mke2fs) @@ -88,14 +98,13 @@ rootpart=${1}2 $parted -s $1 mklabel msdos sleep 2 maxsize=$(env LC_ALL=C $parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') -rootsize=$(($maxsize-2)) +rootsize=$(($maxsize-16)) $parted -s $1 unit cyl mkpart primary fat32 -- 0 16 -$parted -s $1 unit cyl mkpart primary ext2 -- 16 -2 -#$parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize +$parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize +$parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize $parted -s $1 set 1 boot on -#$sfdisk --change-id $1 1 27 -#$sfdisk --change-id $1 3 88 +$sfdisk --change-id $1 3 88 sleep 2 mkfs.vfat ${1}1 $mke2fs ${1}2 diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index 393406aab..68636c3b3 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -23,10 +23,10 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_PHP_MOD_SQLITE select ADK_PACKAGE_PHP_MOD_ZLIB select ADK_PACKAGE_PHP_FASTCGI - select ADK_PACKAGE_VSFTPD select ADK_PACKAGE_SCREEN select ADK_PACKAGE_VIM select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_MKSH select ADK_PACKAGE_MKSH_FULL select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686 + select ADK_PACKAGE_CIFS_UTILS |