From b2bb927f188dc86b0fb852645a62ece5c319ad6b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb <wbx@openadk.org> 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 <packaging@pulse-eight.com> 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 <packaging@pulse-eight.com> 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 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup Label="ProjectConfigurations"> -+ <ProjectConfiguration Include="Debug|Win32"> -+ <Configuration>Debug</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Debug|x64"> -+ <Configuration>Debug</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|Win32"> -+ <Configuration>Release</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|x64"> -+ <Configuration>Release</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\include\cec.h" /> -+ <ClInclude Include="..\..\include\cecc.h" /> -+ <ClInclude Include="..\..\include\cecloader.h" /> -+ <ClInclude Include="..\..\include\cectypes.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\AdapterCommunication.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\AdapterFactory.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h" /> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h" /> -+ <ClInclude Include="..\..\src\lib\CECClient.h" /> -+ <ClInclude Include="..\..\src\lib\CECInputBuffer.h" /> -+ <ClInclude Include="..\..\src\lib\CECProcessor.h" /> -+ <ClInclude Include="..\..\src\lib\CECTypeUtils.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECAudioSystem.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECBusDevice.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECDeviceMap.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECPlaybackDevice.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECRecordingDevice.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECTuner.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECTV.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\ANCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\CECCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\PHCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\RLCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\SLCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\VLCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\RHCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\implementations\AQCommandHandler.h" /> -+ <ClInclude Include="..\..\src\lib\LibCEC.h" /> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl-edid.h" /> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl_defines.h" /> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl_sdk.h" /> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl_structures.h" /> -+ <ClInclude Include="..\..\src\lib\platform\nvidia\nv-edid.h" /> -+ <ClInclude Include="..\..\src\lib\platform\os.h" /> -+ <ClInclude Include="..\..\src\lib\platform\sockets\serialport.h" /> -+ <ClInclude Include="..\..\src\lib\platform\sockets\socket.h" /> -+ <ClInclude Include="..\..\src\lib\platform\sockets\tcp.h" /> -+ <ClInclude Include="..\..\src\lib\platform\threads\mutex.h" /> -+ <ClInclude Include="..\..\src\lib\platform\threads\threads.h" /> -+ <ClInclude Include="..\..\src\lib\platform\util\baudrate.h" /> -+ <ClInclude Include="..\..\src\lib\platform\util\buffer.h" /> -+ <ClInclude Include="..\..\src\lib\platform\util\edid.h" /> -+ <ClInclude Include="..\..\src\lib\platform\util\StdString.h" /> -+ <ClInclude Include="..\..\src\lib\platform\util\timeutils.h" /> -+ <ClInclude Include="..\..\src\lib\platform\windows\dlfcn-win32.h" /> -+ <ClInclude Include="..\..\src\lib\platform\windows\os-socket.h" /> -+ <ClInclude Include="..\..\src\lib\platform\windows\os-threads.h" /> -+ <ClInclude Include="..\..\src\lib\platform\windows\os-types.h" /> -+ <ClInclude Include="..\..\src\lib\platform\windows\stdint.h" /> -+ <ClInclude Include="resource.h" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\src\lib\adapter\AdapterFactory.cpp" /> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp" /> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp" /> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp" /> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp" /> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp" /> -+ <ClCompile Include="..\..\src\lib\CECClient.cpp" /> -+ <ClCompile Include="..\..\src\lib\CECProcessor.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECAudioSystem.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECBusDevice.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECDeviceMap.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECPlaybackDevice.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECRecordingDevice.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECTuner.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECTV.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\ANCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\CECCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\PHCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\RLCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\SLCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\VLCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\RHCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\AQCommandHandler.cpp" /> -+ <ClCompile Include="..\..\src\lib\LibCEC.cpp" /> -+ <ClCompile Include="..\..\src\lib\LibCECC.cpp" /> -+ <ClCompile Include="..\..\src\lib\LibCECDll.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\adl\adl-edid.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\nvidia\nv-edid.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\windows\dlfcn-win32.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\windows\os-edid.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\windows\serialport.cpp" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ResourceCompile Include="libcec.rc" /> -+ </ItemGroup> -+ <PropertyGroup Label="Globals"> -+ <ProjectGuid>{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}</ProjectGuid> -+ <RootNamespace>libcec</RootNamespace> -+ <ProjectName>libcec</ProjectName> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -+ <ImportGroup Label="ExtensionSettings"> -+ </ImportGroup> -+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <PropertyGroup Label="UserMacros" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <OutDir>$(SolutionDir)..\build\</OutDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <OutDir>$(SolutionDir)..\build\x64\</OutDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <TargetName>libcec</TargetName> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <TargetName>$(ProjectName)</TargetName> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath> -+ <LibraryPath>C:\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath)</LibraryPath> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath> -+ <LibraryPath>C:\WinDDK\7600.16385.1\lib\win7\amd64;$(LibraryPath)</LibraryPath> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <OutDir>$(SolutionDir)..\build\</OutDir> -+ <TargetName>libcec</TargetName> -+ <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath> -+ <LibraryPath>C:\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath)</LibraryPath> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <OutDir>$(SolutionDir)..\build\x64\</OutDir> -+ <TargetName>$(ProjectName)</TargetName> -+ <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath> -+ <LibraryPath>C:\WinDDK\7600.16385.1\lib\win7\amd64;$(LibraryPath)</LibraryPath> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level4</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>CEC_DEBUGGING;HAVE_P8_USB;_USE_32BIT_TIME_T;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <Version> -+ </Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <ClCompile> -+ <WarningLevel>Level4</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>CEC_DEBUGGING;HAVE_P8_USB;_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ </ClCompile> -+ <Link> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <IgnoreSpecificDefaultLibraries> -+ </IgnoreSpecificDefaultLibraries> -+ <Version> -+ </Version> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level4</WarningLevel> -+ <Optimization>Full</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>HAVE_P8_USB;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>false</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <Version> -+ </Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ClCompile> -+ <WarningLevel>Level4</WarningLevel> -+ <Optimization>Full</Optimization> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>HAVE_P8_USB;_WIN64;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>false</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <IgnoreSpecificDefaultLibraries> -+ </IgnoreSpecificDefaultLibraries> -+ <Version> -+ </Version> -+ </Link> -+ <ProjectReference /> -+ <Lib> -+ <TargetMachine>MachineX64</TargetMachine> -+ <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors> -+ <SubSystem>Windows</SubSystem> -+ </Lib> -+ </ItemDefinitionGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> -+</Project> -\ 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 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup> -+ <Filter Include="exports"> -+ <UniqueIdentifier>{01b9c84a-dcfe-4bdc-b983-69e3e3929b0f}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="implementations"> -+ <UniqueIdentifier>{03bd59df-ccac-4664-b61b-3151bb219efa}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="devices"> -+ <UniqueIdentifier>{bfc43a58-636d-4c1a-b191-486cb8509c7c}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="adapter"> -+ <UniqueIdentifier>{51614b77-8a0e-47a8-8500-5beb0fd12d49}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform"> -+ <UniqueIdentifier>{7d05b1b5-e728-4f9e-b78f-d63cac4ded8e}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform\sockets"> -+ <UniqueIdentifier>{6cfe4bad-ed3a-4a16-8c59-4489089f5fe5}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform\util"> -+ <UniqueIdentifier>{39a56ebf-ba93-4e7b-bf72-2f57b99a1ee1}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform\threads"> -+ <UniqueIdentifier>{be183456-d61e-4283-b642-fe25ed71e9c5}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform\windows"> -+ <UniqueIdentifier>{65c4a590-4577-40e4-91ad-339e20b99ebe}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform\adl"> -+ <UniqueIdentifier>{4fbd02e2-5671-4132-9b37-964c17fb3b0d}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform\nvidia"> -+ <UniqueIdentifier>{685e2589-204d-4f9a-a637-a7ba1b61c669}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="adapter\Pulse-Eight"> -+ <UniqueIdentifier>{a5e91a49-0595-49bd-9bdb-d729d63f024e}</UniqueIdentifier> -+ </Filter> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\src\lib\CECProcessor.h" /> -+ <ClInclude Include="..\..\src\lib\LibCEC.h" /> -+ <ClInclude Include="..\..\include\cec.h"> -+ <Filter>exports</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\include\cecc.h"> -+ <Filter>exports</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\include\cecloader.h"> -+ <Filter>exports</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\include\cectypes.h"> -+ <Filter>exports</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\ANCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\CECCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\SLCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\devices\CECBusDevice.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\VLCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\RHCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\ANCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\devices\CECAudioSystem.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\devices\CECPlaybackDevice.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\devices\CECRecordingDevice.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\devices\CECTuner.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\devices\CECTV.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\os.h"> -+ <Filter>platform</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\sockets\serialport.h"> -+ <Filter>platform\sockets</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\sockets\socket.h"> -+ <Filter>platform\sockets</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\sockets\tcp.h"> -+ <Filter>platform\sockets</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\util\baudrate.h"> -+ <Filter>platform\util</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\util\buffer.h"> -+ <Filter>platform\util</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\util\StdString.h"> -+ <Filter>platform\util</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\util\timeutils.h"> -+ <Filter>platform\util</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\threads\mutex.h"> -+ <Filter>platform\threads</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\threads\threads.h"> -+ <Filter>platform\threads</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\windows\os-socket.h"> -+ <Filter>platform\windows</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\windows\os-threads.h"> -+ <Filter>platform\windows</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\windows\os-types.h"> -+ <Filter>platform\windows</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\windows\stdint.h"> -+ <Filter>platform\windows</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\RLCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\implementations\PHCommandHandler.h"> -+ <Filter>implementations</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\CECClient.h" /> -+ <ClInclude Include="..\..\src\lib\CECInputBuffer.h" /> -+ <ClInclude Include="..\..\src\lib\devices\CECDeviceMap.h"> -+ <Filter>devices</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\CECTypeUtils.h" /> -+ <ClInclude Include="..\..\src\lib\platform\util\edid.h"> -+ <Filter>platform\util</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl_defines.h"> -+ <Filter>platform\adl</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl_sdk.h"> -+ <Filter>platform\adl</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl_structures.h"> -+ <Filter>platform\adl</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\adl\adl-edid.h"> -+ <Filter>platform\adl</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\windows\dlfcn-win32.h"> -+ <Filter>platform\windows</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\nvidia\nv-edid.h"> -+ <Filter>platform\nvidia</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\AdapterCommunication.h"> -+ <Filter>adapter</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\adapter\AdapterFactory.h"> -+ <Filter>adapter</Filter> -+ </ClInclude> -+ <ClInclude Include="resource.h" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\src\lib\CECProcessor.cpp" /> -+ <ClCompile Include="..\..\src\lib\LibCEC.cpp" /> -+ <ClCompile Include="..\..\src\lib\LibCECC.cpp" /> -+ <ClCompile Include="..\..\src\lib\LibCECDll.cpp" /> -+ <ClCompile Include="..\..\src\lib\implementations\ANCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\CECCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\SLCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\devices\CECBusDevice.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\VLCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\RHCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\AQCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\devices\CECAudioSystem.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\devices\CECPlaybackDevice.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\devices\CECRecordingDevice.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\devices\CECTuner.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\devices\CECTV.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp"> -+ <Filter>platform\windows</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\platform\windows\serialport.cpp"> -+ <Filter>platform\windows</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\RLCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\implementations\PHCommandHandler.cpp"> -+ <Filter>implementations</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\CECClient.cpp" /> -+ <ClCompile Include="..\..\src\lib\devices\CECDeviceMap.cpp"> -+ <Filter>devices</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\platform\windows\os-edid.cpp"> -+ <Filter>platform\windows</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\platform\adl\adl-edid.cpp"> -+ <Filter>platform\adl</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\platform\windows\dlfcn-win32.cpp"> -+ <Filter>platform\windows</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\platform\nvidia\nv-edid.cpp"> -+ <Filter>platform\nvidia</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp"> -+ <Filter>adapter\Pulse-Eight</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\lib\adapter\AdapterFactory.cpp"> -+ <Filter>adapter</Filter> -+ </ClCompile> -+ </ItemGroup> -+ <ItemGroup> -+ <ResourceCompile Include="libcec.rc" /> -+ </ItemGroup> -+</Project> -\ 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" -+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall Pulse-Eight USB-CEC Adapter software.lnk" "$INSTDIR\Uninstall.exe" \ -+ "" "$INSTDIR\Uninstall.exe" 0 SW_SHOWNORMAL \ -+ "" "Uninstall Pulse-Eight USB-CEC Adapter software." -+ -+ WriteINIStr "$SMPROGRAMS\$StartMenuFolder\Visit Pulse-Eight.url" "InternetShortcut" "URL" "http://www.pulse-eight.com/" -+ !insertmacro MUI_STARTMENU_WRITE_END -+ -+ ;add entry to add/remove programs -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "DisplayName" "Pulse-Eight USB-CEC Adapter software" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "UninstallString" "$INSTDIR\uninstall.exe" -+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "NoModify" 1 -+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "NoRepair" 1 -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "InstallLocation" "$INSTDIR" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "DisplayIcon" "$INSTDIR\cec-client.exe,0" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "Publisher" "Pulse-Eight Limited" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "HelpLink" "http://www.pulse-eight.com/" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter sofware" \ -+ "URLInfoAbout" "http://www.pulse-eight.com" -+ -+ ;install driver -+ ExecWait '"$INSTDIR\driver\p8-usbcec-driver-installer.exe" /S' -+ Delete "$INSTDIR\driver\p8-usbcec-driver-installer.exe" -+SectionEnd -+ -+Section "libCEC" SecLibCec -+ SetShellVarContext current -+ SectionIn 1 3 -+ -+ ; Copy to the installation directory -+ SetOutPath "$INSTDIR" -+ File "..\ChangeLog" -+ File "..\README" -+ File "..\build\*.dll" -+ File "..\build\*.xml" -+ SetOutPath "$INSTDIR\x64" -+ File /nonfatal "..\build\x64\*.dll" -+ File /nonfatal "..\build\x64\*.xml" -+ -+ ; Copy to XBMC\system -+ ReadRegStr $1 HKCU "Software\XBMC" "" -+ ${If} $1 != "" -+ SetOutPath "$1\system" -+ File "..\build\libcec.dll" -+ ${EndIf} -+ -+ ; Copy the headers -+ SetOutPath "$INSTDIR\include" -+ File /r /x *.so "..\include\cec*.*" -+SectionEnd -+ -+Section "CEC Debug Client" SecCecClient -+ SetShellVarContext current -+ SectionIn 3 -+ -+ ; Copy to the installation directory -+ SetOutPath "$INSTDIR" -+ File /x p8-usbcec-driver-installer.exe /x cec-tray.exe "..\build\*.exe" -+ SetOutPath "$INSTDIR\x64" -+ File /nonfatal "..\build\x64\*.exe" -+ -+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application -+ SetOutPath "$INSTDIR" -+ -+ CreateDirectory "$SMPROGRAMS\$StartMenuFolder" -+ ${If} ${RunningX64} -+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.exe" \ -+ "" "$INSTDIR\x64\cec-client.exe" 0 SW_SHOWNORMAL \ -+ "" "Start the CEC Test client (x64)." -+ ${Else} -+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \ -+ "" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \ -+ "" "Start the CEC Test client." -+ ${EndIf} -+ !insertmacro MUI_STARTMENU_WRITE_END -+ -+SectionEnd -+ -+Section "libCEC Tray Application" SecCecTray -+ SetShellVarContext current -+ SectionIn 1 3 -+ -+ ; Uninstall previous beta builds of the tray application -+ ReadRegStr $1 HKLM "Software\Pulse-Eight\libCECTray" "" -+ ${If} $1 != "" -+ MessageBox MB_OK \ -+ "A previous beta build of the libCEC Tray Application was found. Press OK to uninstall the old version. Do not uninstall the driver when asked to. Thank you for participating in the beta test." -+ ExecWait '"$1\Uninstall.exe" /S _?=$1' -+ Delete "$1\Uninstall.exe" -+ ${EndIf} -+ -+ ; Replace cec-config-gui.exe -+ Delete "$INSTDIR\cec-config-gui.exe" -+ ${If} ${RunningX64} -+ Delete "$INSTDIR\x64\cec-config-gui.exe" -+ ${EndIf} -+ Delete "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration.lnk" -+ ${If} ${RunningX64} -+ Delete "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration (x64).lnk" -+ ${EndIf} -+ -+ ; Copy to the installation directory -+ SetOutPath "$INSTDIR" -+ File "..\build\cec-tray.exe" -+ SetOutPath "$INSTDIR\x64" -+ File /nonfatal "..\build\x64\cec-tray.exe" -+ -+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application -+ SetOutPath "$INSTDIR" -+ -+ CreateDirectory "$SMPROGRAMS\$StartMenuFolder" -+ ${If} ${RunningX64} -+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\libCEC Tray (x64).lnk" "$INSTDIR\x64\cec-tray.exe" \ -+ "" "$INSTDIR\x64\cec-tray.exe" 0 SW_SHOWNORMAL \ -+ "" "Start the libCEC Tray (x64)." -+ ${Else} -+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\libCEC Tray.lnk" "$INSTDIR\cec-tray.exe" \ -+ "" "$INSTDIR\cec-tray.exe" 0 SW_SHOWNORMAL \ -+ "" "Start the libCEC Tray." -+ ${EndIf} -+ !insertmacro MUI_STARTMENU_WRITE_END -+ -+SectionEnd -+ -+!define REDISTRIBUTABLE_SECTIONNAME "Microsoft Visual C++ 2010 Redistributable Package" -+Section "" SecVCRedist -+ SetShellVarContext current -+ SectionIn 1 3 -+ -+ -+ ${If} $VSRedistInstalled != "Yes" -+ ; Download redistributable -+ SetOutPath "$TEMP\vc20XX" -+ ${If} ${RunningX64} -+ NSISdl::download http://packages.pulse-eight.net/windows/vcredist_x64.exe vcredist_x64.exe -+ ExecWait '"$TEMP\vc20XX\vcredist_x64.exe" /q' $VSRedistSetupError -+ ${Else} -+ NSISdl::download http://packages.pulse-eight.net/windows/vcredist_x86.exe vcredist_x86.exe -+ ExecWait '"$TEMP\vc20XX\vcredist_x86.exe" /q' $VSRedistSetupError -+ ${Endif} -+ RMDIR /r "$TEMP\vc20XX" -+ ${Endif} -+ -+SectionEnd -+ -+Function .onInit -+ -+ ; SP0 x86 -+ ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{196BB40D-1578-3D01-B289-BEFC77A11A1E}" "Version" -+ ${If} $1 != "" -+ StrCpy $VSRedistInstalled "Yes" -+ ${Endif} -+ -+ ; SP0 x64 -+ ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DA5E371C-6333-3D8A-93A4-6FD5B20BCC6E}" "Version" -+ ${If} $1 != "" -+ StrCpy $VSRedistInstalled "Yes" -+ ${Endif} -+ -+ ; SP0 ia64 -+ ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C1A35166-4301-38E9-BA67-02823AD72A1B}" "Version" -+ ${If} $1 != "" -+ StrCpy $VSRedistInstalled "Yes" -+ ${Endif} -+ -+ ; SP1 x86 -+ ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}" "Version" -+ ${If} $1 != "" -+ StrCpy $VSRedistInstalled "Yes" -+ ${Endif} -+ -+ ; SP1 x64 -+ ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" "Version" -+ ${If} $1 != "" -+ StrCpy $VSRedistInstalled "Yes" -+ ${Endif} -+ -+ ; SP1 ia64 -+ ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{88C73C1C-2DE5-3B01-AFB8-B46EF4AB41CD}" "Version" -+ ${If} $1 != "" -+ StrCpy $VSRedistInstalled "Yes" -+ ${Endif} -+ -+ ${If} $VSRedistInstalled == "Yes" -+ !insertMacro UnSelectSection ${SecVCRedist} -+ SectionSetText ${SecVCRedist} "" -+ ${Else} -+ !insertMacro SelectSection ${SecVCRedist} -+ SectionSetText ${SecVCRedist} "${REDISTRIBUTABLE_SECTIONNAME}" -+ ${Endif} -+ -+FunctionEnd -+ -+;-------------------------------- -+;Uninstaller Section -+ -+Section "Uninstall" -+ -+ SetShellVarContext current -+ -+ Delete "$INSTDIR\AUTHORS" -+ Delete "$INSTDIR\*.exe" -+ Delete "$INSTDIR\ChangeLog" -+ Delete "$INSTDIR\COPYING" -+ Delete "$INSTDIR\*.dll" -+ Delete "$INSTDIR\*.lib" -+ Delete "$INSTDIR\*.xml" -+ Delete "$INSTDIR\x64\*.dll" -+ Delete "$INSTDIR\x64\*.lib" -+ Delete "$INSTDIR\x64\*.exe" -+ Delete "$INSTDIR\x64\*.xml" -+ Delete "$INSTDIR\README" -+ Delete "$SYSDIR\libcec.dll" -+ ${If} ${RunningX64} -+ Delete "$SYSDIR\libcec.x64.dll" -+ ${EndIf} -+ -+ ; Uninstall the driver -+ ReadRegStr $1 HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" "" -+ ${If} $1 != "" -+ ExecWait '"$1\Uninstall.exe" /S _?=$1' -+ ${EndIf} -+ -+ RMDir /r "$INSTDIR\include" -+ Delete "$INSTDIR\Uninstall.exe" -+ RMDir /r "$INSTDIR" -+ RMDir "$PROGRAMFILES\Pulse-Eight" -+ -+ !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder -+ Delete "$SMPROGRAMS\$StartMenuFolder\libCEC Tray.lnk" -+ ${If} ${RunningX64} -+ Delete "$SMPROGRAMS\$StartMenuFolder\libCEC Tray (x64).lnk" -+ ${EndIf} -+ Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" -+ ${If} ${RunningX64} -+ Delete "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" -+ ${EndIf} -+ Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall Pulse-Eight USB-CEC Adapter software.lnk" -+ Delete "$SMPROGRAMS\$StartMenuFolder\Visit Pulse-Eight.url" -+ RMDir "$SMPROGRAMS\$StartMenuFolder" -+ -+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter software" -+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" -+ DeleteRegKey /ifempty HKLM "Software\Pulse-Eight\USB-CEC Adapter software" -+ DeleteRegKey /ifempty HKLM "Software\Pulse-Eight" -+SectionEnd -Binärdateien libcec-2.1.4/project/LibCecSharp/LibCecSharp.rc und libcec-imx6/project/LibCecSharp/LibCecSharp.rc sind verschieden. -diff -Nur libcec-2.1.4/project/LibCecSharp/LibCecSharp.vcxproj libcec-imx6/project/LibCecSharp/LibCecSharp.vcxproj ---- libcec-2.1.4/project/LibCecSharp/LibCecSharp.vcxproj 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/LibCecSharp/LibCecSharp.vcxproj 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,208 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup Label="ProjectConfigurations"> -+ <ProjectConfiguration Include="Debug|Win32"> -+ <Configuration>Debug</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Debug|x64"> -+ <Configuration>Debug</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|Win32"> -+ <Configuration>Release</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|x64"> -+ <Configuration>Release</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ </ItemGroup> -+ <PropertyGroup Label="Globals"> -+ <ProjectGuid>{E54D4581-CD59-4687-BB10-694B8192EABA}</ProjectGuid> -+ <RootNamespace>LibCecSharp</RootNamespace> -+ <Keyword>ManagedCProj</Keyword> -+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <PlatformToolset>v90</PlatformToolset> -+ <CharacterSet>Unicode</CharacterSet> -+ <CLRSupport>true</CLRSupport> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <PlatformToolset>v90</PlatformToolset> -+ <CharacterSet>Unicode</CharacterSet> -+ <CLRSupport>true</CLRSupport> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <PlatformToolset>v90</PlatformToolset> -+ <CharacterSet>Unicode</CharacterSet> -+ <CLRSupport>true</CLRSupport> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <PlatformToolset>v90</PlatformToolset> -+ <CharacterSet>Unicode</CharacterSet> -+ <CLRSupport>true</CLRSupport> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -+ <ImportGroup Label="ExtensionSettings"> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <PropertyGroup Label="UserMacros" /> -+ <PropertyGroup> -+ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ReferencePath>$(SolutionDir)..;$(ReferencePath)</ReferencePath> -+ <OutDir>$(SolutionDir)..\build\</OutDir> -+ <IntDir>$(Configuration)\</IntDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <ReferencePath>$(SolutionDir)..;$(ReferencePath)</ReferencePath> -+ <OutDir>$(SolutionDir)..\build\x64\</OutDir> -+ <IntDir>$(Platform)\$(Configuration)\</IntDir> -+ <LinkIncremental>true</LinkIncremental> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ReferencePath>$(SolutionDir)..;$(ReferencePath)</ReferencePath> -+ <OutDir>$(SolutionDir)..\build\</OutDir> -+ <IntDir>$(Configuration)\</IntDir> -+ <LinkIncremental>false</LinkIncremental> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(