From dfed1fd20f9fbfa453aa7ff54356597d6d3e05b9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 6 Dec 2014 02:58:35 +0100 Subject: add basic bits for c6x toolchains support --- mk/vars.mk | 3 + target/arch.lst | 1 + target/c6x/Makefile | 9 ++ target/c6x/systems/toolchain-c6x | 11 ++ target/c6x/uclibc.config | 248 ++++++++++++++++++++++++++++++++++ target/config/Config.in.cpu | 4 + target/config/Config.in.endian.choice | 2 +- target/config/Config.in.toolchain | 4 +- 8 files changed, 280 insertions(+), 2 deletions(-) create mode 100644 target/c6x/Makefile create mode 100644 target/c6x/systems/toolchain-c6x create mode 100644 target/c6x/uclibc.config diff --git a/mk/vars.mk b/mk/vars.mk index 18a0d6199..e57c4f93e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -64,6 +64,9 @@ ADK_TARGET_LINUXTYPE:= linux endif GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_VENDOR)-$(ADK_TARGET_LINUXTYPE)-$(ADK_TARGET_SUFFIX) +ifeq ($(ADK_LINUX_C6X),y) +GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_LINUXTYPE) +endif TARGET_CROSS:= $(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} \ diff --git a/target/arch.lst b/target/arch.lst index fd5c9f80c..eb4a4a77e 100644 --- a/target/arch.lst +++ b/target/arch.lst @@ -4,6 +4,7 @@ arc arm avr32 bfin +c6x cris m68k microblaze diff --git a/target/c6x/Makefile b/target/c6x/Makefile new file mode 100644 index 000000000..ebc17340e --- /dev/null +++ b/target/c6x/Makefile @@ -0,0 +1,9 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk + diff --git a/target/c6x/systems/toolchain-c6x b/target/c6x/systems/toolchain-c6x new file mode 100644 index 000000000..f2a352446 --- /dev/null +++ b/target/c6x/systems/toolchain-c6x @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_C6X + bool "Toolchain only" + select ADK_c6x + select ADK_toolchain_c6x + select ADK_CPU_C6X + select ADK_TARGET_TOOLCHAIN + select ADK_TARGET_PACKAGE_TXZ + select ADK_TARGET_UCLINUX + help + C6X toolchain. + diff --git a/target/c6x/uclibc.config b/target/c6x/uclibc.config new file mode 100644 index 000000000..9915cd324 --- /dev/null +++ b/target/c6x/uclibc.config @@ -0,0 +1,248 @@ +# +# Automatically generated file; DO NOT EDIT. +# uClibc 1.0.0-git C Library Configuration +# +# TARGET_alpha is not set +# TARGET_arc is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +TARGET_c6x=y +# TARGET_cris is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_metag is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="c6x" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_CRIS is not set +# CONFIG_CRISV32 is not set +CONFIG_GENERIC_C6X=y +# CONFIG_TMS320C64X is not set +# CONFIG_TMS320C64XPLUS is not set +TARGET_SUBARCH="" +UCLIBC_FORMAT_DSBT_ELF=y +# UCLIBC_FORMAT_FLAT is not set +# UCLIBC_FORMAT_FLAT_SEP_DATA is not set +# UCLIBC_FORMAT_SHARED_FLAT is not set +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_NO_MMU=y + +# +# Target CPU lacks a memory management unit (MMU) +# +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +# DO_XSI_MATH is not set +UCLIBC_HAS_FENV=y +KERNEL_HEADERS="" +UCLIBC_UCLINUX_BROKEN_MUNMAP=y +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +DOPIC=y +HAVE_SHARED=y +FORCE_SHAREABLE_TEXT_SEGMENTS=y +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_ENV_SUPPORT is not set +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# LDSO_STANDALONE_SUPPORT is not set +# LDSO_PRELINK_SUPPORT is not set +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +LDSO_SAFE_RUNPATH=y +LDSO_SEARCH_INTERP_PATH=y +LDSO_LD_LIBRARY_PATH=y +# LDSO_NO_CLEANUP is not set +UCLIBC_CTOR_DTOR=y +# LDSO_GNU_HASH_SUPPORT is not set +# HAS_NO_THREADS is not set +# LINUXTHREADS_OLD is not set +# LINUXTHREADS_NEW is not set +UCLIBC_HAS_THREADS_NATIVE=y +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +UCLIBC_HAS_SYSLOG=y +UCLIBC_HAS_LFS=y +MALLOC=y +# MALLOC_SIMPLE is not set +# MALLOC_STANDARD is not set +MALLOC_GLIBC_COMPAT=y +UCLIBC_HAS_OBSTACK=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +UCLIBC_SUSV2_LEGACY=y +UCLIBC_SUSV3_LEGACY=y +# UCLIBC_SUSV3_LEGACY_MACROS is not set +UCLIBC_SUSV4_LEGACY=y +# UCLIBC_STRICT_HEADERS is not set +# UCLIBC_HAS_STUBS is not set +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UCLIBC_HAS_PTY=y +ASSUME_DEVPTS=y +UNIX98PTY_ONLY=y +UCLIBC_HAS_GETPT=y +UCLIBC_HAS_LIBUTIL=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" +UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y + +# +# Advanced Library Settings +# +UCLIBC_PWD_BUFFER_SIZE=256 +UCLIBC_GRP_BUFFER_SIZE=256 + +# +# Support various families of functions +# +UCLIBC_LINUX_MODULE_26=y +UCLIBC_LINUX_SPECIFIC=y +UCLIBC_HAS_GNU_ERROR=y +UCLIBC_BSD_SPECIFIC=y +UCLIBC_HAS_BSD_ERR=y +UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y +# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set +# UCLIBC_NTP_LEGACY is not set +UCLIBC_SV4_DEPRECATED=y +UCLIBC_HAS_REALTIME=y +UCLIBC_HAS_ADVANCED_REALTIME=y +UCLIBC_HAS_EPOLL=y +UCLIBC_HAS_XATTR=y +# UCLIBC_HAS_PROFILING is not set +UCLIBC_HAS_CRYPT_IMPL=y +# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set +# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set +UCLIBC_HAS_CRYPT=y +UCLIBC_HAS_NETWORK_SUPPORT=y +UCLIBC_HAS_SOCKET=y +UCLIBC_HAS_IPV4=y +UCLIBC_HAS_IPV6=y +# UCLIBC_HAS_RPC is not set +UCLIBC_USE_NETLINK=y +UCLIBC_SUPPORT_AI_ADDRCONFIG=y +UCLIBC_HAS_BSD_RES_CLOSE=y +UCLIBC_HAS_COMPAT_RES_STATE=y +# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set +UCLIBC_HAS_RESOLVER_SUPPORT=y +UCLIBC_HAS_LIBRESOLV_STUB=y +UCLIBC_HAS_LIBNSL_STUB=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +UCLIBC_HAS_STDIO_BUFSIZ_4096=y +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +# UCLIBC_HAS_REGEX_OLD is not set +UCLIBC_HAS_FNMATCH=y +# UCLIBC_HAS_FNMATCH_OLD is not set +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_NFTW=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_FTS=y +UCLIBC_HAS_GLOB=y +UCLIBC_HAS_GNU_GLOB=y +UCLIBC_HAS_UTMPX=y + +# +# Library Installation Options +# +RUNTIME_PREFIX="/" +DEVEL_PREFIX="/usr/" +MULTILIB_DIR="lib" +HARDWIRED_ABSPATH=y + +# +# Security options +# +UCLIBC_HAS_ARC4RANDOM=y +# ARC4RANDOM_USES_NODEV is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y + +# +# Development/debugging options +# +CROSS_COMPILER_PREFIX="" +UCLIBC_EXTRA_CFLAGS="" +# DODEBUG is not set +# DODEBUG_PT is not set +# DOSTRIP is not set +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +# UCLIBC_HAS_BACKTRACE is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index afb99ebc9..4e77bcf63 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -49,6 +49,9 @@ config ADK_CPU_ARC config ADK_CPU_TILE boolean +config ADK_CPU_C6X + boolean + config ADK_CPU_CRIS_V10 boolean @@ -144,6 +147,7 @@ config ADK_TARGET_CPU_ARCH default "arceb" if ADK_CPU_ARC && ADK_big default "avr32" if ADK_CPU_AVR32 default "bfin" if ADK_CPU_BFIN + default "c6x" if ADK_CPU_C6X default "cris" if ADK_CPU_CRIS_V10 default "crisv32" if ADK_CPU_CRIS_V32 default "i486" if ADK_CPU_I486 diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index 4e866b6c5..f2a0ed5e3 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -5,7 +5,7 @@ choice ADK_TARGET_ENDIAN_MODE prompt "Target Endianess" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE \ - || ADK_LINUX_MIPS64 || ADK_LINUX_ARC || ADK_LINUX_ARM + || ADK_LINUX_MIPS64 || ADK_LINUX_ARC || ADK_LINUX_ARM || ADK_LINUX_C6X depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 70d6080ec..009ce19ee 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -26,7 +26,7 @@ config ADK_TOOLCHAIN_GCC_4_5_4 config ADK_TOOLCHAIN_GCC_4_7_4 prompt "4.7.4" boolean - depends on ADK_LINUX_CRIS + depends on ADK_LINUX_CRIS || ADK_LINUX_C6X config ADK_TOOLCHAIN_GCC_4_8_0_ARC prompt "4.8.0-arc" @@ -42,6 +42,7 @@ config ADK_TOOLCHAIN_GCC_4_8_3 depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS depends on !ADK_LINUX_TILE + depends on !ADK_LINUX_C6X config ADK_TOOLCHAIN_GCC_4_9_1 prompt "4.9.1" @@ -50,6 +51,7 @@ config ADK_TOOLCHAIN_GCC_4_9_1 depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_C6X config ADK_TOOLCHAIN_GCC_GIT prompt "git" -- cgit v1.2.3 From e1c4d3fd3d69ce5746533260c7e69738db8feb78 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Dec 2014 20:06:31 -0600 Subject: update to latest upstream version --- package/php/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/Makefile b/package/php/Makefile index 4d41781b2..fe1236a50 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.5.17 +PKG_VERSION:= 5.5.19 PKG_RELEASE:= 1 -PKG_MD5SUM:= e5f25dae73004658533ee7701a527bd0 +PKG_MD5SUM:= c63dcfd8b318d12127ba6d39ecc8a444 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_DEPENDS:= libpthread librt -- cgit v1.2.3 From ad7fc1eafd801e2d4461547de2b0807212e8af10 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Dec 2014 20:20:19 -0600 Subject: update to latest upstream version --- package/nginx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/Makefile b/package/nginx/Makefile index 735c61985..804b6309f 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.7.1 +PKG_VERSION:= 1.7.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9659cbb26f226f6390b18ef991a79233 +PKG_MD5SUM:= fd5ab813fc1853cd8efe580ead577c3e PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= openssl pcre zlib -- cgit v1.2.3 From 142b50071ac4ed5124c8172ca7d30e351e465768 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Dec 2014 20:59:15 -0600 Subject: add basic support for linksys nslu2 (arm big endian platform) --- target/arm/kernel/linksys-nslu2 | 5 +++++ target/arm/systems/linksys-nslu2 | 11 +++++++++++ target/config/Config.in.endian.choice | 1 + target/config/Config.in.kernel | 1 + 4 files changed, 18 insertions(+) create mode 100644 target/arm/kernel/linksys-nslu2 create mode 100644 target/arm/systems/linksys-nslu2 diff --git a/target/arm/kernel/linksys-nslu2 b/target/arm/kernel/linksys-nslu2 new file mode 100644 index 000000000..19cffbe68 --- /dev/null +++ b/target/arm/kernel/linksys-nslu2 @@ -0,0 +1,5 @@ +CONFIG_ARM=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_CPU_XSCALE=y +CONFIG_ATAGS=y +CONFIG_ATAGS_PROC=y diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 new file mode 100644 index 000000000..dd72c5cae --- /dev/null +++ b/target/arm/systems/linksys-nslu2 @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + bool "Linksys NSLU2" + select ADK_arm + select ADK_big + select ADK_eabihf + select ADK_linksys_nslu2 + select ADK_TARGET_WITH_USB + select ADK_TARGET_KERNEL_ZIMAGE + help + Linksys NSLU2 + diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index f2a0ed5e3..197754099 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -11,6 +11,7 @@ depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_ARM +depends on !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 config ADK_TARGET_LITTLE_ENDIAN boolean "Little endian" diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index add212587..b8f308474 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -59,6 +59,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "solidrun-imx6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "linksys-nslu2" if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "mikrotik-rb4xx" if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 -- cgit v1.2.3 From b2bb927f188dc86b0fb852645a62ece5c319ad6b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Dec 2014 21:09:39 -0600 Subject: update to kodirc2 and libcec 2.2.0 --- package/kodi/Makefile | 14 +- package/kodi/patches/patch-tools_Linux_xbmc_sh_in | 59 - package/kodi/patches/patch-xbmc_Application_cpp | 41 - package/libcec/Makefile | 12 +- package/libcec/patches/imx6.patch | 3051 -------------------- ..._lib_adapter_RPi_RPiCECAdapterCommunication_cpp | 12 - package/libcec/patches/patch-src_lib_libcec_pc_in | 4 +- .../patch-src_lib_platform_posix_serialport_cpp | 11 - package/libpng/patches/libpng-1.6.14-apng.patch | 1701 +++++++++++ package/mesalib/Makefile | 4 +- 10 files changed, 1717 insertions(+), 3192 deletions(-) delete mode 100644 package/kodi/patches/patch-tools_Linux_xbmc_sh_in delete mode 100644 package/kodi/patches/patch-xbmc_Application_cpp delete mode 100644 package/libcec/patches/imx6.patch delete mode 100644 package/libcec/patches/patch-src_lib_adapter_RPi_RPiCECAdapterCommunication_cpp delete mode 100644 package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp create mode 100644 package/libpng/patches/libpng-1.6.14-apng.patch diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 74a240bd2..08b230cc9 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 14.0alpha4 -PKG_RELEASE:= 5 -PKG_MD5SUM:= 88a68db6e653b2029efddbfa0a855e1c +PKG_VERSION:= 14.0rc2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f56aeb81db6878fcac6631f6a3e2c702 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv -PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus +PKG_DEPENDS+= libass libmpeg2 libmad libdbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng libncurses @@ -18,7 +18,7 @@ PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd PKG_DEPENDS+= libgpg-error libudev python2-mod-sqlite libffmpeg PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu librt -PKG_BUILDDEP:= boost python2 mesalib libglew libass ffmpeg +PKG_BUILDDEP:= boost python2 libass ffmpeg PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype @@ -61,8 +61,8 @@ PKGFD_WITH_WEBSERVER:= enable internal webserver support PKG_LIBC_DEPENDS:= glibc -PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc -PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc +PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc libglew mesalib +PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc libglew mesalib PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q PKG_SYSTEM_DEPENDS:= raspberry-pi solidrun-imx6 diff --git a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in deleted file mode 100644 index 30804493f..000000000 --- a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in +++ /dev/null @@ -1,59 +0,0 @@ ---- kodi-14.0alpha4.orig/tools/Linux/xbmc.sh.in 2014-09-05 14:09:59.000000000 +0200 -+++ kodi-14.0alpha4/tools/Linux/xbmc.sh.in 2014-09-08 13:26:02.745294460 +0200 -@@ -58,7 +58,7 @@ single_stacktrace() - - print_crash_report() - { -- FILE="$CRASHLOG_DIR/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log" -+ FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log" - echo "############## XBMC CRASH LOG ###############" >> $FILE - echo >> $FILE - echo "################ SYSTEM INFO ################" >> $FILE -@@ -70,15 +70,6 @@ print_crash_report() - echo -n " Kernel: " >> $FILE - uname -rvs >> $FILE - echo -n " Release: " >> $FILE -- if [ -f /etc/os-release ]; then -- . /etc/os-release -- echo $NAME $VERSION >> $FILE -- elif command_exists lsb_release; then -- echo >> $FILE -- lsb_release -a 2> /dev/null | sed -e 's/^/ /' >> $FILE -- else -- echo "lsb_release not available" >> $FILE -- fi - echo "############## END SYSTEM INFO ##############" >> $FILE - echo >> $FILE - echo "############### STACK TRACE #################" >> $FILE -@@ -100,31 +91,8 @@ print_crash_report() - echo "gdb not installed, can't get stack trace." >> $FILE - fi - echo "############# END STACK TRACE ###############" >> $FILE -- echo >> $FILE -- echo "################# LOG FILE ##################" >> $FILE -- echo >> $FILE -- if [ -f ~/.xbmc/temp/xbmc.log ] -- then -- cat ~/.xbmc/temp/xbmc.log >> $FILE -- echo >> $FILE -- else -- echo "Logfile not found in the usual place." >> $FILE -- echo "Please attach it seperately." >> $FILE -- echo "Use pastebin.com or similar for forums or IRC." >> $FILE -- fi -- echo >> $FILE -- echo "############### END LOG FILE ################" >> $FILE -- echo >> $FILE -- echo "############ END XBMC CRASH LOG #############" >> $FILE -- echo "Crash report available at $FILE" - } - --python @datadir@/xbmc/FEH.py $SAVED_ARGS --RET=$? --if [ $RET -ne 0 ]; then -- exit $RET --fi -- - if command_exists gdb; then - # Output warning in case ulimit is unsupported by shell - eval ulimit -c unlimited diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp deleted file mode 100644 index a90c36f89..000000000 --- a/package/kodi/patches/patch-xbmc_Application_cpp +++ /dev/null @@ -1,41 +0,0 @@ ---- kodi-14.0alpha4.orig/xbmc/Application.cpp 2014-10-06 11:34:37.000000000 -0500 -+++ kodi-14.0alpha4/xbmc/Application.cpp 2014-10-08 01:25:47.880436000 -0500 -@@ -642,7 +642,7 @@ bool CApplication::Create() - - if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str())) - { -- fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n", -+ fprintf(stderr,"Could not init logging classes. Permission errors on %s\n", - CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()); - return false; - } -@@ -1064,10 +1064,13 @@ bool CApplication::InitDirectoriesLinux( - userName = "root"; - - CStdString userHome; -+ userHome = "/data/xbmc"; -+/* - if (getenv("HOME")) - userHome = getenv("HOME"); - else - userHome = "/root"; -+*/ - - CStdString xbmcBinPath, xbmcPath; - CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME"); -@@ -1099,11 +1102,11 @@ bool CApplication::InitDirectoriesLinux( - // map our special drives - CSpecialProtocol::SetXBMCBinPath(xbmcBinPath); - CSpecialProtocol::SetXBMCPath(xbmcPath); -- CSpecialProtocol::SetHomePath(userHome + "/.xbmc"); -- CSpecialProtocol::SetMasterProfilePath(userHome + "/.xbmc/userdata"); -+ CSpecialProtocol::SetHomePath(userHome); -+ CSpecialProtocol::SetMasterProfilePath(userHome + "/userdata"); - -- CStdString strTempPath = userHome; -- strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp"); -+ CStdString strTempPath = "/tmp"; -+ strTempPath = URIUtils::AddFileToFolder(strTempPath, "/xbmc"); - if (getenv("XBMC_TEMP")) - strTempPath = getenv("XBMC_TEMP"); - CSpecialProtocol::SetTempPath(strTempPath); diff --git a/package/libcec/Makefile b/package/libcec/Makefile index d48adda31..0d7502bc5 100644 --- a/package/libcec/Makefile +++ b/package/libcec/Makefile @@ -4,22 +4,20 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libcec -PKG_VERSION:= 2.1.4 -PKG_RELEASE:= 6 -PKG_MD5SUM:= faa58944f87e9beda165f615d4b46766 +PKG_VERSION:= 2.2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 17d6ec05d2ac9e6779eb8d2986a62688 PKG_DESCR:= control your device with your tv remote control PKG_SECTION:= libs/video PKG_DEPENDS:= libudev PKG_BUILDDEP:= eudev PKG_URL:= http://libcec.pulse-eight.com/ -PKG_SITES:= http://packages.pulse-eight.net/pulse/sources/libcec/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc -PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40 solidrun-imx6 +PKG_SYSTEM_DEPENDS:= raspberry-pi solidrun-imx6 include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libcec/patches/imx6.patch b/package/libcec/patches/imx6.patch deleted file mode 100644 index aadb217e8..000000000 --- a/package/libcec/patches/imx6.patch +++ /dev/null @@ -1,3051 +0,0 @@ -diff -Nur libcec-2.1.4/ChangeLog libcec-imx6/ChangeLog ---- libcec-2.1.4/ChangeLog 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/ChangeLog 2014-09-01 13:48:53.610430917 +0200 -@@ -1,3 +1,10 @@ -+libcec (2.1.4-2) unstable; urgency=low -+ -+ * fixed: -+ * OS X build -+ -+ -- Pulse-Eight Packaging Wed, 18 Dec 2013 02:14:00 +0100 -+ - libcec (2.1.4-1) unstable; urgency=low - - * changed / added: -diff -Nur libcec-2.1.4/configure.ac libcec-imx6/configure.ac ---- libcec-2.1.4/configure.ac 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/configure.ac 2014-09-01 13:48:53.610430917 +0200 -@@ -93,6 +93,14 @@ - esac - fi - -+## i.MX6 support -+AC_ARG_ENABLE([imx6], -+ [AS_HELP_STRING([--enable-imx6], -+ [enable support for freescale i.MX6 (default is no)])], -+ [use_imx6=$enableval], -+ [use_imx6=no]) -+ -+ - ## add the top dir and include to the include path, so we can include config.h and cec.h - CPPFLAGS="$CPPFLAGS -I\$(abs_top_srcdir)/src -I\$(abs_top_srcdir)/include" - -@@ -130,6 +138,7 @@ - use_udev="no" - use_adapter_detection="yes" - use_lockdev="no" -+SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi" - case "${host}" in - *-*-linux*) - ## search for udev if pkg-config was found -@@ -210,6 +219,7 @@ - AC_CHECK_HEADER(mach/mach_time.h,,AC_MSG_ERROR($msg_required_header_missing)) - AC_CHECK_HEADER(CoreVideo/CVHostTime.h,,AC_MSG_ERROR($msg_required_header_missing)) - AC_DEFINE([TARGET_DARWIN], [1], [Darwin target]) -+ SUPPRESS_MANGLING_WARNINGS="" - ;; - esac - -@@ -268,6 +278,17 @@ - features="$features\n TDA995x support :\t\t\tno" - fi - -+## mark i.MX6 support as available -+if test "x$use_imx6" != "xno"; then -+ AC_DEFINE([HAVE_IMX_API],[1],[Define to 1 to include i.MX6 support]) -+ AM_CONDITIONAL(USE_IMX_API, true) -+ features="$features\n i.MX6 support :\t\t\tyes" -+ LIB_INFO="$LIB_INFO 'i.MX6'" -+else -+ AM_CONDITIONAL(USE_IMX_API, false) -+ features="$features\n i.MX6 support :\t\t\tno" -+fi -+ - ## check if our build system is complete - AC_CHECK_HEADER(algorithm,,AC_MSG_ERROR($msg_required_header_missing)) - AC_CHECK_HEADER(ctype.h,,AC_MSG_ERROR($msg_required_header_missing)) -@@ -342,7 +363,7 @@ - LIBS_LIBCEC="$LIBS" - LIBS="$libs_client" - --CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi" -+CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers $SUPPRESS_MANGLING_WARNINGS" - - if test "x$use_debug" = "xyes"; then - CXXFLAGS="$CXXFLAGS -g" -diff -Nur libcec-2.1.4/debian/changelog libcec-imx6/debian/changelog ---- libcec-2.1.4/debian/changelog 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/debian/changelog 2014-09-01 13:48:53.698431426 +0200 -@@ -1,3 +1,10 @@ -+libcec (2.1.4-2) unstable; urgency=low -+ -+ * fixed: -+ * OS X build -+ -+ -- Pulse-Eight Packaging Wed, 18 Dec 2013 02:14:00 +0100 -+ - libcec (2.1.4-1) unstable; urgency=low - - * changed / added: -diff -Nur libcec-2.1.4/driver/p8usb-cec.inf libcec-imx6/driver/p8usb-cec.inf ---- libcec-2.1.4/driver/p8usb-cec.inf 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/driver/p8usb-cec.inf 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,89 @@ -+; Copyright (c) 2012 Pulse-Eight Limited -+ -+[Version] -+Signature="$Windows NT$" -+Class=Ports -+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -+Provider=%MFGNAME% -+LayoutFile=layout.inf -+CatalogFile=%MFGFILENAME%.cat -+DriverVer=08/29/2012,1.1.0.0 -+ -+[Manufacturer] -+%MFGNAME%=DeviceList, NTamd64 -+ -+[DestinationDirs] -+FakeModemCopyFileSection=12 -+DefaultDestDir=12 -+ -+ -+;------------------------------------------------------------------------------ -+; Windows 2000/XP/Vista-32bit Sections -+;------------------------------------------------------------------------------ -+ -+[DriverInstall.nt] -+include = mdmcpq.inf -+CopyFiles = FakeModemCopyFileSection -+AddReg = DriverInstall.nt.AddReg -+ -+[DriverInstall.nt.AddReg] -+HKR,,DevLoader,,*ntkern -+HKR,,NTMPDriver,,%DRIVERFILENAME%.sys -+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" -+HKR,,PortSubClass,1,01 -+ -+[DriverInstall.nt.Services] -+AddService = usbser, 0x00000002, DriverService.nt -+ -+[DriverService.nt] -+DisplayName = %SERVICE% -+ServiceType = 1 ; SERVICE_KERNEL_DRIVER -+StartType = 3 ; SERVICE_DEMAND_START -+ErrorControl = 1 ; SERVICE_ERROR_NORMAL -+ServiceBinary = %12%\%DRIVERFILENAME%.sys -+LoadOrderGroup = Base -+ -+;------------------------------------------------------------------------------ -+; Vista-64bit Sections -+;------------------------------------------------------------------------------ -+ -+[DriverInstall.NTamd64] -+include = mdmcpq.inf -+CopyFiles = FakeModemCopyFileSection -+AddReg = DriverInstall.NTamd64.AddReg -+ -+[DriverInstall.NTamd64.AddReg] -+HKR,,DevLoader,,*ntkern -+HKR,,NTMPDriver,,%DRIVERFILENAME%.sys -+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" -+HKR,,PortSubClass,1,01 -+ -+[DriverInstall.NTamd64.Services] -+AddService = usbser, 0x00000002, DriverService.NTamd64 -+ -+[DriverService.NTamd64] -+DisplayName = %SERVICE% -+ServiceType = 1 ; SERVICE_KERNEL_DRIVER -+StartType = 3 ; SERVICE_DEMAND_START -+ErrorControl = 1 ; SERVICE_ERROR_NORMAL -+ServiceBinary = %12%\%DRIVERFILENAME%.sys -+LoadOrderGroup = Base -+ -+[SourceDisksFiles] -+[SourceDisksNames] -+[DeviceList] -+%DESCRIPTION2% = DriverInstall, USB\VID_2548&PID_1002&MI_00 -+%DESCRIPTION% = DriverInstall, USB\VID_2548&PID_1001 -+ -+[DeviceList.NTamd64] -+%DESCRIPTION2% = DriverInstall, USB\VID_2548&PID_1002&MI_00 -+%DESCRIPTION% = DriverInstall, USB\VID_2548&PID_1001 -+ -+[Strings] -+MFGFILENAME = "p8usb-cec" -+DRIVERFILENAME = "usbser" -+MFGNAME = "Pulse-Eight Limited" -+INSTDISK = "Pulse-Eight USB-CEC Installation Disc" -+DESCRIPTION = "Pulse-Eight USB to HDMI CEC Adapter" -+DESCRIPTION2 = "Pulse-Eight USB to HDMI CEC Adapter (rev.2)" -+SERVICE = "USB to HDMI-CEC" -diff -Nur libcec-2.1.4/.gitignore libcec-imx6/.gitignore ---- libcec-2.1.4/.gitignore 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/.gitignore 2014-09-01 13:48:53.610430917 +0200 -@@ -0,0 +1,117 @@ -+/build -+/.cproject -+/.project -+/.settings -+*.dll -+*.exe -+*.exp -+*.ilk -+*.lib -+*.manifest -+*.metagen -+*.ncb -+*.opensdf -+*.pdb -+*.suo -+*.user -+*.aps -+ -+*~ -+ -+/support/private -+ -+/driver/p8usb-cec.cat -+/bootloader-driver/p8_usb_dfu.cat -+ -+aclocal.m4 -+autom4te.cache -+config.guess -+config.log -+config.status -+config.sub -+depcomp -+configure -+install-sh -+INSTALL -+libtool -+ltmain.sh -+Makefile -+Makefile.in -+missing -+config.h -+config.h.in -+config.h.in~ -+stamp-h1 -+ -+/debian/*.log -+/debian/*.substvars -+/debian/*.debhelper -+/debian/files -+/debian/cec-utils -+/debian/libcec-dev -+/debian/libcec -+/debian/libcec2 -+/debian/tmp -+ -+include/boost -+ -+project/bin -+project/Debug/ -+project/*.exe -+project/Release/ -+project/ipch/ -+project/libcec.sdf -+project/obj -+project/Properties -+project/_* -+project/x64 -+project/LibCecSharp/x64 -+project/LibCecSharp/Debug -+project/LibCecSharp/Release -+project/libcec/x64 -+project/libcec/Debug -+project/libcec/Release -+project/testclient/x64 -+project/testclient/Debug -+project/testclient/Release -+ -+project/RPi/toolchain -+project/RPi/firmware -+project/RPi/deps -+ -+src/lib/.deps -+src/lib/.libs -+src/lib/*.a -+src/lib/*.la -+src/lib/*.lo -+src/lib/*.o -+src/lib/*.P -+src/lib/libcec.pc -+src/lib/Makefile -+src/lib/Makefile.in -+ -+src/lib/util/*.d -+src/lib/util/*.o -+src/lib/util/*.a -+src/lib/util/*.P -+ -+src/testclient/.deps -+src/testclient/.libs -+src/testclient/cec-client -+src/testclient/*.o -+ -+src/CecSharpTester/bin -+src/CecSharpTester/obj -+ -+src/cec-config-gui/obj -+src/cec-config/cec-config -+src/cec-config/*.o -+src/cec-config/.deps -+ -+src/libcec-wmc/bin -+src/libcec-wmc/obj -+ -+/dpinst-x86.exe -+/dpinst-amd64.exe -+ -+/documentation -diff -Nur libcec-2.1.4/include/cectypes.h libcec-imx6/include/cectypes.h ---- libcec-2.1.4/include/cectypes.h 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/include/cectypes.h 2014-09-01 13:48:53.702431449 +0200 -@@ -295,6 +295,17 @@ - #define CEC_TDA995x_VIRTUAL_COM "CuBox" - - /*! -+ * the path to use for the i.MX CEC wire -+ */ -+#define CEC_IMX_PATH "/dev/mxc_hdmi_cec" -+ -+/*! -+ * the name of the virtual COM port to use for the i.MX CEC wire -+ */ -+#define CEC_IMX_VIRTUAL_COM "i.MX" -+ -+ -+/*! - * Mimimum client version - */ - #define CEC_MIN_LIB_VERSION 2 -@@ -858,7 +869,8 @@ - ADAPTERTYPE_P8_EXTERNAL = 0x1, - ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2, - ADAPTERTYPE_RPI = 0x100, -- ADAPTERTYPE_TDA995x = 0x200 -+ ADAPTERTYPE_TDA995x = 0x200, -+ ADAPTERTYPE_IMX = 0x300, - } cec_adapter_type; - - typedef struct cec_menu_language -Binärdateien libcec-2.1.4/project/favicon.ico und libcec-imx6/project/favicon.ico sind verschieden. -Binärdateien libcec-2.1.4/project/libcec/libcec.rc und libcec-imx6/project/libcec/libcec.rc sind verschieden. -diff -Nur libcec-2.1.4/project/libcec/libcec.vcxproj libcec-imx6/project/libcec/libcec.vcxproj ---- libcec-2.1.4/project/libcec/libcec.vcxproj 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/libcec/libcec.vcxproj 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,281 @@ -+ -+ -+ -+ -+ Debug -+ Win32 -+ -+ -+ Debug -+ x64 -+ -+ -+ Release -+ Win32 -+ -+ -+ Release -+ x64 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} -+ libcec -+ libcec -+ -+ -+ -+ DynamicLibrary -+ true -+ MultiByte -+ v100 -+ -+ -+ DynamicLibrary -+ true -+ MultiByte -+ v100 -+ -+ -+ DynamicLibrary -+ false -+ MultiByte -+ v100 -+ -+ -+ DynamicLibrary -+ false -+ MultiByte -+ v100 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ $(SolutionDir)..\build\ -+ -+ -+ $(SolutionDir)..\build\x64\ -+ -+ -+ libcec -+ -+ -+ $(ProjectName) -+ -+ -+ $(SolutionDir)..\include;$(IncludePath) -+ C:\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) -+ -+ -+ $(SolutionDir)..\include;$(IncludePath) -+ C:\WinDDK\7600.16385.1\lib\win7\amd64;$(LibraryPath) -+ -+ -+ $(SolutionDir)..\build\ -+ libcec -+ $(SolutionDir)..\include;$(IncludePath) -+ C:\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) -+ -+ -+ $(SolutionDir)..\build\x64\ -+ $(ProjectName) -+ $(SolutionDir)..\include;$(IncludePath) -+ C:\WinDDK\7600.16385.1\lib\win7\amd64;$(LibraryPath) -+ -+ -+ -+ Level4 -+ Disabled -+ CEC_DEBUGGING;HAVE_P8_USB;_USE_32BIT_TIME_T;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions) -+ $(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) -+ -+ -+ true -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ Level4 -+ Disabled -+ CEC_DEBUGGING;HAVE_P8_USB;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions) -+ $(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) -+ -+ -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ -+ -+ Level4 -+ Full -+ true -+ true -+ $(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) -+ HAVE_P8_USB;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions) -+ -+ -+ true -+ Speed -+ -+ -+ false -+ true -+ true -+ -+ -+ -+ -+ -+ -+ Level4 -+ Full -+ true -+ $(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) -+ HAVE_P8_USB;_WIN64;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions) -+ -+ -+ true -+ Speed -+ -+ -+ false -+ true -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ MachineX64 -+ true -+ Windows -+ -+ -+ -+ -+ -+ -\ Kein Zeilenumbruch am Dateiende. -diff -Nur libcec-2.1.4/project/libcec/libcec.vcxproj.filters libcec-imx6/project/libcec/libcec.vcxproj.filters ---- libcec-2.1.4/project/libcec/libcec.vcxproj.filters 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/libcec/libcec.vcxproj.filters 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,281 @@ -+ -+ -+ -+ -+ {01b9c84a-dcfe-4bdc-b983-69e3e3929b0f} -+ -+ -+ {03bd59df-ccac-4664-b61b-3151bb219efa} -+ -+ -+ {bfc43a58-636d-4c1a-b191-486cb8509c7c} -+ -+ -+ {51614b77-8a0e-47a8-8500-5beb0fd12d49} -+ -+ -+ {7d05b1b5-e728-4f9e-b78f-d63cac4ded8e} -+ -+ -+ {6cfe4bad-ed3a-4a16-8c59-4489089f5fe5} -+ -+ -+ {39a56ebf-ba93-4e7b-bf72-2f57b99a1ee1} -+ -+ -+ {be183456-d61e-4283-b642-fe25ed71e9c5} -+ -+ -+ {65c4a590-4577-40e4-91ad-339e20b99ebe} -+ -+ -+ {4fbd02e2-5671-4132-9b37-964c17fb3b0d} -+ -+ -+ {685e2589-204d-4f9a-a637-a7ba1b61c669} -+ -+ -+ {a5e91a49-0595-49bd-9bdb-d729d63f024e} -+ -+ -+ -+ -+ -+ -+ exports -+ -+ -+ exports -+ -+ -+ exports -+ -+ -+ exports -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ devices -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ platform -+ -+ -+ platform\sockets -+ -+ -+ platform\sockets -+ -+ -+ platform\sockets -+ -+ -+ platform\util -+ -+ -+ platform\util -+ -+ -+ platform\util -+ -+ -+ platform\util -+ -+ -+ platform\threads -+ -+ -+ platform\threads -+ -+ -+ platform\windows -+ -+ -+ platform\windows -+ -+ -+ platform\windows -+ -+ -+ platform\windows -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ -+ -+ devices -+ -+ -+ -+ platform\util -+ -+ -+ platform\adl -+ -+ -+ platform\adl -+ -+ -+ platform\adl -+ -+ -+ platform\adl -+ -+ -+ platform\windows -+ -+ -+ platform\nvidia -+ -+ -+ adapter -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ devices -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ devices -+ -+ -+ platform\windows -+ -+ -+ platform\windows -+ -+ -+ implementations -+ -+ -+ implementations -+ -+ -+ -+ devices -+ -+ -+ platform\windows -+ -+ -+ platform\adl -+ -+ -+ platform\windows -+ -+ -+ platform\nvidia -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter\Pulse-Eight -+ -+ -+ adapter -+ -+ -+ -+ -+ -+ -\ Kein Zeilenumbruch am Dateiende. -Binärdateien libcec-2.1.4/project/libcec/resource.h und libcec-imx6/project/libcec/resource.h sind verschieden. -diff -Nur libcec-2.1.4/project/libCEC.nsi libcec-imx6/project/libCEC.nsi ---- libcec-2.1.4/project/libCEC.nsi 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/libCEC.nsi 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,342 @@ -+;libCEC installer -+;Copyright (C) 2011-2013 Pulse-Eight Ltd. -+;http://www.pulse-eight.com/ -+ -+!include "MUI2.nsh" -+!include "nsDialogs.nsh" -+!include "LogicLib.nsh" -+!include "x64.nsh" -+ -+Name "Pulse-Eight libCEC" -+OutFile "..\build\libCEC-installer.exe" -+ -+XPStyle on -+InstallDir "$PROGRAMFILES\Pulse-Eight\USB-CEC Adapter" -+InstallDirRegKey HKLM "Software\Pulse-Eight\USB-CEC Adapter software" "" -+RequestExecutionLevel admin -+Var StartMenuFolder -+Var VSRedistSetupError -+Var VSRedistInstalled -+ -+!define MUI_FINISHPAGE_LINK "Visit http://libcec.pulse-eight.com/ for more information." -+!define MUI_FINISHPAGE_LINK_LOCATION "http://libcec.pulse-eight.com/" -+!define MUI_ABORTWARNING -+ -+!insertmacro MUI_PAGE_WELCOME -+!insertmacro MUI_PAGE_LICENSE "..\COPYING" -+!insertmacro MUI_PAGE_COMPONENTS -+!insertmacro MUI_PAGE_DIRECTORY -+ -+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Pulse-Eight\USB-CEC Adapter sofware" -+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder -+ -+!insertmacro MUI_PAGE_INSTFILES -+!insertmacro MUI_PAGE_FINISH -+ -+!insertmacro MUI_UNPAGE_WELCOME -+!insertmacro MUI_UNPAGE_CONFIRM -+!insertmacro MUI_UNPAGE_INSTFILES -+!insertmacro MUI_UNPAGE_FINISH -+ -+!insertmacro MUI_LANGUAGE "English" -+ -+InstType "USB-CEC Driver & libCEC" -+InstType "USB-CEC Driver Only" -+InstType "Full installation" -+ -+Section "USB-CEC Driver" SecDriver -+ SetShellVarContext current -+ SectionIn RO -+ SectionIn 1 2 3 -+ -+ ; Uninstall the old unsigned software if it's found -+ ReadRegStr $1 HKCU "Software\libCEC" "" -+ ${If} $1 != "" -+ MessageBox MB_OK \ -+ "A previous libCEC and USB-CEC Driver was found. This update requires the old version to be uninstalled. Press OK to uninstall the old version." -+ ExecWait '"$1\Uninstall.exe" /S _?=$1' -+ Delete "$1\Uninstall.exe" -+ RMDir "$1" -+ ${EndIf} -+ -+ ; Delete libcec.dll and libcec.x64.dll from the system directory -+ ; Let a seperate installer do this, when we need it -+ Delete "$SYSDIR\libcec.dll" -+ ${If} ${RunningX64} -+ Delete "$SYSDIR\libcec.x64.dll" -+ ${EndIf} -+ -+ ; Copy to the installation directory -+ SetOutPath "$INSTDIR" -+ File "..\AUTHORS" -+ File "..\COPYING" -+ -+ ; Copy the driver installer -+ SetOutPath "$INSTDIR\driver" -+ File "..\build\p8-usbcec-driver-installer.exe" -+ -+ ;Store installation folder -+ WriteRegStr HKLM "Software\Pulse-Eight\USB-CEC Adapter software" "" $INSTDIR -+ -+ ;Create uninstaller -+ WriteUninstaller "$INSTDIR\Uninstall.exe" -+ -+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application -+ SetOutPath "$INSTDIR" -+ -+ CreateDirectory "$SMPROGRAMS\$StartMenuFolder" -+ C