summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk3
-rw-r--r--mk/vars.mk2
-rw-r--r--package/libx264/Makefile3
-rw-r--r--package/libx264/patches/patch-Makefile11
-rw-r--r--package/libx264/patches/patch-configure8
-rw-r--r--package/openjdk7/Makefile3
-rw-r--r--package/openjdk7/patches/openadk.patch76
-rw-r--r--package/sdl/Makefile6
-rw-r--r--package/taglib/Makefile6
-rw-r--r--package/xbmc/Makefile5
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp17
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp18
-rw-r--r--package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp56
-rw-r--r--package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h45
-rw-r--r--rules.mk1
-rw-r--r--target/config/Config.in.adk6
-rw-r--r--target/linux/config/Config.in.input27
-rw-r--r--toolchain/Config.in16
-rw-r--r--toolchain/Makefile10
-rw-r--r--toolchain/gcc/Makefile8
20 files changed, 241 insertions, 86 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 400125694..77b70a3f8 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -12,12 +12,12 @@ CONFIG_CONFIG_IN = Config.in
CONFIG = config
DEFCONFIG= ADK_DEBUG=n \
ADK_STATIC=n \
+ ADK_WGET_TIMEOUT=180 \
ADK_MAKE_PARALLEL=y \
ADK_MAKE_JOBS=4 \
ADK_LEAVE_ETC_ALONE=n \
ADK_SIMPLE_NETWORK_CONFIG=n \
ADK_USE_CCACHE=n \
- ADK_TOOLCHAIN_GDB=n \
ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_E2FSCK_STATIC=n \
ADK_PACKAGE_KEXECINIT=n \
@@ -36,6 +36,7 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PACKAGE_URLGRABBER=n \
ADK_PACKAGE_LIBSSP=n \
ADK_PACKAGE_OPENAFS=n \
+ ADK_PACKAGE_OPENJDK7=n \
ADK_PKG_XORG=n \
ADK_PKG_MPDBOX=n \
ADK_PKG_DEVELOPMENT=n \
diff --git a/mk/vars.mk b/mk/vars.mk
index 796274bb9..349c1ebb6 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -218,7 +218,7 @@ QUIET:=
else
QUIET:= --quiet
endif
-FETCH_CMD?= wget --timeout=40 -t 3 $(QUIET)
+FETCH_CMD?= wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 $(QUIET)
ifeq ($(ADK_HOST_CYGWIN),y)
EXEEXT:= .exe
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 55bd18868..0fce6390e 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is git checkout from 22.01.2014
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -24,6 +24,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
CONFIGURE_ARGS+= --disable-cli \
+ --enable-asm \
--cross-prefix=$(TARGET_CROSS)
libx264-install:
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
deleted file mode 100644
index cd8a9f198..000000000
--- a/package/libx264/patches/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100
-+++ libx264-1.0.1/Makefile 2014-01-22 11:26:46.000000000 +0100
-@@ -117,7 +117,7 @@ endif
-
- # NEON optims
- ifeq ($(ARCH),ARM)
--ifneq ($(AS),)
-+ifneq ($(ASM),no)
- ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
- common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
- common/arm/predict-a.S
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index ed9d2ed94..09b9f1fff 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -21,11 +21,3 @@
fi
if cc_check '' -fno-tree-vectorize ; then
-@@ -1147,6 +1147,7 @@ bindir=$bindir
- libdir=$libdir
- includedir=$includedir
- ARCH=$ARCH
-+ASM=$asm
- SYS=$SYS
- CC=$CC
- CFLAGS=$CFLAGS
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index ca9e416a5..d96e9ad53 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -102,7 +102,8 @@ OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj
OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip"
OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
- ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
+ ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
+ ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib"
HOST_STYLE:= auto
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 75e291e47..d051a0694 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,6 +1,6 @@
diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in
---- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.000000000 +0200
-+++ icedtea-2.3.12/Makefile.in 2014-01-16 08:54:53.000000000 +0100
+--- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.947711693 +0200
++++ icedtea-2.3.12/Makefile.in 2014-01-31 17:22:30.941371226 +0100
@@ -695,7 +695,7 @@
$(DISTRIBUTION_PATCHES)
@@ -21,8 +21,8 @@ diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in
diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch
--- icedtea-2.3.12.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.12/patches/openadk.patch 2014-01-16 08:55:05.000000000 +0100
-@@ -0,0 +1,546 @@
++++ icedtea-2.3.12/patches/openadk.patch 2014-01-31 17:30:37.666672422 +0100
+@@ -0,0 +1,562 @@
+diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100
@@ -516,32 +516,6 @@ diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/opena
+
+ ifndef JDK_TOPDIR
+ JDK_TOPDIR=$(TOPDIR)/jdk
-+diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200
-++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-14 21:28:27.000000000 +0100
-+@@ -285,7 +285,7 @@
-+ LIBS_VM += $(LIBS)
-+ endif
-+ ifeq ($(ZERO_BUILD), true)
-+- LIBS_VM += $(LIBFFI_LIBS)
-++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
-+ endif
-+ ifeq ($(SHARK_BUILD), true)
-+ LFLAGS_VM += $(LLVM_LDFLAGS)
-+diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
-+--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200
-++++ openjdk-boot/Makefile 2014-01-13 22:15:04.000000000 +0100
-+@@ -53,9 +53,7 @@
-+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-+
-+-ifndef TOPDIR
-+- TOPDIR:=.
-+-endif
-++TOPDIR:=.
-+
-+ ifndef JDK_TOPDIR
-+ JDK_TOPDIR=$(TOPDIR)/jdk
+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2013-07-26 12:31:42.000000000 +0200
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-01-16 08:45:53.000000000 +0100
@@ -569,3 +543,45 @@ diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/opena
+
+ endif
+
++diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200
+++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-31 17:29:43.410522729 +0100
++@@ -285,7 +285,7 @@
++ LIBS_VM += $(LIBS)
++ endif
++ ifeq ($(ZERO_BUILD), true)
++- LIBS_VM += $(LIBFFI_LIBS)
+++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
++ endif
++ ifeq ($(SHARK_BUILD), true)
++ LFLAGS_VM += $(LLVM_LDFLAGS)
++diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk
++--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk 2013-07-25 18:10:09.000000000 +0200
+++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk 2014-01-31 17:29:54.942555812 +0100
++@@ -269,12 +269,6 @@
++ endif # !HEADLESS
++ endif # PLATFORM
++
++-ifeq ($(PLATFORM), linux)
++- # Checking for the X11/extensions headers at the additional location
++- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
++- $(wildcard /usr/include/X11/extensions))
++-endif
++-
++ ifeq ($(PLATFORM), macosx))
++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
++ -I$(OPENWIN_HOME)/include
++diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
++--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200
+++++ openjdk-boot/Makefile 2014-01-31 17:29:43.410522729 +0100
++@@ -53,9 +53,7 @@
++ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
++ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
++
++-ifndef TOPDIR
++- TOPDIR:=.
++-endif
+++TOPDIR:=.
++
++ ifndef JDK_TOPDIR
++ JDK_TOPDIR=$(TOPDIR)/jdk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index bf6f4d06d..7510c02ba 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= sdl
PKG_VERSION:= 1.2.14
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
@@ -32,12 +32,14 @@ $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
HOST_STYLE:= auto
HOST_CONFIGURE_ARGS+= --without-x \
+ --enable-shared \
--disable-cdrom \
--disable-joystick \
--disable-audio \
--disable-video \
--disable-assembly \
- --disable-shared \
+ --disable-input-tslib \
+ --disable-video-directfb \
--disable-video-cocoa \
--disable-video-opengl
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index 402b89c7f..9f323fc54 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= taglib
-PKG_VERSION:= 1.8
+PKG_VERSION:= 1.9.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= dcb8bd1b756f2843e18b1fdf3aaeee15
+PKG_MD5SUM:= 0d35df96822bbd564c5504cb3c2e4d86
PKG_DESCR:= Audio Meta-Data library
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= cmake-host zlib
PKG_URL:= http://taglib.github.com/
-PKG_SITES:= http://openadk.org/distfiles/
+PKG_SITES:= http://taglib.github.io/releases/
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 05026e12b..a4dd831c7 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xbmc
PKG_VERSION:= 12.3
-PKG_RELEASE:= 2
+PKG_RELEASE:= 4
PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
@@ -58,6 +58,9 @@ CONFIGURE_ENV+= DESTDIR='${WRKINST}' \
TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
CONFIGURE_ARGS+= --disable-optical-drive \
--disable-mysql \
+ --enable-mid \
+ --enable-libmp3lame \
+ --enable-libvorbisenc \
--enable-samba \
--enable-ssh \
--enable-nfs \
diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp
new file mode 100644
index 000000000..a8f2af5d8
--- /dev/null
+++ b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp
@@ -0,0 +1,17 @@
+--- xbmc-12.3-Frodo.orig/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/cores/dvdplayer/DVDPlayer.cpp 2014-01-31 17:45:02.259066528 +0100
+@@ -2897,6 +2897,14 @@ bool CDVDPlayer::OpenVideoStream(int iSt
+ if(m_CurrentVideo.id < 0
+ || m_CurrentVideo.hint != hint)
+ {
++ // For audio files, don't open (M)JPEG artwork as video
++ if (m_pInputStream->GetContent().substr(0, 6) == "audio/" && hint.codec == AV_CODEC_ID_MJPEG || hint.codec == AV_CODEC_ID_MJPEGB || hint.codec == AV_CODEC_ID_PNG)
++ {
++ CLog::Log(LOGINFO, "%s - Ignoring video (art) in audio file %s", __FUNCTION__, m_filename.c_str());
++ pStream->disabled = true;
++ pStream->SetDiscard(AVDISCARD_ALL);
++ return false;
++ }
+ if (!m_dvdPlayerVideo.OpenStream(hint))
+ {
+ /* mark stream as disabled, to disallaw further attempts */
diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp
new file mode 100644
index 000000000..c519df088
--- /dev/null
+++ b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp
@@ -0,0 +1,18 @@
+--- xbmc-12.3-Frodo.orig/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/cores/omxplayer/OMXPlayer.cpp 2014-01-31 18:05:09.353171156 +0100
+@@ -3007,7 +3007,14 @@ bool COMXPlayer::OpenVideoStream(int iSt
+ if(m_CurrentVideo.id < 0
+ || m_CurrentVideo.hint != hint)
+ {
+- if (!m_player_video.OpenStream(hint))
++ // for music file, don't open artwork as video
++ bool disabled = false;
++ if (m_pInputStream->GetContent().substr(0, 6) == "audio/" && hint.codec == AV_CODEC_ID_MJPEG || hint.codec == AV_CODEC_ID_MJPEGB || hint.codec == AV_CODEC_ID_PNG)
++ {
++ CLog::Log(LOGINFO, "%s - Ignoring video in audio filetype:%s", __FUNCTION__, m_filename.c_str());
++ disabled = true;
++ }
++ if (disabled || !m_player_video.OpenStream(hint))
+ {
+ /* mark stream as disabled, to disallaw further attempts */
+ CLog::Log(LOGWARNING, "%s - Unsupported stream %d. Stream disabled.", __FUNCTION__, iStream);
diff --git a/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
new file mode 100644
index 000000000..4b8b25efb
--- /dev/null
+++ b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 Team XBMC
+ * http://www.xbmc.org
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#if defined (_LINUX)
+
+#include <stdlib.h>
+#include "LinuxPowerSyscall.h"
+#include "utils/log.h"
+
+CLinuxPowerSyscall::CLinuxPowerSyscall()
+{
+ CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
+}
+
+CLinuxPowerSyscall::~CLinuxPowerSyscall()
+{ }
+
+bool CLinuxPowerSyscall::Powerdown()
+{
+ system("/sbin/poweroff -F");
+ return 0;
+}
+
+bool CLinuxPowerSyscall::Reboot()
+{
+ system("/sbin/reboot -F");
+ return 0;
+}
+
+int CLinuxPowerSyscall::BatteryLevel(void)
+{ }
+
+bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
+{
+ return true;
+}
+
+#endif
+
diff --git a/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
new file mode 100644
index 000000000..959a8119b
--- /dev/null
+++ b/package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
@@ -0,0 +1,45 @@
+#pragma once
+/*
+ * Copyright (C) 2014 Team XBMC
+ * http://www.xbmc.org
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#if defined (_LINUX)
+#include "powermanagement/IPowerSyscall.h"
+
+class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
+{
+public:
+ CLinuxPowerSyscall();
+ ~CLinuxPowerSyscall();
+
+ virtual bool Powerdown();
+ virtual bool Suspend(void) { return false; }
+ virtual bool Hibernate(void) { return false; }
+ virtual bool Reboot();
+
+ virtual bool CanPowerdown(void) { return true; }
+ virtual bool CanSuspend(void) { return false; }
+ virtual bool CanHibernate(void) { return false; }
+ virtual bool CanReboot(void) { return true; }
+ virtual int BatteryLevel(void);
+
+ virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
+};
+#endif
+
diff --git a/rules.mk b/rules.mk
index 2d49a4b09..ce0f0f6c3 100644
--- a/rules.mk
+++ b/rules.mk
@@ -50,6 +50,7 @@ ADK_KERNEL_VERSION:= $(strip $(subst ",, $(ADK_KERNEL_VERSION)))
ADK_PARAMETER_NETCONSOLE_SRC_IP:= $(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_SRC_IP)))
ADK_PARAMETER_NETCONSOLE_DST_IP:= $(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_DST_IP)))
ADK_JFFS2_OPTS:= $(strip $(subst ",, $(ADK_JFFS2_OPTS)))
+ADK_WGET_TIMEOUT:= $(strip $(subst ",, $(ADK_WGET_TIMEOUT)))
ifeq ($(strip ${ADK_HAVE_DOT_CONFIG}),y)
ifneq ($(strip $(wildcard $(TOPDIR)/target/$(ADK_TARGET_ARCH)/target.mk)),)
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 341adbd48..c8f820321 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -38,6 +38,12 @@ config ADK_DISABLE_HONOUR_CFLAGS
help
Disable honour CFLAGS checks.
+config ADK_WGET_TIMEOUT
+ int "Set wget timeout"
+ default 10
+ help
+ set wget timeout
+
config ADK_USE_CCACHE
bool "Use ccache to speedup recompilation"
default n
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index ac66ab230..37ad2172b 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -21,6 +21,14 @@ config ADK_KERNEL_INPUT
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
+config ADK_KERNEL_HID_LOGITECH
+ boolean
+ default n
+
+config ADK_KERNEL_HID_LOGITECH_DJ
+ boolean
+ default n
+
config ADK_KERNEL_KEYBOARD_ATARI
boolean
default y if ADK_TARGET_SYSTEM_ARANYM_M68K
@@ -54,6 +62,7 @@ config ADK_KERNEL_TOUCHSCREEN_ADS7846
config ADK_KERNEL_INPUT_EVDEV
boolean
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
config ADK_KERNEL_INPUT_KEYBOARD
@@ -125,6 +134,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
config ADK_KERNEL_HID_SUPPORT
@@ -136,11 +146,18 @@ config ADK_KERNEL_HID
select ADK_KERNEL_HID_SUPPORT
default n
+config ADK_KERNEL_HID_GENERIC
+ boolean
+ select ADK_KERNEL_HID_SUPPORT
+ default n
+
+
config ADK_KPACKAGE_KMOD_USB_HID
prompt "kmod-usb-hid..................... USB keyboard/mouse support"
tristate
select ADK_KERNEL_INPUT
select ADK_KERNEL_HID
+ select ADK_KERNEL_HID_GENERIC
select ADK_KERNEL_INPUT_KEYBOARD
select ADK_KERNEL_INPUT_MOUSEDEV
select ADK_KERNEL_INPUT_MOUSE
@@ -150,6 +167,15 @@ config ADK_KPACKAGE_KMOD_USB_HID
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default n
+config ADK_KERNEL_LOGITECH_DINOVO
+ prompt "................................. Support for Logitech DiNovo keyboard/mouse"
+ boolean
+ select ADK_KERNEL_HID_LOGITECH
+ select ADK_KERNEL_HID_LOGITECH_DJ
+ default n
+ help
+ Support for Logitech DiNovo keyboard/mouse combination.
+
config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
prompt "kmod-input-keyboard.............. Keyboard support (AT)"
tristate
@@ -171,7 +197,6 @@ config ADK_KPACKAGE_KMOD_INPUT_EVDEV
tristate
select ADK_KERNEL_INPUT
depends on !ADK_KERNEL_INPUT_EVDEV
- default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
endmenu
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6f51c2367..d6a578233 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -7,24 +7,12 @@ menu "Toolchain settings"
config ADK_TOOLCHAIN_GDB
prompt "Enable building of the GNU debugger"
boolean
- default y if !ADK_TARGET_SYSTEM_ATMEL_NGW100
- depends on !ADK_TARGET_SYSTEM_ATMEL_NGW100
+ default y
config ADK_TOOLCHAIN_GCC_CXX
prompt "Enable building of G++ (C++ language support in GCC)"
boolean
- default y if !ADK_TARGET_WITH_MULTILIB
-
-#config ADK_TOOLCHAIN_GCC_JAVA
-# prompt "Enable building of GCJ (Java language support in GCC)"
-# boolean
-# select ADK_PACKAGE_LIBGCJ
-# default n
-#
-#config ADK_TOOLCHAIN_GCC_OBJC
-# prompt "Enable building of Objective C compiler"
-# boolean
-# default n
+ default y
config ADK_TOOLCHAIN_GCC_SSP
prompt "Enable Stack Smashing Protection in GCC"
diff --git a/toolchain/Makefile b/toolchain/Makefile
index be4f38e07..b61133b28 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -4,12 +4,14 @@
# Steps to build toolchains
# 1) build and install binutils
# 2) build and install mpfr, mpc, libelf and gmp
-# 3) build and install gcc c compiler
+# 3) build and install minimal gcc c compiler
# 4) install kernel-headers
# 5) install libc headers
-# 6) build and install full gcc
+# 6) build and install initial static gcc
# 7) build and install full libc
-# 8) build and install gdb debugger
+# 8) build and install full shared gcc
+# 9) rebuild and install full libc (in case of musl)
+# 10) build and install gdb debugger
include $(TOPDIR)/rules.mk
@@ -50,7 +52,7 @@ gcc-configure: $(LIBC)-prepare
$(LIBC)-compile: gcc-configure
gcc-compile: $(LIBC)-install
ifeq ($(ADK_TOOLCHAIN_GDB),y)
-$(LIBC)-fixup: gdb-install
+$(LIBC)-fixup: gcc-install gdb-install
else
$(LIBC)-fixup: gcc-install
endif
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 4044ead03..6328585da 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -95,13 +95,6 @@ LANGUAGES:=c
ifeq ($(ADK_TOOLCHAIN_GCC_CXX),y)
LANGUAGES:=${LANGUAGES},c++
endif
-ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y)
-LANGUAGES:=${LANGUAGES},java
-GCC_CONFOPTS+= --enable-java-home
-endif
-ifeq ($(ADK_TOOLCHAIN_GCC_ADA),y)
-LANGUAGES:=${LANGUAGES},ada
-endif
include ${TOPDIR}/mk/buildhlp.mk
@@ -145,7 +138,6 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
--enable-languages=c \
--disable-shared \
--disable-threads \
- --with-newlib \
--with-sysroot=$(STAGING_TARGET_DIR)
touch $@
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 21:59:09 +0000