diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
| commit | a07e197d7552bed16d7c9bf428d4a43a3f458a23 (patch) | |
| tree | da39ede4c33e62e1124ffd15d27c41cbe1c1f64c /package | |
| parent | 753383bdf29033a1c7244e31c42c2f5d9906010f (diff) | |
| parent | f91c0a6d288596bf002df4f750ab77e0c241e924 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
68 files changed, 1037 insertions, 3553 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index aff18e59e..610bb3cc8 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,9 +5,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.28 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 361552d5b1cacd0a1e7ba09e69990211 -PKG_DESCR:= mixer/player utility +PKG_DESCR:= mixer/player/record utilities PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib libpthread librt PKG_BUILDDEP:= alsa-lib @@ -35,7 +35,7 @@ endif alsa-utils-install: ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin - ${CP} ${WRKINST}/usr/bin/{aplay,amixer} ${IDIR_ALSA_UTILS}/usr/bin + ${CP} ${WRKINST}/usr/bin/{aplay,amixer,arecord} ${IDIR_ALSA_UTILS}/usr/bin ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) ${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \ ${IDIR_ALSA_UTILS}/usr/bin diff --git a/package/bash/Makefile b/package/bash/Makefile index 1e1aecf2e..14381db97 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 4.3 +PKG_VERSION:= 4.3.30 PKG_RELEASE:= 1 -PKG_MD5SUM:= 81348932d5da294953e15d4814c74dd1 +PKG_MD5SUM:= a27b3ee9be83bd3ba448c0ff52b28447 PKG_DESCR:= bourne-again shell PKG_SECTION:= base/shells PKG_URL:= http://www.gnu.org/software/bash/ diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index b48737cf5..e782cafea 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -4,20 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cryptsetup -PKG_VERSION:= 1.6.3 +PKG_VERSION:= 1.6.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837 +PKG_MD5SUM:= 179c0781de59838a4e39f61b2df5ea48 PKG_DESCR:= utility used to conveniently setup disk encryption PKG_SECTION:= app/crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ -PKG_SITES:= http://cryptsetup.googlecode.com/files/ +PKG_SITES:= https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/cryptsetup/patches/patch-lib_libdevmapper_c b/package/cryptsetup/patches/patch-lib_libdevmapper_c deleted file mode 100644 index 731f8bc4d..000000000 --- a/package/cryptsetup/patches/patch-lib_libdevmapper_c +++ /dev/null @@ -1,10 +0,0 @@ ---- cryptsetup-1.6.3.orig/lib/libdevmapper.c 2013-11-14 08:31:44.000000000 +0100 -+++ cryptsetup-1.6.3/lib/libdevmapper.c 2014-01-08 10:15:32.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <linux/fs.h> - #include <uuid/uuid.h> - #include <sys/utsname.h> -+#include <sys/stat.h> - - #include "internal.h" - diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh deleted file mode 100644 index b9250d32f..000000000 --- a/package/cryptsetup/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- cryptsetup-1.6.3.orig/ltmain.sh 2013-12-08 18:15:38.000000000 +0100 -+++ cryptsetup-1.6.3/ltmain.sh 2014-01-08 01:18:38.000000000 +0100 -@@ -5853,7 +5853,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/curl/Makefile b/package/curl/Makefile index 9734c6dcb..c30302cee 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.37.1 +PKG_VERSION:= 7.39.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= a944b069ac70c3e574c25def6e1d6b2f +PKG_MD5SUM:= 88c5650122873712296d4b1db3f12e6c PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 42db0f9ab..193bdf7e0 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= eudev -PKG_VERSION:= 1.9 +PKG_VERSION:= 2.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= da8083b30b44177445b21e8299af23a1 +PKG_MD5SUM:= dd945ce34314b4544e9036153d3a97e9 PKG_DESCR:= device manager (udev clone) PKG_SECTION:= sys/utils PKG_BUILDDEP:= gperf-host glib diff --git a/package/eudev/patches/patch-src_libudev_libudev-monitor_c b/package/eudev/patches/patch-src_libudev_libudev-monitor_c new file mode 100644 index 000000000..99f812f31 --- /dev/null +++ b/package/eudev/patches/patch-src_libudev_libudev-monitor_c @@ -0,0 +1,15 @@ +--- eudev-2.1.1.orig/src/libudev/libudev-monitor.c 2014-09-18 17:47:23.000000000 -0500 ++++ eudev-2.1.1/src/libudev/libudev-monitor.c 2014-10-29 20:46:45.742352002 -0500 +@@ -119,11 +119,8 @@ static bool udev_has_devtmpfs(struct ude + int r; + + r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0); +- if (r < 0) { +- if (errno != EOPNOTSUPP) +- udev_err(udev, "name_to_handle_at on /dev: %m\n"); ++ if (r < 0) + return false; +- } + + f = fopen("/proc/self/mountinfo", "re"); + if (!f) diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index c766fca11..2a372a564 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 2.4.1 +PKG_VERSION:= 2.4.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= c36caa8d29b3677dcb7bd8c546890c9d +PKG_MD5SUM:= 8da635baff57d7ab704b1daca5a99b47 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_FDEPENDS:= libpthread diff --git a/package/firmware-imx/Makefile b/package/firmware-imx/Makefile index 741926d1d..97eae9e58 100644 --- a/package/firmware-imx/Makefile +++ b/package/firmware-imx/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= firmware-imx -PKG_VERSION:= 3.10.17-1.0.0 +PKG_VERSION:= 3.10.31-1.1.0-beta PKG_RELEASE:= 1 -PKG_MD5SUM:= 29a54f6e5bf889a00cd8ca85080af223 -PKG_DESCR:= IMX firmware (Freescale) +PKG_MD5SUM:= 4e102affc4273f424da4cec9f46adae8 +PKG_DESCR:= IMX VPU firmware (Freescale) PKG_SECTION:= sys/firmware PKG_URL:= http://www.freescale.com/ PKG_SITES:= http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ @@ -25,8 +25,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual firmware-imx-install: - $(INSTALL_DIR) $(IDIR_FIRMWARE_IMX)/lib/firmware - ${CP} ${WRKBUILD}/firmware/{sdma,vpu} \ - $(IDIR_FIRMWARE_IMX)/lib/firmware + $(INSTALL_DIR) $(IDIR_FIRMWARE_IMX)/lib/firmware/vpu + ${CP} ${WRKBUILD}/firmware/vpu/vpu_fw_imx6* \ + $(IDIR_FIRMWARE_IMX)/lib/firmware/vpu include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 72a4a943d..d517cd66c 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.3.4 +PKG_VERSION:= 3.3.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 908dc1e98e28cb1c2c255a71785a4af2 +PKG_MD5SUM:= c0a72b2c0553fe1c4992e30835808012 PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp diff --git a/package/imx-lib/Makefile b/package/imx-lib/Makefile index 10566a5fb..eacee4a01 100644 --- a/package/imx-lib/Makefile +++ b/package/imx-lib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= imx-lib -PKG_VERSION:= 3.10.17-1.0.0 +PKG_VERSION:= 3.10.31-1.1.0-beta PKG_RELEASE:= 1 -PKG_MD5SUM:= 8e3346d5f33b5aa5f915a0dd8aa99cc9 +PKG_MD5SUM:= 0485e457eafe5a10274d171b3af79e2f PKG_DESCR:= IMX library (Freescale) PKG_SECTION:= libs/video PKG_URL:= http://www.freescale.com/ diff --git a/package/imx-vpu/Makefile b/package/imx-vpu/Makefile index 48337994d..bac6292bc 100644 --- a/package/imx-vpu/Makefile +++ b/package/imx-vpu/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= imx-vpu -PKG_VERSION:= 3.10.17-1.0.0 +PKG_VERSION:= 3.10.31-1.1.0-beta PKG_RELEASE:= 1 -PKG_MD5SUM:= 71ea1b803864101ebf88a1bab45514d2 +PKG_MD5SUM:= ab76e7395b6a178a8538a6d5beb87656 PKG_DESCR:= IMX VPU library (Freescale) PKG_DEPENDS:= firmware-imx PKG_SECTION:= libs/video diff --git a/package/ipset/patches/patch-kernel_ipt_SET_c b/package/ipset/patches/patch-kernel_ipt_SET_c deleted file mode 100644 index 22c1aff14..000000000 --- a/package/ipset/patches/patch-kernel_ipt_SET_c +++ /dev/null @@ -1,30 +0,0 @@ ---- ipset-4.1.orig/kernel/ipt_SET.c 2009-11-10 21:45:41.000000000 +0100 -+++ ipset-4.1/kernel/ipt_SET.c 2010-08-29 14:45:51.863658421 +0200 -@@ -64,9 +64,12 @@ target(struct sk_buff *skb, - unsigned int hooknum, - const struct xt_target *target, - const void *targinfo) --#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */ -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) - target(struct sk_buff *skb, - const struct xt_target_param *par) -+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */ -+target(struct sk_buff *skb, -+ const struct xt_action_param *par) - #endif - { - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) -@@ -127,9 +130,12 @@ checkentry(const char *tablename, - const struct xt_target *target, - void *targinfo, - unsigned int hook_mask) --#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */ -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) - static bool - checkentry(const struct xt_tgchk_param *par) -+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */ -+static int -+checkentry(const struct xt_tgchk_param *par) - #endif - { - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index b65bf5645..8b3fc912b 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.7 +PKG_VERSION:= 2.0.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 457f49ad1708eea1f6b332484855fe25 +PKG_MD5SUM:= 2c4dec4e857e84ca530478bac0ec114b PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib diff --git a/package/kmod/Makefile b/package/kmod/Makefile index 57e1c10c2..814ea5ac0 100644 --- a/package/kmod/Makefile +++ b/package/kmod/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kmod -PKG_VERSION:= 18 +PKG_VERSION:= 19 PKG_RELEASE:= 1 -PKG_MD5SUM:= 82835c7f01983634e06ca72b4ee30cc6 +PKG_MD5SUM:= a08643f814aa4efc12211c6e5909f4d9 PKG_DESCR:= kernel module utils PKG_SECTION:= sys/utils PKG_DEPENDS:= libkmod diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 87d487894..c0e1866a9 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.0rc3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ab161aa0dee4ca77b977d3ca2f4ebdd5 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 @@ -105,9 +105,10 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --disable-wayland \ --disable-pulse \ --disable-mid \ + --disable-debug \ --enable-alsa \ --enable-libvorbisenc \ - --disable-debug \ + --enable-texturepacker \ --enable-udev \ --with-ffmpeg=shared @@ -173,23 +174,25 @@ CONFIGURE_ARGS+= --disable-x11 \ endif pre-configure: - (cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh) + (cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh) pre-build: - PATH=$(HOST_PATH) \ + PATH='$(HOST_PATH)' \ make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \ CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \ -C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder kodi-install: - $(INSTALL_DIR) $(IDIR_KODI)/usr/lib/xbmc/addons - $(CP) $(WRKINST)/usr/lib/xbmc/* \ - $(IDIR_KODI)/usr/lib/xbmc - $(INSTALL_DIR) $(IDIR_KODI)/usr/share/xbmc - $(CP) $(WRKINST)/usr/share/xbmc/* \ - $(IDIR_KODI)/usr/share/xbmc + $(INSTALL_DIR) $(IDIR_KODI)/usr/lib/kodi/addons + $(CP) $(WRKINST)/usr/lib/kodi/* \ + $(IDIR_KODI)/usr/lib/kodi + $(INSTALL_DIR) $(IDIR_KODI)/usr/share/kodi + $(CP) $(WRKINST)/usr/share/kodi/* \ + $(IDIR_KODI)/usr/share/kodi $(INSTALL_DIR) $(IDIR_KODI)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/xbmc \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/kodi-standalone \ + $(IDIR_KODI)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/kodi \ $(IDIR_KODI)/usr/bin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index b15b1d6d4..6dddfd421 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -12,11 +12,10 @@ autostart) exec sh $0 start ;; start) - export LD_LIBRARY_PATH=/opt/vc/lib - xbmc & + kodi & ;; stop) - kill $(pgrep -f /usr/lib/xbmc/xbmc.bin) + kill $(pgrep -f /usr/lib/kodi/kodi.bin) ;; restart) sh $0 stop diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in index 3db5985c7..aab2c5057 100644 --- a/package/kodi/patches/patch-configure_in +++ b/package/kodi/patches/patch-configure_in @@ -1,6 +1,6 @@ ---- kodi-14.0alpha4.orig/configure.in 2014-10-06 11:34:24.000000000 -0500 -+++ kodi-14.0alpha4/configure.in 2014-10-08 01:40:53.444436000 -0500 -@@ -1011,7 +1011,7 @@ if test "$use_gles" = "yes"; then +--- kodi-14.0rc2.orig/configure.in 2014-12-05 19:38:42.000000000 -0600 ++++ kodi-14.0rc2/configure.in 2014-12-07 03:43:25.212418001 -0600 +@@ -1008,7 +1008,7 @@ if test "$use_gles" = "yes"; then AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."]) AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."]) AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.) diff --git a/package/kodi/patches/patch-tools_Linux_kodi_sh_in b/package/kodi/patches/patch-tools_Linux_kodi_sh_in new file mode 100644 index 000000000..2d0e188d1 --- /dev/null +++ b/package/kodi/patches/patch-tools_Linux_kodi_sh_in @@ -0,0 +1,39 @@ +--- kodi-14.0rc2.orig/tools/Linux/kodi.sh.in 2014-12-05 19:38:43.000000000 -0600 ++++ kodi-14.0rc2/tools/Linux/kodi.sh.in 2014-12-07 08:33:01.128418001 -0600 +@@ -86,15 +86,7 @@ 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 OpenADK >> $FILE + echo "############## END SYSTEM INFO ##############" >> $FILE + echo >> $FILE + echo "############### STACK TRACE #################" >> $FILE +@@ -138,19 +130,6 @@ print_crash_report() + } + + migrate_home +-python @datadir@/${bin_name}/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 +- if [ ! $? = "0" ]; then +- echo "${bin_name}: ulimit is unsupported by this shell" 1>&2 +- fi +-fi + + LOOP=1 + while [ $(( $LOOP )) = "1" ] 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 index a90c36f89..2235d9f8b 100644 --- a/package/kodi/patches/patch-xbmc_Application_cpp +++ b/package/kodi/patches/patch-xbmc_Application_cpp @@ -1,41 +1,14 @@ ---- 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( +--- kodi-14.0rc2.orig/xbmc/Application.cpp 2014-12-05 19:38:44.000000000 -0600 ++++ kodi-14.0rc2/xbmc/Application.cpp 2014-12-07 10:16:27.900418001 -0600 +@@ -1076,10 +1076,7 @@ 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"); + std::string userHome; +- if (getenv("HOME")) +- userHome = getenv("HOME"); +- else +- userHome = "/root"; ++ userHome = "/data/kodi"; -- 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); + std::string appBinPath, appPath; + std::string appName = CCompileInfo::GetAppName(); diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp index 0be4452a8..1660c5a36 100644 --- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp +++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp @@ -1,6 +1,6 @@ ---- kodi-14.0alpha4.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-09-05 14:09:59.000000000 +0200 -+++ kodi-14.0alpha4/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-09-05 15:53:47.432904545 +0200 -@@ -490,8 +490,8 @@ void CDVDDemuxFFmpeg::Reset() +--- kodi-14.0rc2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-05 19:38:44.000000000 -0600 ++++ kodi-14.0rc2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-07 03:43:25.308418001 -0600 +@@ -520,8 +520,8 @@ void CDVDDemuxFFmpeg::Reset() void CDVDDemuxFFmpeg::Flush() { // naughty usage of an internal ffmpeg function @@ -9,5 +9,5 @@ + //if (m_pFormatContext) + // av_read_frame_flush(m_pFormatContext); - m_iCurrentPts = DVD_NOPTS_VALUE; + m_currentPts = DVD_NOPTS_VALUE; diff --git a/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp b/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp new file mode 100644 index 000000000..1fddf255f --- /dev/null +++ b/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp @@ -0,0 +1,52 @@ +--- kodi-14.0rc2.orig/xbmc/utils/SystemInfo.cpp 2014-12-05 19:38:44.000000000 -0600 ++++ kodi-14.0rc2/xbmc/utils/SystemInfo.cpp 2014-12-07 23:48:19.332418001 -0600 +@@ -615,16 +615,11 @@ std::string CSysInfo::GetOsName(bool emp + osName = "iOS"; + #elif defined(TARGET_DARWIN_OSX) + osName = "OS X"; +-#elif defined (TARGET_ANDROID) ++#elif defined(TARGET_ANDROID) + osName = "Android"; + #elif defined(TARGET_LINUX) +- osName = getValueFromOs_release("NAME"); +- if (osName.empty()) +- osName = getValueFromLsb_release(lsb_rel_distributor); +- if (osName.empty()) +- osName = getValueFromOs_release("ID"); +-#endif // defined(TARGET_LINUX) +- ++ osName = "OpenADK"; ++#endif + if (osName.empty()) + osName = "Unknown OS"; + } +@@ -665,7 +660,7 @@ std::string CSysInfo::GetOsVersion(void) + #elif defined(TARGET_LINUX) + osVersion = getValueFromOs_release("VERSION_ID"); + if (osVersion.empty()) +- osVersion = getValueFromLsb_release(lsb_rel_release); ++ osVersion = "1.0"; + #endif // defined(TARGET_LINUX) + + if (osVersion.empty()) +@@ -737,19 +732,7 @@ std::string CSysInfo::GetOsPrettyNameWit + #elif defined(TARGET_ANDROID) + osNameVer = GetOsName() + " " + GetOsVersion() + " API level " + StringUtils::Format("%d", CJNIBuild::SDK_INT); + #elif defined(TARGET_LINUX) +- osNameVer = getValueFromOs_release("PRETTY_NAME"); +- if (osNameVer.empty()) +- { +- osNameVer = getValueFromLsb_release(lsb_rel_description); +- std::string osName(GetOsName(true)); +- if (!osName.empty() && osNameVer.find(osName) == std::string::npos) +- osNameVer = osName + osNameVer; +- if (osNameVer.empty()) +- osNameVer = "Unknown Linux Distribution"; +- } +- +- if (osNameVer.find(GetOsVersion()) == std::string::npos) +- osNameVer += " " + GetOsVersion(); ++ osNameVer = GetOsName() + " " + GetOsVersion(); + #endif // defined(TARGET_LINUX) + + if (osNameVer.empty()) 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="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ReferencePath>$(SolutionDir)..;$(ReferencePath)</ReferencePath> -+ <OutDir>$(SolutionDir)..\build\x64\</OutDir> -+ <IntDir>$(Platform)\$(Configuration)\</IntDir> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <Midl> -+ <TargetEnvironment>X64</TargetEnvironment> -+ </Midl> -+ <ClCompile> -+ <Optimization>Disabled</Optimization> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> -+ <PrecompiledHeader /> -+ <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles> -+ <WarningLevel>Level3</WarningLevel> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ </ClCompile> -+ <Link> -+ <AdditionalDependencies>$(OutDir)libcec.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AssemblyDebug>true</AssemblyDebug> -+ <TargetMachine>MachineX86</TargetMachine> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <Midl> -+ <TargetEnvironment>X64</TargetEnvironment> -+ </Midl> -+ <ClCompile> -+ <Optimization>Disabled</Optimization> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> -+ <PrecompiledHeader /> -+ <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles> -+ <WarningLevel>Level3</WarningLevel> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ </ClCompile> -+ <Link> -+ <AdditionalDependencies>$(OutDir)libcec.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AssemblyDebug>true</AssemblyDebug> -+ <TargetMachine>MachineX64</TargetMachine> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <Midl> -+ <TargetEnvironment>X64</TargetEnvironment> -+ </Midl> -+ <ClCompile> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -+ <PrecompiledHeader /> -+ <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles> -+ <WarningLevel>Level3</WarningLevel> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ </ClCompile> -+ <Link> -+ <AdditionalDependencies>$(OutDir)libcec.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <TargetMachine>MachineX86</TargetMachine> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <Midl> -+ <TargetEnvironment>X64</TargetEnvironment> -+ </Midl> -+ <ClCompile> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -+ <PrecompiledHeader /> -+ <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles> -+ <WarningLevel>Level3</WarningLevel> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ </ClCompile> -+ <Link> -+ <AdditionalDependencies>$(OutDir)libcec.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemGroup> -+ <Reference Include="System"> -+ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> -+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly> -+ </Reference> -+ <Reference Include="System.Data"> -+ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> -+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly> -+ </Reference> -+ <Reference Include="System.Xml"> -+ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> -+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly> -+ </Reference> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\src\LibCecSharp\AssemblyInfo.cpp" /> -+ <ClCompile Include="..\..\src\LibCecSharp\LibCecSharp.cpp" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\include\cec.h" /> -+ <ClInclude Include="..\..\src\LibCecSharp\CecSharpTypes.h" /> -+ <ClInclude Include="..\..\include\cectypes.h" /> -+ <ClInclude Include="..\..\src\lib\platform\windows\stdint.h" /> -+ <ClInclude Include="resource.h" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ResourceCompile Include="LibCecSharp.rc" /> -+ </ItemGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> -+</Project> -\ Kein Zeilenumbruch am Dateiende. -diff -Nur libcec-2.1.4/project/LibCecSharp/LibCecSharp.vcxproj.filters libcec-imx6/project/LibCecSharp/LibCecSharp.vcxproj.filters ---- libcec-2.1.4/project/LibCecSharp/LibCecSharp.vcxproj.filters 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/LibCecSharp/LibCecSharp.vcxproj.filters 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,41 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup> -+ <Filter Include="Source Files"> -+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> -+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> -+ </Filter> -+ <Filter Include="Header Files"> -+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> -+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> -+ </Filter> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\src\LibCecSharp\AssemblyInfo.cpp"> -+ <Filter>Source Files</Filter> -+ </ClCompile> -+ <ClCompile Include="..\..\src\LibCecSharp\LibCecSharp.cpp"> -+ <Filter>Source Files</Filter> -+ </ClCompile> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\include\cec.h"> -+ <Filter>Header Files</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\LibCecSharp\CecSharpTypes.h"> -+ <Filter>Header Files</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\include\cectypes.h"> -+ <Filter>Header Files</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\src\lib\platform\windows\stdint.h"> -+ <Filter>Header Files</Filter> -+ </ClInclude> -+ <ClInclude Include="resource.h"> -+ <Filter>Header Files</Filter> -+ </ClInclude> -+ </ItemGroup> -+ <ItemGroup> -+ <ResourceCompile Include="LibCecSharp.rc" /> -+ </ItemGroup> -+</Project> -\ Kein Zeilenumbruch am Dateiende. -Binärdateien libcec-2.1.4/project/LibCecSharp/resource.h und libcec-imx6/project/LibCecSharp/resource.h sind verschieden. -diff -Nur libcec-2.1.4/project/libcec.sln libcec-imx6/project/libcec.sln ---- libcec-2.1.4/project/libcec.sln 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/libcec.sln 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,74 @@ -+ -+Microsoft Visual Studio Solution File, Format Version 12.00 -+# Visual Studio 2012 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec\libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient\testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}" -+ ProjectSection(ProjectDependencies) = postProject -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} -+ EndProjectSection -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp\LibCecSharp.vcxproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}" -+ ProjectSection(ProjectDependencies) = postProject -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} -+ EndProjectSection -+EndProject -+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B119505D-5CD1-48E4-BED1-9C2BF26153D5}" -+EndProject -+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CecSharpTester", "..\src\CecSharpTester\CecSharpTester.csproj", "{B6A7F3A9-F47C-41E5-9754-0BFF233B1172}" -+EndProject -+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibCECTray", "..\src\LibCecTray\LibCECTray.csproj", "{58C106FE-C159-46D3-97E1-73AB83232670}" -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|x64 = Debug|x64 -+ Debug|x86 = Debug|x86 -+ Release|x64 = Release|x64 -+ Release|x86 = Release|x86 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x64.ActiveCfg = Debug|x64 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x64.Build.0 = Debug|x64 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x86.ActiveCfg = Debug|Win32 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x86.Build.0 = Debug|Win32 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x64.ActiveCfg = Release|x64 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x64.Build.0 = Release|x64 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x86.ActiveCfg = Release|Win32 -+ {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x86.Build.0 = Release|Win32 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x64.ActiveCfg = Debug|x64 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x64.Build.0 = Debug|x64 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x86.ActiveCfg = Debug|Win32 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x86.Build.0 = Debug|Win32 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.ActiveCfg = Release|x64 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.Build.0 = Release|x64 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x86.ActiveCfg = Release|Win32 -+ {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x86.Build.0 = Release|Win32 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.ActiveCfg = Debug|x64 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.Build.0 = Debug|x64 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.ActiveCfg = Debug|Win32 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.Build.0 = Debug|Win32 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.ActiveCfg = Release|x64 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.Build.0 = Release|x64 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.ActiveCfg = Release|Win32 -+ {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.Build.0 = Release|Win32 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.ActiveCfg = Debug|x64 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.Build.0 = Debug|x64 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.ActiveCfg = Debug|x86 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.Build.0 = Debug|x86 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.ActiveCfg = Release|x64 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.Build.0 = Release|x64 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.ActiveCfg = Release|x86 -+ {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.Build.0 = Release|x86 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.ActiveCfg = Debug|x64 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.Build.0 = Debug|x64 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.ActiveCfg = Debug|x86 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.Build.0 = Debug|x86 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.ActiveCfg = Release|x64 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.Build.0 = Release|x64 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.ActiveCfg = Release|x86 -+ {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.Build.0 = Release|x86 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+EndGlobal -diff -Nur libcec-2.1.4/project/p8-usbcec-driver.nsi libcec-imx6/project/p8-usbcec-driver.nsi ---- libcec-2.1.4/project/p8-usbcec-driver.nsi 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/p8-usbcec-driver.nsi 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,118 @@ -+;p8-usbcec-driver 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 USB-CEC Adapter" -+OutFile "..\build\p8-usbcec-driver-installer.exe" -+ -+XPStyle on -+InstallDir "$PROGRAMFILES\Pulse-Eight\USB-CEC Adapter\driver" -+InstallDirRegKey HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" "" -+RequestExecutionLevel admin -+ -+!define MUI_FINISHPAGE_LINK "Visit http://www.pulse-eight.com/ for more information." -+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.pulse-eight.com/" -+!define MUI_ABORTWARNING -+ -+!insertmacro MUI_PAGE_WELCOME -+!insertmacro MUI_PAGE_LICENSE "..\COPYING" -+!insertmacro MUI_PAGE_DIRECTORY -+ -+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Pulse-Eight\USB-CEC Adapter driver" -+ -+!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 only" -+ -+Section "USB-CEC driver" SecDriver -+ SetShellVarContext current -+ SectionIn RO -+ SectionIn 1 -+ -+ ; Copy to the installation directory -+ SetOutPath "$INSTDIR" -+ File "..\AUTHORS" -+ File "..\COPYING" -+ -+ ; Copy the driver installer and .inf file -+ File "..\build\dpinst-amd64.exe" -+ File "..\build\dpinst-x86.exe" -+ File "..\driver\p8usb-cec.inf" -+ File "..\driver\p8usb-cec.cat" -+ -+ ;Store installation folder -+ WriteRegStr HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" "" $INSTDIR -+ -+ ;Create uninstaller -+ WriteUninstaller "$INSTDIR\Uninstall.exe" -+ -+ ;add entry to add/remove programs -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "DisplayName" "Pulse-Eight USB-CEC Adapter driver" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "UninstallString" "$INSTDIR\uninstall.exe" -+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "NoModify" 1 -+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "NoRepair" 1 -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "InstallLocation" "$INSTDIR" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "Publisher" "Pulse-Eight Limited" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "HelpLink" "http://www.pulse-eight.com/" -+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" \ -+ "URLInfoAbout" "http://www.pulse-eight.com" -+ -+ ;install driver -+ ${If} ${RunningX64} -+ ExecWait '"$INSTDIR\dpinst-amd64.exe" /lm /sa /sw /PATH "$INSTDIR"' -+ ${Else} -+ ExecWait '"$INSTDIR\dpinst-x86.exe" /lm /sa /sw /PATH "$INSTDIR"' -+ ${EndIf} -+SectionEnd -+ -+;-------------------------------- -+;Uninstaller Section -+ -+Section "Uninstall" -+ -+ SetShellVarContext current -+ -+ ${If} ${RunningX64} -+ ExecWait '"$INSTDIR\dpinst-amd64.exe" /u "$INSTDIR\p8usb-cec.inf"' -+ ${Else} -+ ExecWait '"$INSTDIR\dpinst-x64.exe" /u "$INSTDIR\p8usb-cec.inf"' -+ ${EndIf} -+ Delete "$INSTDIR\AUTHORS" -+ Delete "$INSTDIR\COPYING" -+ Delete "$INSTDIR\p8usb-cec.inf" -+ Delete "$INSTDIR\p8usb-cec.cat" -+ Delete "$INSTDIR\dpinst-amd64.exe" -+ Delete "$INSTDIR\dpinst-x86.exe" -+ -+ RMDir /r "$INSTDIR\include" -+ Delete "$INSTDIR\Uninstall.exe" -+ RMDir /r "$INSTDIR" -+ RMDir "$PROGRAMFILES\Pulse-Eight\USB-CEC Adapter" -+ RMDir "$PROGRAMFILES\Pulse-Eight" -+ -+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pulse-Eight USB-CEC Adapter driver" -+ DeleteRegKey /ifempty HKLM "Software\Pulse-Eight\USB-CEC Adapter driver" -+ DeleteRegKey /ifempty HKLM "Software\Pulse-Eight" -+ -+SectionEnd -diff -Nur libcec-2.1.4/project/RPi/bootstrap.sh libcec-imx6/project/RPi/bootstrap.sh ---- libcec-2.1.4/project/RPi/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/RPi/bootstrap.sh 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,32 @@ -+#!/bin/bash -+ -+_usage() -+{ -+ echo "Usage: $0 /path/to/toolchain /source/path" -+ exit 1 -+} -+ -+if [[ -z "$2" || ! -d "$1" || ! -d "$2" ]]; then -+ echo "1 = '$1'" -+ echo "2 = '$2'" -+ _usage -+fi -+ -+SCRIPT_PATH=`dirname $0` -+cd $SCRIPT_PATH -+SCRIPT_PATH=`pwd` -+cd - -+ -+source $SCRIPT_PATH/config -+mkdir -p $SCRIPT_PATH/deps -+ -+cd "$2" -+ -+if [ -f "configure.ac" ]; then -+ _set_toolchain_path "$1" -+ autoreconf -vif -+ exit $? -+fi -+ -+exit 0 -+ -diff -Nur libcec-2.1.4/project/RPi/build-deps.sh libcec-imx6/project/RPi/build-deps.sh ---- libcec-2.1.4/project/RPi/build-deps.sh 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/RPi/build-deps.sh 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,36 @@ -+#!/bin/bash -+ -+SCRIPT_PATH=`dirname $0` -+cd $SCRIPT_PATH -+SCRIPT_PATH=`pwd` -+cd - -+ -+source $SCRIPT_PATH/config -+ -+mkdir -p $SCRIPT_PATH/deps/build -+cd $SCRIPT_PATH/deps/build -+ -+if [ ! -d lockdev ]; then -+ wget ${TARBALL_LOCATION}${LOCKDEV_TARBALL} -+ tar -Jxf $LOCKDEV_TARBALL -+ -+ mv `echo $LOCKDEV_TARBALL | sed 's/.tar.xz//'` lockdev -+ rm $LOCKDEV_TARBALL -+ -+ cd $SCRIPT_PATH/deps/build/lockdev && \ -+ $SCRIPT_PATH/bootstrap.sh $SCRIPT_PATH/toolchain . -+ -+ if [ $? -eq 0 ]; then -+ _set_toolchain_path "$SCRIPT_PATH/toolchain" -+ ./configure --host=$TARGET_HOST --build=`cc -dumpmachine` --prefix=$SCRIPT_PATH/deps && \ -+ make && \ -+ make install -+ -+ exit $? -+ else -+ exit 1 -+ fi -+fi -+ -+exit 0 -+ -diff -Nur libcec-2.1.4/project/RPi/build.sh libcec-imx6/project/RPi/build.sh ---- libcec-2.1.4/project/RPi/build.sh 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/RPi/build.sh 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,37 @@ -+#!/bin/bash -+ -+SCRIPT_PATH=`dirname $0` -+cd $SCRIPT_PATH -+SCRIPT_PATH=`pwd` -+cd - -+ -+if [ -z "$1" ]; then -+ DEST_DIR="/opt/libcec-rpi" -+else -+ DEST_DIR="$1" -+fi -+ -+source $SCRIPT_PATH/config -+ -+$SCRIPT_PATH/get-toolchain.sh && \ -+$SCRIPT_PATH/build-deps.sh && \ -+$SCRIPT_PATH/bootstrap.sh $SCRIPT_PATH/toolchain . -+ -+if [ $? -eq 0 ]; then -+ _set_toolchain_path "$SCRIPT_PATH/toolchain" -+ # configure with --enable-rpi-cec-api so we bug out if we can't find Pi support or can't build it -+ ./configure --host=$TARGET_HOST \ -+ --build=`cc -dumpmachine` \ -+ --prefix=$DEST_DIR \ -+ --enable-debug \ -+ --enable-rpi \ -+ --with-rpi-include-path="${SCRIPT_PATH}/firmware/hardfp/opt/vc/include" \ -+ --with-rpi-lib-path="${SCRIPT_PATH}/firmware/hardfp/opt/vc/lib" && \ -+ make clean && \ -+ make V=0 -+ -+ exit $? -+else -+ exit 1 -+fi -+ -diff -Nur libcec-2.1.4/project/RPi/config libcec-imx6/project/RPi/config ---- libcec-2.1.4/project/RPi/config 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/RPi/config 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,37 @@ -+TOOLCHAIN_GIT="git://github.com/raspberrypi/tools.git" -+FIRMWARE_GIT="git://github.com/raspberrypi/firmware.git" -+TARBALL_LOCATION="http://sources.openelec.tv/devel/" -+LOCKDEV_TARBALL="lockdev-16b8996.tar.xz" -+ -+_set_toolchain_path() -+{ -+ echo "Setting toolchain path to: '$1'" -+ -+ export TARGET_TOOLCHAIN_PATH="$1/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/bin" -+ export TARGET_TOOLCHAIN_LIB_PATH="$1/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/lib" -+ export TARGET_HOST="arm-bcm2708hardfp-linux-gnueabi" -+ -+ export CC=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-gcc -+ export CXX=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-g++ -+ export LD=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-ld -+ export AS=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-as -+ export AR=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-ar -+ export NM=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-nm -+ export RANLIB=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-ranlib -+ export OBJCOPY=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-objcopy -+ export OBJDUMP=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-objdump -+ export STRIP=${TARGET_TOOLCHAIN_PATH}/${TARGET_HOST}-strip -+ -+ export CPPFLAGS="-I${SCRIPT_PATH}/deps/include" -+ export CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard -Wno-psabi -Wa,-mno-warn-deprecated -O3 -fexcess-precision=fast -ffast-math -I${SCRIPT_PATH}/deps/include" -+ export CXXFLAGS="$CFLAGS" -+ export LDFLAGS="-march=armv6 -mtune=arm1176jzf-s -L${SCRIPT_PATH}/deps/lib" -+ -+ #export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH" -+ export PKG_CONFIG_LIBDIR="${SCRIPT_PATH}/deps/lib/pkgconfig:${SCRIPT_PATH}/deps/lib/share/pkgconfig" -+ export PKG_CONFIG_SYSROOT_DIR="${SCRIPT_PATH}/deps" -+ -+ export PATH="$TARGET_TOOLCHAIN_PATH:$PATH" -+ export LD_LIBRARY_PATH="$TARGET_TOOLCHAIN_LIB_PATH:$LD_LIBRARY_PATH" -+} -+ -diff -Nur libcec-2.1.4/project/RPi/get-toolchain.sh libcec-imx6/project/RPi/get-toolchain.sh ---- libcec-2.1.4/project/RPi/get-toolchain.sh 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/RPi/get-toolchain.sh 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,29 @@ -+#!/bin/bash -+ -+SCRIPT_PATH=`dirname $0` -+cd $SCRIPT_PATH -+SCRIPT_PATH=`pwd` -+cd - -+ -+source $SCRIPT_PATH/config -+ -+if [ ! -d $SCRIPT_PATH/toolchain ]; then -+ git clone $TOOLCHAIN_GIT $SCRIPT_PATH/toolchain -+else -+ cd $SCRIPT_PATH/toolchain -+# git pull -+fi -+ -+if [ ! -d $SCRIPT_PATH/firmware ]; then -+ git clone $FIRMWARE_GIT $SCRIPT_PATH/firmware -+else -+ cd $SCRIPT_PATH/firmware -+# git pull -+fi -+ -+if [[ -d $SCRIPT_PATH/toolchain && -d $SCRIPT_PATH/firmware ]]; then -+ exit 0 -+else -+ exit 1 -+fi -+ -Binärdateien libcec-2.1.4/project/testclient/resource.h und libcec-imx6/project/testclient/resource.h sind verschieden. -Binärdateien libcec-2.1.4/project/testclient/testclient.rc und libcec-imx6/project/testclient/testclient.rc sind verschieden. -diff -Nur libcec-2.1.4/project/testclient/testclient.vcxproj libcec-imx6/project/testclient/testclient.vcxproj ---- libcec-2.1.4/project/testclient/testclient.vcxproj 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/testclient/testclient.vcxproj 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,187 @@ -+<?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>{F01222BF-6B3D-43BD-B254-434031CB9887}</ProjectGuid> -+ <Keyword>Win32Proj</Keyword> -+ <RootNamespace>testclient</RootNamespace> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v100</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>Application</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> -+ <TargetName>cec-client</TargetName> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <OutDir>$(SolutionDir)..\build\x64\</OutDir> -+ <TargetName>cec-client</TargetName> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <OutDir>$(SolutionDir)..\build\</OutDir> -+ <TargetName>cec-client</TargetName> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <OutDir>$(SolutionDir)..\build\x64\</OutDir> -+ <TargetName>cec-client</TargetName> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ClCompile> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <WarningLevel>Level4</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>_USE_32BIT_TIME_T;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <AdditionalIncludeDirectories>$(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <Version> -+ </Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <ClCompile> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <WarningLevel>Level4</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <AdditionalIncludeDirectories>$(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <Version> -+ </Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level4</WarningLevel> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <Optimization>Full</Optimization> -+ <FunctionLevelLinking>false</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <PreprocessorDefinitions>_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>false</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <Version> -+ </Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ClCompile> -+ <WarningLevel>Level4</WarningLevel> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <Optimization>Full</Optimization> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_WARNINGS;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <DisableSpecificWarnings> -+ </DisableSpecificWarnings> -+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>false</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <Version> -+ </Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\include\cec.h" /> -+ <ClInclude Include="..\..\include\cecloader.h" /> -+ <ClInclude Include="resource.h" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp" /> -+ <ClCompile Include="..\..\src\testclient\main.cpp" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ResourceCompile Include="testclient.rc" /> -+ </ItemGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> -+</Project> -\ Kein Zeilenumbruch am Dateiende. -diff -Nur libcec-2.1.4/project/testclient/testclient.vcxproj.filters libcec-imx6/project/testclient/testclient.vcxproj.filters ---- libcec-2.1.4/project/testclient/testclient.vcxproj.filters 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/project/testclient/testclient.vcxproj.filters 2014-09-01 13:48:53.702431449 +0200 -@@ -0,0 +1,29 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup> -+ <Filter Include="exports"> -+ <UniqueIdentifier>{cc0a01c1-e1e7-4af8-9656-fa9463140613}</UniqueIdentifier> -+ </Filter> -+ <Filter Include="platform"> -+ <UniqueIdentifier>{f08c0a80-22d9-4bdd-90de-b9cf5fa88f99}</UniqueIdentifier> -+ </Filter> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\include\cec.h"> -+ <Filter>exports</Filter> -+ </ClInclude> -+ <ClInclude Include="..\..\include\cecloader.h"> -+ <Filter>exports</Filter> -+ </ClInclude> -+ <ClInclude Include="resource.h" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\src\testclient\main.cpp" /> -+ <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp"> -+ <Filter>platform</Filter> -+ </ClCompile> -+ </ItemGroup> -+ <ItemGroup> -+ <ResourceCompile Include="testclient.rc" /> -+ </ItemGroup> -+</Project> -\ Kein Zeilenumbruch am Dateiende. -diff -Nur libcec-2.1.4/src/lib/adapter/AdapterFactory.cpp libcec-imx6/src/lib/adapter/AdapterFactory.cpp ---- libcec-2.1.4/src/lib/adapter/AdapterFactory.cpp 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/src/lib/adapter/AdapterFactory.cpp 2014-09-01 13:48:54.718437326 +0200 -@@ -52,6 +52,11 @@ - #include "TDA995x/TDA995xCECAdapterCommunication.h" - #endif - -+#if defined(HAVE_IMX_API) -+#include "IMX/IMXCECAdapterDetection.h" -+#include "IMX/IMXCECAdapterCommunication.h" -+#endif -+ - using namespace std; - using namespace CEC; - -@@ -109,7 +114,22 @@ - } - #endif - --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) -+ -+#if defined(HAVE_IMX_API) -+ if (iAdaptersFound < iBufSize && CIMXCECAdapterDetection::FindAdapter() && -+ (!strDevicePath || !strcmp(strDevicePath, CEC_IMX_VIRTUAL_COM))) -+ { -+ snprintf(deviceList[iAdaptersFound].strComPath, sizeof(deviceList[iAdaptersFound].strComPath), CEC_IMX_PATH); -+ snprintf(deviceList[iAdaptersFound].strComName, sizeof(deviceList[iAdaptersFound].strComName), CEC_IMX_VIRTUAL_COM); -+ deviceList[iAdaptersFound].iVendorId = IMX_ADAPTER_VID; -+ deviceList[iAdaptersFound].iProductId = IMX_ADAPTER_PID; -+ deviceList[iAdaptersFound].adapterType = ADAPTERTYPE_IMX; -+ iAdaptersFound++; -+ } -+#endif -+ -+ -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_IMX_API) - #error "libCEC doesn't have support for any type of adapter. please check your build system or configuration" - #endif - -@@ -128,11 +148,16 @@ - return new CRPiCECAdapterCommunication(m_lib->m_cec); - #endif - -+#if defined(HAVE_IMX_API) -+ if (!strcmp(strPort, CEC_IMX_VIRTUAL_COM)) -+ return new CIMXCECAdapterCommunication(m_lib->m_cec); -+#endif -+ - #if defined(HAVE_P8_USB) - return new CUSBCECAdapterCommunication(m_lib->m_cec, strPort, iBaudRate); - #endif - --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_IMX_API) - return NULL; - #endif - } -diff -Nur libcec-2.1.4/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-imx6/src/lib/adapter/IMX/AdapterMessageQueue.h ---- libcec-2.1.4/src/lib/adapter/IMX/AdapterMessageQueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/src/lib/adapter/IMX/AdapterMessageQueue.h 2014-09-01 13:48:54.718437326 +0200 -@@ -0,0 +1,134 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * This program is dual-licensed; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ * Alternatively, you can license this library under a commercial license, -+ * please contact Pulse-Eight Licensing for more information. -+ * -+ * For more information contact: -+ * Pulse-Eight Licensing <license@pulse-eight.com> -+ * http://www.pulse-eight.com/ -+ * http://www.pulse-eight.net/ -+ */ -+ -+#include "lib/platform/threads/mutex.h" -+ -+namespace CEC -+{ -+ using namespace PLATFORM; -+ -+ class CAdapterMessageQueueEntry -+ { -+ public: -+ CAdapterMessageQueueEntry(const cec_command &command) -+ : m_bWaiting(true), m_retval((uint32_t)-1), m_bSucceeded(false) -+ { -+ m_hash = hashValue( -+ uint32_t(command.opcode_set ? command.opcode : CEC_OPCODE_NONE), -+ command.initiator, command.destination); -+ } -+ -+ virtual ~CAdapterMessageQueueEntry(void) {} -+ -+ /*! -+ * @brief Query result from worker thread -+ */ -+ uint32_t Result() const -+ { -+ return m_retval; -+ } -+ -+ /*! -+ * @brief Signal waiting threads -+ */ -+ void Broadcast(void) -+ { -+ CLockObject lock(m_mutex); -+ m_condition.Broadcast(); -+ } -+ -+ /*! -+ * @brief Signal waiting thread(s) when message matches this entry -+ */ -+ bool CheckMatch(uint32_t opcode, cec_logical_address initiator, -+ cec_logical_address destination, uint32_t response) -+ { -+ uint32_t hash = hashValue(opcode, initiator, destination); -+ -+ if (hash == m_hash) -+ { -+ CLockObject lock(m_mutex); -+ -+ m_retval = response; -+ m_bSucceeded = true; -+ m_condition.Signal(); -+ return true; -+ } -+ -+ return false; -+ } -+ -+ /*! -+ * @brief Wait for a response to this command. -+ * @param iTimeout The timeout to use while waiting. -+ * @return True when a response was received before the timeout passed, false otherwise. -+ */ -+ bool Wait(uint32_t iTimeout) -+ { -+ CLockObject lock(m_mutex); -+ -+ bool bReturn = m_bSucceeded ? true : m_condition.Wait(m_mutex, m_bSucceeded, iTimeout); -+ m_bWaiting = false; -+ return bReturn; -+ } -+ -+ /*! -+ * @return True while a thread is waiting for a signal or isn't waiting yet, false otherwise. -+ */ -+ bool IsWaiting(void) -+ { -+ CLockObject lock(m_mutex); -+ return m_bWaiting; -+ } -+ -+ /*! -+ * @return Hash value for given cec_command -+ */ -+ static uint32_t hashValue(uint32_t opcode, -+ cec_logical_address initiator, -+ cec_logical_address destination) -+ { -+ return 1 | ((uint32_t)initiator << 8) | -+ ((uint32_t)destination << 16) | ((uint32_t)opcode << 16); -+ } -+ -+ private: -+ bool m_bWaiting; /**< true while a thread is waiting or when it hasn't started waiting yet */ -+ PLATFORM::CCondition<bool> m_condition; /**< the condition to wait on */ -+ PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */ -+ uint32_t m_hash; -+ uint32_t m_retval; -+ bool m_bSucceeded; -+ }; -+ -+}; -diff -Nur libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp ---- libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp 2014-09-01 13:48:54.718437326 +0200 -@@ -0,0 +1,279 @@ -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#include "env.h" -+ -+#if defined(HAVE_IMX_API) -+#include "IMXCECAdapterCommunication.h" -+ -+#include "lib/CECTypeUtils.h" -+#include "lib/LibCEC.h" -+#include "lib/platform/sockets/cdevsocket.h" -+#include "lib/platform/util/StdString.h" -+#include "lib/platform/util/buffer.h" -+ -+/* -+ * Ioctl definitions from kernel header -+ */ -+#define HDMICEC_IOC_MAGIC 'H' -+#define HDMICEC_IOC_SETLOGICALADDRESS _IOW(HDMICEC_IOC_MAGIC, 1, unsigned char) -+#define HDMICEC_IOC_STARTDEVICE _IO(HDMICEC_IOC_MAGIC, 2) -+#define HDMICEC_IOC_STOPDEVICE _IO(HDMICEC_IOC_MAGIC, 3) -+#define HDMICEC_IOC_GETPHYADDRESS _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4]) -+ -+#define MAX_CEC_MESSAGE_LEN 17 -+ -+#define MESSAGE_TYPE_RECEIVE_SUCCESS 1 -+#define MESSAGE_TYPE_NOACK 2 -+#define MESSAGE_TYPE_DISCONNECTED 3 -+#define MESSAGE_TYPE_CONNECTED 4 -+#define MESSAGE_TYPE_SEND_SUCCESS 5 -+ -+typedef struct hdmi_cec_event{ -+ int event_type; -+ int msg_len; -+ unsigned char msg[MAX_CEC_MESSAGE_LEN]; -+}hdmi_cec_event; -+ -+ -+using namespace std; -+using namespace CEC; -+using namespace PLATFORM; -+ -+#include "AdapterMessageQueue.h" -+ -+#define LIB_CEC m_callback->GetLib() -+ -+// these are defined in nxp private header file -+#define CEC_MSG_SUCCESS 0x00 /*Message transmisson Succeed*/ -+#define CEC_CSP_OFF_STATE 0x80 /*CSP in Off State*/ -+#define CEC_BAD_REQ_SERVICE 0x81 /*Bad .req service*/ -+#define CEC_MSG_FAIL_UNABLE_TO_ACCESS 0x82 /*Message transmisson failed: Unable to access CEC line*/ -+#define CEC_MSG_FAIL_ARBITRATION_ERROR 0x83 /*Message transmisson failed: Arbitration error*/ -+#define CEC_MSG_FAIL_BIT_TIMMING_ERROR 0x84 /*Message transmisson failed: Bit timming error*/ -+#define CEC_MSG_FAIL_DEST_NOT_ACK 0x85 /*Message transmisson failed: Destination Address not aknowledged*/ -+#define CEC_MSG_FAIL_DATA_NOT_ACK 0x86 /*Message transmisson failed: Databyte not acknowledged*/ -+ -+ -+CIMXCECAdapterCommunication::CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback) : -+ IAdapterCommunication(callback)/*, -+ m_bLogicalAddressChanged(false)*/ -+{ -+ CLockObject lock(m_mutex); -+ -+ m_iNextMessage = 0; -+ //m_logicalAddresses.Clear(); -+ m_logicalAddress = CECDEVICE_UNKNOWN; -+ m_dev = new CCDevSocket(CEC_IMX_PATH); -+} -+ -+CIMXCECAdapterCommunication::~CIMXCECAdapterCommunication(void) -+{ -+ Close(); -+ -+ CLockObject lock(m_mutex); -+ delete m_dev; -+ m_dev = 0; -+} -+ -+bool CIMXCECAdapterCommunication::IsOpen(void) -+{ -+ return IsInitialised() && m_dev->IsOpen(); -+} -+ -+bool CIMXCECAdapterCommunication::Open(uint32_t iTimeoutMs, bool UNUSED(bSkipChecks), bool bStartListening) -+{ -+ if (m_dev->Open(iTimeoutMs)) -+ { -+ if (!bStartListening || CreateThread()) { -+ if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) != 0) { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); -+ } -+ return true; -+ } -+ m_dev->Close(); -+ } -+ -+ return false; -+} -+ -+ -+void CIMXCECAdapterCommunication::Close(void) -+{ -+ StopThread(0); -+ if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); -+ } -+ m_dev->Close(); -+} -+ -+ -+std::string CIMXCECAdapterCommunication::GetError(void) const -+{ -+ std::string strError(m_strError); -+ return strError; -+} -+ -+ -+cec_adapter_message_state CIMXCECAdapterCommunication::Write( -+ const cec_command &data, bool &UNUSED(bRetry), uint8_t UNUSED(iLineTimeout), bool UNUSED(bIsReply)) -+{ -+ //cec_frame frame; -+ unsigned char message[MAX_CEC_MESSAGE_LEN]; -+ int msg_len = 1; -+ cec_adapter_message_state rc = ADAPTER_MESSAGE_STATE_ERROR; -+ -+ if ((size_t)data.parameters.size + data.opcode_set + 1 > sizeof(message)) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: data size too large !", __func__); -+ return ADAPTER_MESSAGE_STATE_ERROR; -+ } -+ -+ message[0] = (data.initiator << 4) | (data.destination & 0x0f); -+ if (data.opcode_set) -+ { -+ message[1] = data.opcode; -+ msg_len++; -+ memcpy(&message[2], data.parameters.data, data.parameters.size); -+ msg_len+=data.parameters.size; -+ } -+ -+ if (m_dev->Write(message, msg_len) == msg_len) -+ { -+ rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; -+ } -+ else -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: sent command error !", __func__); -+ -+ return rc; -+} -+ -+ -+uint16_t CIMXCECAdapterCommunication::GetFirmwareVersion(void) -+{ -+ /* FIXME add ioctl ? */ -+ return 0; -+} -+ -+ -+cec_vendor_id CIMXCECAdapterCommunication::GetVendorId(void) -+{ -+ return CEC_VENDOR_UNKNOWN; -+} -+ -+ -+uint16_t CIMXCECAdapterCommunication::GetPhysicalAddress(void) -+{ -+ uint32_t info; -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &info) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_GETPHYADDRESS failed !", __func__); -+ return CEC_INVALID_PHYSICAL_ADDRESS; -+ } -+ -+ return info; -+} -+ -+ -+cec_logical_addresses CIMXCECAdapterCommunication::GetLogicalAddresses(void) -+{ -+ cec_logical_addresses addresses; -+ addresses.Clear(); -+ -+ CLockObject lock(m_mutex); -+ if ( m_logicalAddress != CECDEVICE_UNKNOWN) -+ addresses.Set(m_logicalAddress); -+ -+ return addresses; -+} -+ -+ -+bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) -+{ -+ int log_addr = addresses.primary; -+ -+ CLockObject lock(m_mutex); -+ if (m_logicalAddress == log_addr) -+ return true; -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)log_addr) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); -+ return false; -+ } -+ -+ m_logicalAddress = (cec_logical_address)log_addr; -+ return true; -+} -+ -+ -+void *CIMXCECAdapterCommunication::Process(void) -+{ -+ bool bHandled; -+ hdmi_cec_event event; -+ int ret; -+ -+ uint32_t opcode, status; -+ cec_logical_address initiator, destination; -+ -+ while (!IsStopped()) -+ { -+ ret = m_dev->Read((char *)&event, sizeof(event), 5000); -+ if (ret > 0) -+ { -+ -+ initiator = cec_logical_address(event.msg[0] >> 4); -+ destination = cec_logical_address(event.msg[0] & 0x0f); -+ -+ //LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read data : type : %d initiator %d dest %d", __func__, event.event_type, initiator, destination); -+ if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) -+ /* Message received */ -+ { -+ cec_command cmd; -+ -+ cec_command::Format( -+ cmd, initiator, destination, -+ ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); -+ -+ for( uint8_t i = 2; i < event.msg_len; i++ ) -+ cmd.parameters.PushBack(event.msg[i]); -+ -+ if (!IsStopped()) -+ m_callback->OnCommandReceived(cmd); -+ } -+ /* We are not interested in other events */ -+ } /*else { -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read returned %d", __func__, ret); -+ }*/ -+ -+ } -+ -+ return 0; -+} -+ -+#endif // HAVE_IMX_API -diff -Nur libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterCommunication.h ---- libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterCommunication.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterCommunication.h 2014-09-01 13:48:54.722437350 +0200 -@@ -0,0 +1,114 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#if defined(HAVE_IMX_API) -+ -+#include "lib/platform/threads/mutex.h" -+#include "lib/platform/threads/threads.h" -+#include "lib/platform/sockets/socket.h" -+#include "lib/adapter/AdapterCommunication.h" -+#include <map> -+ -+#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/ -+#define IMX_ADAPTER_PID 0x1001 -+ -+ -+ -+namespace PLATFORM -+{ -+ class CCDevSocket; -+}; -+ -+ -+namespace CEC -+{ -+ class CAdapterMessageQueueEntry; -+ -+ class CIMXCECAdapterCommunication : public IAdapterCommunication, public PLATFORM::CThread -+ { -+ public: -+ /*! -+ * @brief Create a new USB-CEC communication handler. -+ * @param callback The callback to use for incoming CEC commands. -+ */ -+ CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback); -+ virtual ~CIMXCECAdapterCommunication(void); -+ -+ /** @name IAdapterCommunication implementation */ -+ ///{ -+ bool Open(uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT, bool bSkipChecks = false, bool bStartListening = true); -+ void Close(void); -+ bool IsOpen(void); -+ std::string GetError(void) const; -+ cec_adapter_message_state Write(const cec_command &data, bool &bRetry, uint8_t iLineTimeout, bool bIsReply); -+ -+ bool SetLineTimeout(uint8_t UNUSED(iTimeout)) { return true; } -+ bool StartBootloader(void) { return false; } -+ bool SetLogicalAddresses(const cec_logical_addresses &addresses); -+ cec_logical_addresses GetLogicalAddresses(void); -+ bool PingAdapter(void) { return IsInitialised(); } -+ uint16_t GetFirmwareVersion(void); -+ uint32_t GetFirmwareBuildDate(void) { return 0; } -+ bool IsRunningLatestFirmware(void) { return true; } -+ bool PersistConfiguration(const libcec_configuration & UNUSED(configuration)) { return false; } -+ bool GetConfiguration(libcec_configuration & UNUSED(configuration)) { return false; } -+ std::string GetPortName(void) { return std::string("IMX"); } -+ uint16_t GetPhysicalAddress(void); -+ bool SetControlledMode(bool UNUSED(controlled)) { return true; } -+ cec_vendor_id GetVendorId(void); -+ bool SupportsSourceLogicalAddress(const cec_logical_address address) { return address > CECDEVICE_TV && address <= CECDEVICE_BROADCAST; } -+ cec_adapter_type GetAdapterType(void) { return ADAPTERTYPE_IMX; } -+ uint16_t GetAdapterVendorId(void) const { return IMX_ADAPTER_VID; } -+ uint16_t GetAdapterProductId(void) const { return IMX_ADAPTER_PID; } -+ void SetActiveSource(bool UNUSED(bSetTo), bool UNUSED(bClientUnregistered)) {} -+ ///} -+ -+ /** @name PLATFORM::CThread implementation */ -+ ///{ -+ void *Process(void); -+ ///} -+ -+ private: -+ bool IsInitialised(void) const { return m_dev != 0; }; -+ -+ std::string m_strError; /**< current error message */ -+ -+ //cec_logical_addresses m_logicalAddresses; -+ cec_logical_address m_logicalAddress; -+ -+ PLATFORM::CMutex m_mutex; -+ PLATFORM::CCDevSocket *m_dev; /**< the device connection */ -+ -+ PLATFORM::CMutex m_messageMutex; -+ uint32_t m_iNextMessage; -+ std::map<uint32_t, CAdapterMessageQueueEntry *> m_messages; -+ }; -+ -+}; -+ -+#endif -diff -Nur libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp ---- libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp 2014-09-01 13:48:54.722437350 +0200 -@@ -0,0 +1,42 @@ -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#include "env.h" -+#include <stdio.h> -+ -+#if defined(HAVE_IMX_API) -+#include "IMXCECAdapterDetection.h" -+ -+ -+using namespace CEC; -+ -+bool CIMXCECAdapterDetection::FindAdapter(void) -+{ -+ return access(CEC_IMX_PATH, 0) == 0; -+} -+ -+#endif -diff -Nur libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterDetection.h libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterDetection.h ---- libcec-2.1.4/src/lib/adapter/IMX/IMXCECAdapterDetection.h 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/src/lib/adapter/IMX/IMXCECAdapterDetection.h 2014-09-01 13:48:54.722437350 +0200 -@@ -0,0 +1,36 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+namespace CEC -+{ -+ class CIMXCECAdapterDetection -+ { -+ public: -+ static bool FindAdapter(void); -+ }; -+} -diff -Nur libcec-2.1.4/src/lib/CECTypeUtils.h libcec-imx6/src/lib/CECTypeUtils.h ---- libcec-2.1.4/src/lib/CECTypeUtils.h 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/src/lib/CECTypeUtils.h 2014-09-01 13:48:54.698437211 +0200 -@@ -858,6 +858,8 @@ - return "Raspberry Pi"; - case ADAPTERTYPE_TDA995x: - return "TDA995x"; -+ case ADAPTERTYPE_IMX: -+ return "i.MX"; - default: - return "unknown"; - } -diff -Nur libcec-2.1.4/src/lib/Makefile.am libcec-imx6/src/lib/Makefile.am ---- libcec-2.1.4/src/lib/Makefile.am 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-imx6/src/lib/Makefile.am 2014-09-01 13:48:54.718437326 +0200 -@@ -59,5 +59,10 @@ - adapter/TDA995x/TDA995xCECAdapterCommunication.cpp - endif - -+## i.MX6 support -+if USE_IMX_API -+libcec_la_SOURCES += adapter/IMX/IMXCECAdapterDetection.cpp \ -+ adapter/IMX/IMXCECAdapterCommunication.cpp -+endif - - libcec_la_LDFLAGS = @LIBS_LIBCEC@ -version-info @VERSION@ -diff -Nur libcec-2.1.4/support/create-driver-installer.cmd libcec-imx6/support/create-driver-installer.cmd ---- libcec-2.1.4/support/create-driver-installer.cmd 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/support/create-driver-installer.cmd 2014-09-01 13:48:54.758437558 +0200 -@@ -0,0 +1,58 @@ -+@echo off -+ -+rem Check for NSIS -+IF EXIST "%ProgramFiles%\NSIS\makensis.exe" ( -+ set NSIS="%ProgramFiles%\NSIS\makensis.exe" -+) ELSE IF EXIST "%ProgramFiles(x86)%\NSIS\makensis.exe" ( -+ set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe" -+) ELSE GOTO NONSIS -+ -+rem Check for the Windows DDK -+IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK -+set DDK="C:\WinDDK\7600.16385.1" -+ -+mkdir ..\build -+ -+echo. Copying driver installer -+copy "%DDK%\redist\DIFx\dpinst\MultiLin\amd64\dpinst.exe" ..\build\dpinst-amd64.exe -+copy "%DDK%\redist\DIFx\dpinst\MultiLin\x86\dpinst.exe" ..\build\dpinst-x86.exe -+ -+:CREATECAT -+cd ..\driver -+IF EXIST "..\support\private\create-cat.cmd" ( -+ echo. Updating the catalogue -+ CALL ..\support\private\create-cat.cmd p8usb-cec.cat -+) -+ -+:CREATEINSTALLER -+echo. Creating the installer -+cd ..\project -+%NSIS% /V1 /X"SetCompressor /FINAL lzma" "p8-usbcec-driver.nsi" -+ -+IF NOT EXIST "..\build\p8-usbcec-driver-installer.exe" GOTO :ERRORCREATINGINSTALLER -+ -+rem Sign the installer if sign-binary.cmd exists -+IF EXIST "..\support\private\sign-binary.cmd" ( -+ echo. Signing the installer binaries -+ CALL ..\support\private\sign-binary.cmd ..\build\p8-usbcec-driver-installer.exe -+) -+ -+echo. The installer can be found here: ..\build\p8-usbcec-driver-installer.exe -+ -+GOTO EXIT -+ -+:NOSIS -+echo. NSIS could not be found on your system. -+GOTO EXIT -+ -+:NODDK -+echo. Windows DDK could not be found on your system -+GOTO EXIT -+ -+:ERRORCREATINGINSTALLER -+echo. The installer could not be created. -+ -+:EXIT -+del /q /f ..\build\dpinst-amd64.exe -+del /q /f ..\build\dpinst-x86.exe -+cd ..\support -\ Kein Zeilenumbruch am Dateiende. -diff -Nur libcec-2.1.4/support/create-installer.bat libcec-imx6/support/create-installer.bat ---- libcec-2.1.4/support/create-installer.bat 1970-01-01 01:00:00.000000000 +0100 -+++ libcec-imx6/support/create-installer.bat 2014-09-01 13:48:54.758437558 +0200 -@@ -0,0 +1,140 @@ -+@echo off -+ -+set EXITCODE=1 -+ -+rem Check for NSIS -+IF EXIST "%ProgramFiles%\NSIS\makensis.exe" ( -+ set NSIS="%ProgramFiles%\NSIS\makensis.exe" -+) ELSE IF EXIST "%ProgramFiles(x86)%\NSIS\makensis.exe" ( -+ set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe" -+) ELSE GOTO NONSIS -+ -+rem Check for VC11 -+IF "%VS110COMNTOOLS%"=="" ( -+ set COMPILER11="%ProgramFiles%\Microsoft Visual Studio 11.0\Common7\IDE\VCExpress.exe" -+) ELSE IF EXIST "%VS110COMNTOOLS%\..\IDE\VCExpress.exe" ( -+ set COMPILER11="%VS110COMNTOOLS%\..\IDE\VCExpress.exe" -+) ELSE IF EXIST "%VS110COMNTOOLS%\..\IDE\devenv.exe" ( -+ set COMPILER11="%VS110COMNTOOLS%\..\IDE\devenv.exe" -+) ELSE GOTO NOSDK11 -+ -+del /s /f /q ..\build -+mkdir ..\build -+ -+IF EXIST "..\support\p8-usbcec-driver-installer.exe" ( -+ copy "..\support\p8-usbcec-driver-installer.exe" "..\build\." -+) ELSE ( -+ rem Check for the Windows DDK -+ IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK -+ set DDK="C:\WinDDK\7600.16385.1" -+ -+ call create-driver-installer.cmd -+) -+ -+mkdir ..\build\x64 -+ -+cd ..\project -+ -+rem Skip to libCEC/x86 when we're running on win32 -+if "%PROCESSOR_ARCHITECTURE%"=="x86" if "%PROCESSOR_ARCHITEW6432%"=="" goto libcecx86 -+ -+rem Compile libCEC and cec-client x64 -+echo. Cleaning libCEC (x64) -+%COMPILER11% libcec.sln /clean "Release|x64" -+echo. Compiling libCEC (x64) -+%COMPILER11% libcec.sln /build "Release|x64" -+ -+:libcecx86 -+rem Compile libCEC and cec-client Win32 -+echo. Cleaning libCEC (x86) -+%COMPILER11% libcec.sln /clean "Release|x86" -+echo. Compiling libCEC (x86) -+%COMPILER11% libcec.sln /build "Release|x86" -+ -+rem Clean things up before creating the installer -+del /q /f ..\build\LibCecSharp.pdb -+del /q /f ..\build\CecSharpTester.pdb -+del /q /f ..\build\cec-tray.pdb -+del /q /f ..\build\cec-tray.vshost.exe.manifest -+del /q /f ..\build\cec-.vshost.exe -+del /q /f ..\build\x64\LibCecSharp.pdb -+del /q /f ..\build\x64\CecSharpTester.pdb -+del /q /f ..\build\x64\cec-tray.pdb -+del /q /f ..\build\x64\cec-tray.vshost.exe.manifest -+del /q /f ..\build\x64\cec-.vshost.exe -+ -+rem Check for sign-binary.cmd, only present on the Pulse-Eight production build system -+rem Calls signtool.exe and signs the DLLs with Pulse-Eight's code signing key -+IF NOT EXIST "..\support\private\sign-binary.cmd" GOTO CREATEINSTALLER -+echo. Signing all binaries -+CALL ..\support\private\sign-binary.cmd ..\build\cec-client.exe -+CALL ..\support\private\sign-binary.cmd ..\build\CecSharpTester.exe -+CALL ..\support\private\sign-binary.cmd ..\build\libcec.dll -+CALL ..\support\private\sign-binary.cmd ..\build\LibCecSharp.dll -+CALL ..\support\private\sign-binary.cmd ..\build\cec-tray.exe -+CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-client.exe -+CALL ..\support\private\sign-binary.cmd ..\build\x64\CecSharpTester.exe -+CALL ..\support\private\sign-binary.cmd ..\build\x64\libcec.dll -+CALL ..\support\private\sign-binary.cmd ..\build\x64\LibCecSharp.dll -+CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-tray.exe -+ -+:CREATEINSTALLER -+echo. Creating the installer -+cd ..\build\x64 -+copy libcec.dll libcec.x64.dll -+copy cec-client.exe cec-client.x64.exe -+cd ..\..\project -+%NSIS% /V1 /X"SetCompressor /FINAL lzma" "libCEC.nsi" -+ -+IF NOT EXIST "..\build\libCEC-installer.exe" GOTO :ERRORCREATINGINSTALLER -+ -+rem Sign the installer if sign-binary.cmd exists -+IF EXIST "..\support\private\sign-binary.cmd" ( -+ echo. Signing the installer binaries -+ CALL ..\support\private\sign-binary.cmd ..\build\libCEC-installer.exe -+) -+ -+IF "%1%"=="" ( -+ echo. The installer can be found here: ..\build\libCEC-installer.exe -+) ELSE ( -+ move ..\build\libCEC-installer.exe ..\build\libCEC-%1%-installer.exe -+ echo. The installer can be found here: ..\build\libCEC-%1%-installer.exe -+) -+ -+set EXITCODE=0 -+GOTO EXIT -+ -+:NOSDK11 -+echo. Visual Studio 2012 was not found on your system. -+GOTO EXIT -+ -+:NOSIS -+echo. NSIS could not be found on your system. -+GOTO EXIT -+ -+:NODDK -+echo. Windows DDK could not be found on your system -+GOTO EXIT -+ -+:ERRORCREATINGINSTALLER -+echo. The installer could not be created. The most likely cause is that something went wrong while compiling. -+ -+:EXIT -+del /q /f ..\build\cec-client.exe -+del /q /f ..\build\CecSharpTester.exe -+del /q /f ..\build\cec-tray.exe -+del /q /f ..\build\*.dll -+del /q /f ..\build\*.lib -+del /q /f ..\build\*.exp -+del /q /f ..\build\*.xml -+del /q /f ..\build\*.metagen -+del /s /f /q ..\build\x64 -+rmdir ..\build\x64 -+cd ..\support -+ -+IF "%1%"=="" ( -+ echo. exitcode = %EXITCODE% -+) ELSE ( -+ exit %EXITCODE% -+) -+ -Binärdateien libcec-2.1.4/support/p8-usbcec-driver-installer.exe und libcec-imx6/support/p8-usbcec-driver-installer.exe sind verschieden. diff --git a/package/libcec/patches/patch-src_lib_adapter_RPi_RPiCECAdapterCommunication_cpp b/package/libcec/patches/patch-src_lib_adapter_RPi_RPiCECAdapterCommunication_cpp deleted file mode 100644 index f027f0f3a..000000000 --- a/package/libcec/patches/patch-src_lib_adapter_RPi_RPiCECAdapterCommunication_cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- libcec-2.1.4.orig/src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-2.1.4/src/lib/adapter/RPi/RPiCECAdapterCommunication.cpp 2014-05-28 18:25:18.809692104 +0200 -@@ -353,7 +353,8 @@ void CRPiCECAdapterCommunication::Close( - else - return; - } -- vc_tv_unregister_callback(rpi_tv_callback); -+ if (m_bInitialised) -+ vc_tv_unregister_callback(rpi_tv_callback); - - UnregisterLogicalAddress(); - diff --git a/package/libcec/patches/patch-src_lib_libcec_pc_in b/package/libcec/patches/patch-src_lib_libcec_pc_in index edacd9650..5b71c1d66 100644 --- a/package/libcec/patches/patch-src_lib_libcec_pc_in +++ b/package/libcec/patches/patch-src_lib_libcec_pc_in @@ -1,5 +1,5 @@ ---- libcec-2.1.4.orig/src/lib/libcec.pc.in 2013-12-16 10:32:51.000000000 +0100 -+++ libcec-2.1.4/src/lib/libcec.pc.in 2014-06-17 10:28:45.246000623 +0200 +--- libcec-2.2.0.orig/src/lib/libcec.pc.in 2014-11-11 13:49:38.000000000 -0600 ++++ libcec-2.2.0/src/lib/libcec.pc.in 2014-11-12 13:51:02.466501999 -0600 @@ -7,6 +7,5 @@ Name: libcec Description: Pulse-Eight CEC adapter library URL: http://www.pulse-eight.com/ diff --git a/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp deleted file mode 100644 index e677a0d22..000000000 --- a/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libcec-2.1.4.orig/src/lib/platform/posix/serialport.cpp 2013-12-15 12:48:14.000000000 +0100 -+++ libcec-2.1.4/src/lib/platform/posix/serialport.cpp 2014-01-12 22:04:41.000000000 +0100 -@@ -37,7 +37,7 @@ - #include "lib/platform/util/baudrate.h" - #include "lib/platform/posix/os-socket.h" - --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || !defined(__GLIBC__) - #ifndef XCASE - #define XCASE 0 - #endif diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 4bddea6be..9daf8b96d 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.6.12 +PKG_VERSION:= 1.6.14 PKG_RELEASE:= 1 -PKG_MD5SUM:= ee752da8aa75076500e4cf31318e636e +PKG_MD5SUM:= aefd9fda2178acab908707737174a0cd PKG_DESCR:= library for reading/writing png images PKG_SECTION:= libs/image PKG_DEPENDS:= zlib diff --git a/package/libpng/patches/libpng-1.6.12-apng.patch b/package/libpng/patches/libpng-1.6.14-apng.patch index 910ee46d4..c168b02cc 100644 --- a/package/libpng/patches/libpng-1.6.12-apng.patch +++ b/package/libpng/patches/libpng-1.6.14-apng.patch @@ -1,7 +1,7 @@ -diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h ---- libpng-1.6.12.org/png.h 2014-06-12 20:50:55.236436493 +0900 -+++ libpng-1.6.12/png.h 2014-06-12 20:50:55.301438712 +0900 -@@ -464,6 +464,10 @@ +diff -Naru libpng-1.6.14.org/png.h libpng-1.6.14/png.h +--- libpng-1.6.14.org/png.h 2014-10-23 23:57:22.656674917 +0900 ++++ libpng-1.6.14/png.h 2014-10-23 23:57:22.729677456 +0900 +@@ -470,6 +470,10 @@ # include "pnglibconf.h" #endif @@ -12,7 +12,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h #ifndef PNG_VERSION_INFO_ONLY /* Machine specific configuration. */ # include "pngconf.h" -@@ -554,6 +558,17 @@ +@@ -560,6 +564,17 @@ * See pngconf.h for base types that vary by machine/system */ @@ -30,7 +30,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -@@ -874,6 +889,10 @@ +@@ -880,6 +895,10 @@ #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */ @@ -41,7 +41,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h /* This is used for the transformation routines, as some of them * change these values for the row. It also should enable using -@@ -911,6 +930,10 @@ +@@ -917,6 +936,10 @@ #ifdef PNG_PROGRESSIVE_READ_SUPPORTED typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop)); typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop)); @@ -52,7 +52,7 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h /* The following callback receives png_uint_32 row_number, int pass for the * png_bytep data of the row. When transforming an interlaced image the -@@ -3246,6 +3269,74 @@ +@@ -3255,6 +3278,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ @@ -125,10 +125,10 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h +#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */ - /* Maintainer: Put new public prototypes here ^, in libpng.3, and project - * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt -@@ -3256,7 +3347,11 @@ - * scripts/symbols.def as well. + /* Maintainer: Put new public prototypes here ^, in libpng.3, in project + * defs, and in scripts/symbols.def. +@@ -3264,7 +3355,11 @@ + * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL +#ifdef PNG_APNG_SUPPORTED @@ -139,9 +139,9 @@ diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h #endif #ifdef __cplusplus -diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c ---- libpng-1.6.12.org/pngget.c 2014-06-12 20:50:55.237436527 +0900 -+++ libpng-1.6.12/pngget.c 2014-06-12 20:50:55.302438746 +0900 +diff -Naru libpng-1.6.14.org/pngget.c libpng-1.6.14/pngget.c +--- libpng-1.6.14.org/pngget.c 2014-10-23 23:57:22.657674952 +0900 ++++ libpng-1.6.14/pngget.c 2014-10-23 23:57:22.730677491 +0900 @@ -1195,4 +1195,166 @@ # endif #endif @@ -309,9 +309,9 @@ diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h ---- libpng-1.6.12.org/pnginfo.h 2014-06-12 20:50:55.237436527 +0900 -+++ libpng-1.6.12/pnginfo.h 2014-06-12 20:50:55.302438746 +0900 +diff -Naru libpng-1.6.14.org/pnginfo.h libpng-1.6.14/pnginfo.h +--- libpng-1.6.14.org/pnginfo.h 2014-10-23 23:57:22.657674952 +0900 ++++ libpng-1.6.14/pnginfo.h 2014-10-23 23:57:22.730677491 +0900 @@ -256,5 +256,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,10 +331,10 @@ diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c ---- libpng-1.6.12.org/pngpread.c 2014-06-12 20:50:55.237436527 +0900 -+++ libpng-1.6.12/pngpread.c 2014-06-12 20:50:55.302438746 +0900 -@@ -217,6 +217,109 @@ +diff -Naru libpng-1.6.14.org/pngpread.c libpng-1.6.14/pngpread.c +--- libpng-1.6.14.org/pngpread.c 2014-10-23 23:57:22.657674952 +0900 ++++ libpng-1.6.14/pngpread.c 2014-10-23 23:57:22.730677491 +0900 +@@ -219,6 +219,109 @@ chunk_name = png_ptr->chunk_name; @@ -444,7 +444,7 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c if (chunk_name == png_IDAT) { if (png_ptr->mode & PNG_AFTER_IDAT) -@@ -300,6 +403,9 @@ +@@ -283,6 +386,9 @@ else if (chunk_name == png_IDAT) { @@ -454,7 +454,7 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c png_ptr->idat_size = png_ptr->push_length; png_ptr->process_mode = PNG_READ_IDAT_MODE; png_push_have_info(png_ptr, info_ptr); -@@ -530,6 +636,30 @@ +@@ -428,6 +534,30 @@ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); } #endif @@ -485,19 +485,19 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c else { -@@ -732,7 +862,11 @@ +@@ -621,7 +751,11 @@ png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ +#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->buffer_size < 12) ++ PNG_PUSH_SAVE_BUFFER_IF_LT(12) +#else - if (png_ptr->buffer_size < 8) + PNG_PUSH_SAVE_BUFFER_IF_LT(8) +#endif - { - png_push_save_buffer(png_ptr); - return; -@@ -745,17 +879,64 @@ + png_push_fill_buffer(png_ptr, chunk_length, 4); + png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); + png_reset_crc(png_ptr); +@@ -629,17 +763,64 @@ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; @@ -562,7 +562,7 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c } if (png_ptr->idat_size && png_ptr->save_buffer_size) -@@ -833,6 +1014,15 @@ +@@ -712,6 +893,15 @@ if (!(buffer_length > 0) || buffer == NULL) png_error(png_ptr, "No IDAT data (internal error)"); @@ -578,7 +578,7 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c /* This routine must process all the data it has been given * before returning, calling the row callback as required to * handle the uncompressed results. -@@ -1275,6 +1465,18 @@ +@@ -1154,6 +1344,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -597,10 +597,10 @@ diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h ---- libpng-1.6.12.org/pngpriv.h 2014-06-12 20:50:55.238436561 +0900 -+++ libpng-1.6.12/pngpriv.h 2014-06-12 20:50:55.303438780 +0900 -@@ -551,6 +551,10 @@ +diff -Naru libpng-1.6.14.org/pngpriv.h libpng-1.6.14/pngpriv.h +--- libpng-1.6.14.org/pngpriv.h 2014-10-23 23:57:22.658674987 +0900 ++++ libpng-1.6.14/pngpriv.h 2014-10-23 23:57:22.731677525 +0900 +@@ -555,6 +555,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ /* 0x4000 (unused) */ #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ @@ -611,7 +611,7 @@ diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h /* Flags for the transformations the PNG library does on the image data */ #define PNG_BGR 0x0001 -@@ -772,6 +776,16 @@ +@@ -776,6 +780,16 @@ #define png_tRNS PNG_U32(116, 82, 78, 83) #define png_zTXt PNG_U32(122, 84, 88, 116) @@ -628,7 +628,7 @@ diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h /* The following will work on (signed char*) strings, whereas the get_uint_32 * macro will fail on top-bit-set values because of the sign extension. */ -@@ -1472,6 +1486,47 @@ +@@ -1476,6 +1490,47 @@ */ #endif @@ -676,9 +676,9 @@ diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h /* Added at libpng version 1.4.0 */ #ifdef PNG_COLORSPACE_SUPPORTED /* These internal functions are for maintaining the colorspace structure within -diff -Naru libpng-1.6.12.org/pngread.c libpng-1.6.12/pngread.c ---- libpng-1.6.12.org/pngread.c 2014-06-12 20:50:55.238436561 +0900 -+++ libpng-1.6.12/pngread.c 2014-06-12 20:50:55.304438815 +0900 +diff -Naru libpng-1.6.14.org/pngread.c libpng-1.6.14/pngread.c +--- libpng-1.6.14.org/pngread.c 2014-10-23 23:57:22.659675022 +0900 ++++ libpng-1.6.14/pngread.c 2014-10-23 23:57:22.732677560 +0900 @@ -158,6 +158,9 @@ else if (chunk_name == png_IDAT) @@ -780,10 +780,10 @@ diff -Naru libpng-1.6.12.org/pngread.c libpng-1.6.12/pngread.c /* Optional call to update the users info_ptr structure */ void PNGAPI png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) -diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c ---- libpng-1.6.12.org/pngrutil.c 2014-06-12 20:50:55.240436630 +0900 -+++ libpng-1.6.12/pngrutil.c 2014-06-12 20:50:55.305438849 +0900 -@@ -818,6 +818,11 @@ +diff -Naru libpng-1.6.14.org/pngrutil.c libpng-1.6.14/pngrutil.c +--- libpng-1.6.14.org/pngrutil.c 2014-10-23 23:57:22.660675057 +0900 ++++ libpng-1.6.14/pngrutil.c 2014-10-23 23:57:22.735677664 +0900 +@@ -817,6 +817,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -795,7 +795,7 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2698,6 +2703,179 @@ +@@ -2697,6 +2702,179 @@ } #endif @@ -975,7 +975,7 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -3954,7 +4132,38 @@ +@@ -3953,7 +4131,38 @@ { uInt avail_in; png_bytep buffer; @@ -1014,7 +1014,7 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -3966,7 +4175,7 @@ +@@ -3965,7 +4174,7 @@ if (png_ptr->chunk_name != png_IDAT) png_error(png_ptr, "Not enough image data"); } @@ -1023,7 +1023,7 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4029,6 +4238,9 @@ +@@ -4028,6 +4237,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1033,7 +1033,7 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4466,4 +4678,80 @@ +@@ -4465,4 +4677,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1114,9 +1114,9 @@ diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* PNG_READ_SUPPORTED */ -diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/pngset.c ---- libpng-1.6.12.org/pngset.c 2014-06-12 20:50:55.240436630 +0900 -+++ libpng-1.6.12/pngset.c 2014-06-12 20:50:55.306438883 +0900 +diff -Naru libpng-1.6.14.org/pngset.c libpng-1.6.14/pngset.c +--- libpng-1.6.14.org/pngset.c 2014-10-23 23:57:22.661675091 +0900 ++++ libpng-1.6.14/pngset.c 2014-10-23 23:57:22.735677664 +0900 @@ -239,6 +239,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1277,9 +1277,9 @@ diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/pngset.c #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED static png_byte check_location(png_const_structrp png_ptr, int location) -diff -Naru libpng-1.6.12.org/pngstruct.h libpng-1.6.12/pngstruct.h ---- libpng-1.6.12.org/pngstruct.h 2014-06-12 20:50:55.240436630 +0900 -+++ libpng-1.6.12/pngstruct.h 2014-06-12 20:50:55.306438883 +0900 +diff -Naru libpng-1.6.14.org/pngstruct.h libpng-1.6.14/pngstruct.h +--- libpng-1.6.14.org/pngstruct.h 2014-10-23 23:57:22.661675091 +0900 ++++ libpng-1.6.14/pngstruct.h 2014-10-23 23:57:22.735677664 +0900 @@ -409,6 +409,27 @@ png_byte filter_type; #endif @@ -1308,9 +1308,9 @@ diff -Naru libpng-1.6.12.org/pngstruct.h libpng-1.6.12/pngstruct.h /* New members added in libpng-1.2.0 */ /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */ -diff -Naru libpng-1.6.12.org/pngtest.c libpng-1.6.12/pngtest.c ---- libpng-1.6.12.org/pngtest.c 2014-06-12 20:50:55.241436664 +0900 -+++ libpng-1.6.12/pngtest.c 2014-06-12 20:50:55.306438883 +0900 +diff -Naru libpng-1.6.14.org/pngtest.c libpng-1.6.14/pngtest.c +--- libpng-1.6.14.org/pngtest.c 2014-10-23 23:57:22.661675091 +0900 ++++ libpng-1.6.14/pngtest.c 2014-10-23 23:57:22.736677699 +0900 @@ -848,6 +848,10 @@ png_uint_32 width, height; int num_pass = 1, pass; @@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.12.org/pngtest.c libpng-1.6.12/pngtest.c for (pass = 0; pass < num_pass; pass++) { pngtest_debug1("Writing row data for pass %d", pass); -diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c ---- libpng-1.6.12.org/pngwrite.c 2014-06-12 20:50:55.241436664 +0900 -+++ libpng-1.6.12/pngwrite.c 2014-06-12 20:50:55.307438917 +0900 +diff -Naru libpng-1.6.14.org/pngwrite.c libpng-1.6.14/pngwrite.c +--- libpng-1.6.14.org/pngwrite.c 2014-10-23 23:57:22.662675126 +0900 ++++ libpng-1.6.14/pngwrite.c 2014-10-23 23:57:22.737677734 +0900 @@ -127,6 +127,10 @@ * application continues writing the PNG. So check the 'invalid' flag here * too. @@ -1447,7 +1447,7 @@ diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c #ifdef PNG_GAMMA_SUPPORTED # ifdef PNG_WRITE_gAMA_SUPPORTED if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && -@@ -357,6 +361,11 @@ +@@ -359,6 +363,11 @@ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); #endif @@ -1459,7 +1459,7 @@ diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) { -@@ -1662,6 +1671,43 @@ +@@ -1665,6 +1674,43 @@ } #endif @@ -1503,10 +1503,10 @@ diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ -diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c ---- libpng-1.6.12.org/pngwutil.c 2014-06-12 20:50:55.242436698 +0900 -+++ libpng-1.6.12/pngwutil.c 2014-06-12 20:50:55.307438917 +0900 -@@ -898,6 +898,11 @@ +diff -Naru libpng-1.6.14.org/pngwutil.c libpng-1.6.14/pngwutil.c +--- libpng-1.6.14.org/pngwutil.c 2014-10-23 23:57:22.663675161 +0900 ++++ libpng-1.6.14/pngwutil.c 2014-10-23 23:57:22.738677769 +0900 +@@ -902,6 +902,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1518,7 +1518,7 @@ diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c if ((png_ptr->do_filter) == PNG_NO_FILTERS) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || -@@ -1076,7 +1081,14 @@ +@@ -1080,7 +1085,14 @@ optimize_cmf(data, png_image_size(png_ptr)); # endif @@ -1533,7 +1533,7 @@ diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->zstream.next_out = data; -@@ -1122,7 +1134,15 @@ +@@ -1126,7 +1138,15 @@ optimize_cmf(data, png_image_size(png_ptr)); # endif @@ -1549,7 +1549,7 @@ diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c png_ptr->zstream.avail_out = 0; png_ptr->zstream.next_out = NULL; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; -@@ -1936,6 +1956,82 @@ +@@ -1939,6 +1959,82 @@ } #endif @@ -1632,7 +1632,7 @@ diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -3023,4 +3119,39 @@ +@@ -3026,4 +3122,39 @@ } #endif } @@ -1672,9 +1672,9 @@ diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* PNG_WRITE_SUPPORTED */ -diff -Naru libpng-1.6.12.org/scripts/symbols.def libpng-1.6.12/scripts/symbols.def ---- libpng-1.6.12.org/scripts/symbols.def 2014-06-12 20:50:55.248436903 +0900 -+++ libpng-1.6.12/scripts/symbols.def 2014-06-12 20:50:55.314439156 +0900 +diff -Naru libpng-1.6.14.org/scripts/symbols.def libpng-1.6.14/scripts/symbols.def +--- libpng-1.6.14.org/scripts/symbols.def 2014-10-23 23:57:22.670675404 +0900 ++++ libpng-1.6.14/scripts/symbols.def 2014-10-23 23:57:22.746678047 +0900 @@ -249,3 +249,23 @@ png_set_check_for_invalid_index @242 png_get_palette_max @243 diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index f23af0cee..1c1bd4691 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libvpx PKG_VERSION:= 1.3.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 14783a148872f2d08629ff7c694eb31f PKG_DESCR:= vp8/vp9 codec library PKG_SECTION:= libs/video @@ -31,7 +31,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) CONFIGURE_ARGS+= --target=armv5te-linux-gcc endif -ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y) +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) CONFIGURE_ARGS+= --target=armv7-linux-gcc endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile index fe339a175..e52f6a543 100644 --- a/package/logitechmediaserver/Makefile +++ b/package/logitechmediaserver/Makefile @@ -4,22 +4,23 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= logitechmediaserver -PKG_VERSION:= 7.8.0 +PKG_VERSION:= 7.9.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8e1934d2fc16bc98ce77d3b6828be1dd +PKG_MD5SUM:= 4e1bcfd9fc2e4aaeeb19841e638787b6 PKG_DESCR:= popular media server PKG_SECTION:= mm/audio PKG_DEPENDS:= perl p5-xml-parser p5-dbi p5-ev p5-html-parser PKG_DEPENDS+= p5-json-xs p5-digest-sha1 p5-yaml-xs p5-sub-name PKG_DEPENDS+= p5-xml-parser-expat p5-common-sense PKG_DEPENDS+= p5-types-serialiser p5-audio-scan p5-image-scale -PKG_DEPENDS+= p5-dbd-sqlite p5-tie-refhash +PKG_DEPENDS+= p5-dbd-sqlite p5-tie-refhash p5-template-toolkit +PKG_DEPENDS+= p5-class-xsaccessor p5-io-interface PKG_BUILDDEP:= perl PKG_URL:= http://wiki.slimdevices.com/index.php/Logitech_Media_Server -PKG_SITES:= http://downloads.slimdevices.com/LogitechMediaServer_v7.8.0/ +PKG_SITES:= http://downloads.slimdevices.com/nightly/7.9/sc/cbc24c9/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-noCPAN.tgz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-noCPAN +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-1418119409-noCPAN.tgz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-1418119409-noCPAN include $(ADK_TOPDIR)/mk/package.mk @@ -29,6 +30,15 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +post-extract: + rm -rf ${WRKBUILD}/CPAN/Class/XSAccessor* + rm -rf ${WRKBUILD}/CPAN/Template* + rm -rf ${WRKBUILD}/CPAN/HTML* + rm -rf ${WRKBUILD}/CPAN/DBI/ + rm -rf ${WRKBUILD}/CPAN/DBI.pm + rm -rf ${WRKBUILD}/CPAN/IO/Interface* + rm -rf ${WRKBUILD}/CPAN/JSON/XS.pm + logitechmediaserver-install: $(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms $(CP) $(WRKSRC)/* $(IDIR_LOGITECHMEDIASERVER)/opt/lms diff --git a/package/mesalib/Makefile b/package/mesalib/Makefile index f41d3805c..ef9eb2164 100644 --- a/package/mesalib/Makefile +++ b/package/mesalib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mesalib -PKG_VERSION:= 10.2.7 +PKG_VERSION:= 10.3.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6927e1ae64818e6b692edaf06c644388 +PKG_MD5SUM:= e02efdfe0466bc75769e462841ab83f2 PKG_DESCR:= 3d graphics library PKG_SECTION:= libs/video PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat 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 diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile index bfe60ea58..076957f1f 100644 --- a/package/openntpd/Makefile +++ b/package/openntpd/Makefile @@ -5,13 +5,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openntpd PKG_VERSION:= 3.9p1 -PKG_RELEASE:= 18 +PKG_RELEASE:= 19 PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3 PKG_DESCR:= ntp server daemon PKG_SECTION:= net/ntp PKG_DEPENDS:= libopenssl PKG_URL:= http://www.openntpd.org/ PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ +PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/openntpd.init index 02239f318..f21bd730a 100644 --- a/package/openntpd/files/ntpd.init +++ b/package/openntpd/files/openntpd.init @@ -6,13 +6,13 @@ case $1 in autostop) ;; autostart) - test x"${ntpd:-NO}" = x"NO" && exit 0 - test x"$ntpd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + test x"${openntpd:-NO}" = x"NO" && exit 0 + test x"$openntpd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start exec sh $0 start ;; start) - mkdir -p /tmp/.ntp - /usr/sbin/ntpd $ntpd_flags + mkdir -p /tmp/.ntp &> /dev/null + /usr/sbin/ntpd $openntpd_flags ;; stop) kill $(pgrep -f /usr/sbin/ntpd) diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst index 1e4f34da1..1688c112c 100644 --- a/package/openntpd/files/openntpd.postinst +++ b/package/openntpd/files/openntpd.postinst @@ -4,5 +4,5 @@ gid=$(get_next_gid) add_group ntp $gid add_user ntp $(get_next_uid) $gid /tmp/.ntp add_service ntp 123/udp -add_rcconf ntpd_flags "-s" -add_rcconf ntpd NO +add_rcconf openntpd_flags "-s" +add_rcconf openntpd NO diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index aab30bdc1..044d86a71 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,12 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.3.4 +PKG_VERSION:= 2.3.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b70be9fb45e407117c3c9b118e4ba22 +PKG_MD5SUM:= e1debdea76a2c6f87c7f8a38325f900c PKG_DESCR:= vpn solution using ssl/tls PKG_SECTION:= net/security PKG_DEPENDS:= ip +PKG_BUILDDEP:= openssl PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ @@ -21,20 +22,10 @@ PKGFD_WITH_MANAGEMENT:= enable management server support PKGFD_WITH_HTTPPROXY:= enable http proxy support PKGFD_WITH_SOCKS:= enable socks proxy support -PKG_CHOICES_OPENVPN:= WITH_OPENSSL WITH_POLARSSL -PKGCD_WITH_OPENSSL:= use OpenSSL for crypto -PKGCS_WITH_OPENSSL:= libopenssl -PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_POLARSSL:= use PolarSSL for crypto -PKGCS_WITH_POLARSSL:= libpolarssl -PKGCB_WITH_POLARSSL:= polarssl - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf - ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),) CONFIGURE_ARGS+= --enable-lzo else @@ -59,16 +50,10 @@ else CONFIGURE_ARGS+= --disable-socks endif -ifeq (${ADK_PACKAGE_OPENVPN_WITH_OPENSSL},y) -CONFIGURE_ARGS+= --with-crypto-library=openssl -endif -ifeq (${ADK_PACKAGE_OPENVPN_WITH_POLARSSL},y) -CONFIGURE_ARGS+= --with-crypto-library=polarssl -endif - CONFIGURE_ARGS+= --disable-plugins \ --enable-small \ --disable-debug \ + --with-crypto-library=openssl \ --enable-iproute2 openvpn-install: diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac deleted file mode 100644 index c0a43dae4..000000000 --- a/package/openvpn/patches/patch-configure_ac +++ /dev/null @@ -1,31 +0,0 @@ ---- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 -+++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 -@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET - - AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) - AC_ARG_VAR([ROUTE], [full path to route utility]) --AC_ARG_VAR([IPROUTE], [full path to ip utility]) - AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests - AC_ARG_VAR([MAN2HTML], [path to man2html utility]) - AC_ARG_VAR([GIT], [path to git utility]) --AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) --AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) --AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) - AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests - AC_CHECK_PROGS([MAN2HTML], [man2html]) - AC_CHECK_PROGS([GIT], [git]) # optional --AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) --AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) --AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) -+AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) - - # - # Libtool -@@ -982,7 +976,6 @@ else - fi - - if test "${enable_iproute2}" = "yes"; then -- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) - AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) - else - if test "${WIN32}" != "yes"; then diff --git a/package/openvpn/patches/patch-src_openvpn_syshead_h b/package/openvpn/patches/patch-src_openvpn_syshead_h deleted file mode 100644 index 31e0f2789..000000000 --- a/package/openvpn/patches/patch-src_openvpn_syshead_h +++ /dev/null @@ -1,13 +0,0 @@ ---- openvpn-2.3.2.orig/src/openvpn/syshead.h 2013-05-31 14:00:25.000000000 +0200 -+++ openvpn-2.3.2/src/openvpn/syshead.h 2013-08-17 16:29:58.353443521 +0200 -@@ -214,10 +214,6 @@ - - #ifdef TARGET_LINUX - --#if defined(HAVE_NETINET_IF_ETHER_H) --#include <netinet/if_ether.h> --#endif -- - #ifdef HAVE_LINUX_IF_TUN_H - #include <linux/if_tun.h> - #endif diff --git a/package/p5-class-xsaccessor/Makefile b/package/p5-class-xsaccessor/Makefile new file mode 100644 index 000000000..ff2bd39b8 --- /dev/null +++ b/package/p5-class-xsaccessor/Makefile @@ -0,0 +1,33 @@ +# 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 + +PKG_NAME:= p5-class-xsaccessor +PKG_VERSION:= 1.19 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5c5dea74f00ad37c5119dd22b28a5563 +PKG_DESCR:= generate fast xs accessors without runtime compilation +PKG_SECTION:= dev/perl +PKG_DEPENDS:= perl +PKG_BUILDDEP:= perl +PKG_SITES:= http://cpan.metacpan.org/authors/id/S/SM/SMUELLER/ + +DISTFILES:= Class-XSAccessor-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/Class-XSAccessor-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,P5_CLASS_XSACCESSOR,p5-class-xsaccessor,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +include $(ADK_TOPDIR)/mk/perl.mk + +CONFIG_STYLE:= perl +XAKE_FLAGS+= $(PERL_ENV) + +p5-class-xsaccessor-install: + $(INSTALL_DIR) $(IDIR_P5_CLASS_XSACCESSOR)$(PERL_SITEDIR) + $(CP) $(WRKINST)$(PERL_SITEDIR)/* \ + $(IDIR_P5_CLASS_XSACCESSOR)$(PERL_SITEDIR) + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/p5-io-interface/Makefile b/package/p5-io-interface/Makefile new file mode 100644 index 000000000..0886e4a2d --- /dev/null +++ b/package/p5-io-interface/Makefile @@ -0,0 +1,33 @@ +# 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 + +PKG_NAME:= p5-io-interface +PKG_VERSION:= 1.08 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 38c292a4d0976dd38179cfbfdca5e777 +PKG_DESCR:= extension for access to network card configuration information +PKG_SECTION:= dev/perl +PKG_DEPENDS:= perl +PKG_BUILDDEP:= perl +PKG_SITES:= http://cpan.metacpan.org/authors/id/L/LD/LDS/ + +DISTFILES:= IO-Interface-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/IO-Interface-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,P5_IO_INTERFACE,p5-io-interface,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +include $(ADK_TOPDIR)/mk/perl.mk + +CONFIG_STYLE:= perl +XAKE_FLAGS+= $(PERL_ENV) + +p5-io-interface-install: + $(INSTALL_DIR) $(IDIR_P5_IO_INTERFACE)$(PERL_SITEDIR) + $(CP) $(WRKINST)$(PERL_SITEDIR)/* \ + $(IDIR_P5_IO_INTERFACE)$(PERL_SITEDIR) + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/p5-template-toolkit/Makefile b/package/p5-template-toolkit/Makefile new file mode 100644 index 000000000..b8a576572 --- /dev/null +++ b/package/p5-template-toolkit/Makefile @@ -0,0 +1,33 @@ +# 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 + +PKG_NAME:= p5-template-toolkit +PKG_VERSION:= 2.26 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4c289856ebee446ebbe2629b24f0734b +PKG_DESCR:= comprehensive template processing system +PKG_SECTION:= dev/perl +PKG_DEPENDS:= perl +PKG_BUILDDEP:= perl +PKG_SITES:= http://cpan.metacpan.org/authors/id/A/AB/ABW/ + +DISTFILES:= Template-Toolkit-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/Template-Toolkit-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,P5_TEMPLATE_TOOLKIT,p5-template-toolkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +include $(ADK_TOPDIR)/mk/perl.mk + +CONFIG_STYLE:= perl +XAKE_FLAGS+= $(PERL_ENV) + +p5-template-toolkit-install: + $(INSTALL_DIR) $(IDIR_P5_TEMPLATE_TOOLKIT)$(PERL_SITEDIR) + $(CP) $(WRKINST)$(PERL_SITEDIR)/* \ + $(IDIR_P5_TEMPLATE_TOOLKIT)$(PERL_SITEDIR) + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 09d03cfca..06912c2c5 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= pciutils -PKG_VERSION:= 3.1.10 +PKG_VERSION:= 3.3.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 72ebc3624ccb43ae2ddf872b5dfdb3c9 +PKG_MD5SUM:= 3c19adf32a8457983b71ff376ef7dafe PKG_DESCR:= pci utilities (lspci/setpci) PKG_SECTION:= sys/hw PKG_DEPENDS:= zlib diff --git a/package/php/Makefile b/package/php/Makefile index 4d41781b2..3a2ca799c 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,18 +4,20 @@ 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 PHP_URL:= http://www.php.net/ PKG_SITES:= http://de.php.net/distributions/ -PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI +PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI PHP_FPM PKGSD_PHP_FASTCGI:= php for fastcgi usage PKGSN_PHP_FASTCGI:= php +PKGSD_PHP_FPM:= php for fastcgi process manager usage +PKGSN_PHP_FPM:= php PKGSD_PHP_CLI:= php cli PKGSN_PHP_CLI:= php @@ -75,6 +77,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_CLI},${PKG_SECTION})) $(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_FASTCGI},${PKG_SECTION})) +$(eval $(call PKG_template,PHP_FPM,php-fpm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_FPM},${PKG_SECTION})) define PKG_mod_template @@ -91,6 +94,7 @@ PKG_CONFIGURE_OPTS:= \ --with-config-file-path=/etc \ --enable-cli \ --enable-cgi \ + --enable-fpm \ --enable-opcache=no \ --disable-hash \ --disable-mbstring \ @@ -259,5 +263,11 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/bin ${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \ $(IDIR_PHP_FASTCGI)/usr/bin/php + ${INSTALL_DIR} $(IDIR_PHP_FPM)/etc + $(CP) ./files/php-fpm.conf \ + $(IDIR_PHP_FPM)/etc + ${INSTALL_DIR} $(IDIR_PHP_FPM)/usr/bin + ${INSTALL_BIN} $(WRKBUILD)/sapi/fpm/php-fpm \ + $(IDIR_PHP_FPM)/usr/bin/php include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/php/files/php-fpm.conf b/package/php/files/php-fpm.conf new file mode 100644 index 000000000..90b6be5ea --- /dev/null +++ b/package/php/files/php-fpm.conf @@ -0,0 +1,384 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = nginx +group = nginx + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = /var/run/php5-fpm.sock + +; Set listen(2) backlog. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 128 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +listen.owner = nginx +listen.group = nginx +listen.mode = 0666 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 5 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: ${prefix}/share/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: ouput header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +chdir = / + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/package/polarssl/Makefile b/package/polarssl/Makefile index 8180fd6d8..10c55b997 100644 --- a/package/polarssl/Makefile +++ b/package/polarssl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= polarssl -PKG_VERSION:= 1.3.6 +PKG_VERSION:= 1.3.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1245884d3e73150cfcc196f91de2b5c4 +PKG_MD5SUM:= 48af7d1f0d5de512cbd6dacf5407884c PKG_DESCR:= embedded ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= https://polarssl.org/ diff --git a/package/ruby/Makefile b/package/ruby/Makefile index d9460e482..66a721e8d 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 2.1.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= e57fdbb8ed56e70c43f39c79da1654b2 +PKG_VERSION:= 2.1.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 89b2f4a197621346f6724a3c35535b19 PKG_DESCR:= ruby scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= librt libpthread @@ -18,8 +18,6 @@ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_HOST_DEPENDS:= !freebsd !cygwin - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile index ad58abf97..002c83577 100644 --- a/package/squeezelite/Makefile +++ b/package/squeezelite/Makefile @@ -4,9 +4,11 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= squeezelite -PKG_VERSION:= 1.6.4 +# git hash f2b5e89c1ea3904498cd8649a146c2aa1a748996 +# from https://code.google.com/p/squeezelite/ +PKG_VERSION:= 1.6.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7605af4d64291495645f88575a564475 +PKG_MD5SUM:= aaf326f181c7043864ac0b272297e15c PKG_DESCR:= headless squeezebox emulator PKG_SECTION:= mm/audio PKG_DEPENDS:= libflac alsa-lib libvorbis libmad diff --git a/package/stunnel/Makefile b/package/stunnel/Makefile index 9591c0f9f..940d99e7e 100644 --- a/package/stunnel/Makefile +++ b/package/stunnel/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= stunnel -PKG_VERSION:= 5.02 +PKG_VERSION:= 5.07 PKG_RELEASE:= 1 -PKG_MD5SUM:= bb48b1c18cfc0a42708ef996b1a26926 +PKG_MD5SUM:= c10edd84ecbc676a5a48c7e34ab3d1c5 PKG_DESCR:= encryption wrapper PKG_SECTION:= net/security PKG_DEPENDS:= libopenssl diff --git a/package/sudo/Makefile b/package/sudo/Makefile index 63514b459..8c8a1fe30 100644 --- a/package/sudo/Makefile +++ b/package/sudo/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= sudo -PKG_VERSION:= 1.8.10 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 954d64906c3f6e2436f33445a049c58b +PKG_VERSION:= 1.8.11p2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 84012b4871b6c775c957cd310d5bad87 PKG_DESCR:= su do PKG_SECTION:= sys/misc -PKG_URL:= http://www.courtesan.com/sudo/ -PKG_SITES:= http://www.courtesan.com/sudo/dist/ +PKG_URL:= http://www.sudo.ws/sudo/ +PKG_SITES:= http://www.sudo.ws/sudo/dist/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -19,8 +19,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,SUDO,sudo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_CPPFLAGS+= -I../ -I../include +TARGET_LDFLAGS+= -ldl CONFIGURE_ARGS+= --without-pam \ --without-sendmail \ + --disable-shared \ + --enable-static-sudoers \ + --disable-shared-libutil \ --with-env-editor ifeq ($(ADK_TARGET_USE_SSP),y) diff --git a/package/sudo/patches/patch-compat_Makefile_in b/package/sudo/patches/patch-compat_Makefile_in deleted file mode 100644 index e52c8a62c..000000000 --- a/package/sudo/patches/patch-compat_Makefile_in +++ /dev/null @@ -1,15 +0,0 @@ ---- sudo-1.8.10.orig/compat/Makefile.in 2014-03-07 22:51:19.000000000 +0100 -+++ sudo-1.8.10/compat/Makefile.in 2014-03-24 15:58:28.000000000 +0100 -@@ -96,10 +96,10 @@ signame.c: mksigname - ./mksigname > $@ - - mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h -- $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ -+ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ - - mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/missing.h $(top_builddir)/config.h -- $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@ -+ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@ - - fnm_test: fnm_test.o libreplace.la - $(LIBTOOL) --mode=link $(CC) -o $@ fnm_test.o libreplace.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) diff --git a/package/sudo/patches/patch-doc_Makefile_in b/package/sudo/patches/patch-doc_Makefile_in new file mode 100644 index 000000000..32fca89be --- /dev/null +++ b/package/sudo/patches/patch-doc_Makefile_in @@ -0,0 +1,27 @@ +--- sudo-1.8.11p2.orig/doc/Makefile.in 2014-09-23 18:40:15.000000000 +0200 ++++ sudo-1.8.11p2/doc/Makefile.in 2014-12-15 13:42:40.626160940 +0100 +@@ -291,15 +291,15 @@ install-binaries: + install-includes: + + install-doc: install-dirs +- for f in $(OTHER_DOCS); do $(INSTALL) $(INSTALL_OWNER) -m 0644 $$f $(DESTDIR)$(docdir); done +- @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) $(INSTALL_OWNER) -m 0644 $$f $(DESTDIR)$(docdir); done +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudo.conf.$(mantype) $(DESTDIR)$(mandirform)/sudo.conf.$(mansectform) +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) +- @LDAP@$(INSTALL) $(INSTALL_OWNER) -m 0644 $(mansrcdir)/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) ++ for f in $(OTHER_DOCS); do $(INSTALL) -m 0644 $$f $(DESTDIR)$(docdir); done ++ @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -m 0644 $$f $(DESTDIR)$(docdir); done ++ $(INSTALL) -m 0644 $(mansrcdir)/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) ++ $(INSTALL) -m 0644 $(mansrcdir)/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) ++ $(INSTALL) -m 0644 $(mansrcdir)/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) ++ $(INSTALL) -m 0644 $(mansrcdir)/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) ++ $(INSTALL) -m 0644 $(mansrcdir)/sudo.conf.$(mantype) $(DESTDIR)$(mandirform)/sudo.conf.$(mansectform) ++ $(INSTALL) -m 0644 $(mansrcdir)/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) ++ @LDAP@$(INSTALL) -m 0644 $(mansrcdir)/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) + @if test -n "$(MANCOMPRESS)"; then \ + for f in $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/sudo_plugin.$(mansectsu) $(mandirsu)/sudoreplay.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudo.conf.$(mansectform) $(mandirform)/sudoers.$(mansectform) $(mandirform)/sudoers.ldap.$(mansectform); do \ + if test -f $(DESTDIR)$$f; then \ diff --git a/package/sudo/patches/patch-include_Makefile_in b/package/sudo/patches/patch-include_Makefile_in new file mode 100644 index 000000000..bb07fa867 --- /dev/null +++ b/package/sudo/patches/patch-include_Makefile_in @@ -0,0 +1,11 @@ +--- sudo-1.8.11p2.orig/include/Makefile.in 2014-10-07 22:26:20.000000000 +0200 ++++ sudo-1.8.11p2/include/Makefile.in 2014-12-15 13:06:08.966174328 +0100 +@@ -66,7 +66,7 @@ install-binaries: + install-doc: + + install-includes: install-dirs +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir) ++ $(INSTALL) -m 0644 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir) + + install-plugin: + diff --git a/package/sudo/patches/patch-lib_util_Makefile_in b/package/sudo/patches/patch-lib_util_Makefile_in new file mode 100644 index 000000000..696e40b48 --- /dev/null +++ b/package/sudo/patches/patch-lib_util_Makefile_in @@ -0,0 +1,15 @@ +--- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200 ++++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-15 11:39:13.098206188 +0100 +@@ -148,10 +148,10 @@ signame.c: mksigname + ./mksigname > $@ + + mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h +- $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ ++ $(CC_FOR_BUILD) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(incdir) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(DEFS) $(srcdir)/mksiglist.c -o $@ + + mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h +- $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@ ++ $(CC_FOR_BUILD) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(incdir) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(DEFS) $(srcdir)/mksigname.c -o $@ + + $(srcdir)/mksiglist.h: $(srcdir)/siglist.in + @if [ -n "$(DEVEL)" ]; then \ diff --git a/package/sudo/patches/patch-plugins_sudoers_Makefile_in b/package/sudo/patches/patch-plugins_sudoers_Makefile_in new file mode 100644 index 000000000..b2067ef04 --- /dev/null +++ b/package/sudo/patches/patch-plugins_sudoers_Makefile_in @@ -0,0 +1,31 @@ +--- sudo-1.8.11p2.orig/plugins/sudoers/Makefile.in 2014-10-07 22:26:20.000000000 +0200 ++++ sudo-1.8.11p2/plugins/sudoers/Makefile.in 2014-12-15 12:59:33.342176744 +0100 +@@ -301,12 +301,12 @@ install-dirs: + $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ + `echo $(DESTDIR)$(rundir)|$(SED) 's,/[^/]*$$,,'` \ + `echo $(DESTDIR)$(vardir)|$(SED) 's,/[^/]*$$,,'` +- $(INSTALL) -d $(INSTALL_OWNER) -m 0711 $(DESTDIR)$(rundir) +- $(INSTALL) -d $(INSTALL_OWNER) -m 0711 $(DESTDIR)$(vardir) ++ $(INSTALL) -d $(DESTDIR)$(rundir) ++ $(INSTALL) -d $(DESTDIR)$(vardir) + + install-binaries: visudo sudoreplay install-dirs +- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay +- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 visudo $(DESTDIR)$(visudodir)/visudo ++ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay ++ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 visudo $(DESTDIR)$(visudodir)/visudo + + install-includes: + +@@ -322,9 +322,9 @@ install-plugin: sudoers.la install-dirs + esac + + install-sudoers: install-dirs +- $(INSTALL) -d $(INSTALL_OWNER) -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d ++ $(INSTALL) -d -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d + test -r $(DESTDIR)$(sudoersdir)/sudoers || \ +- $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers ++ $(INSTALL) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers + + uninstall: + -$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la diff --git a/package/sudo/patches/patch-plugins_sudoers_match_c b/package/sudo/patches/patch-plugins_sudoers_match_c index 57c49e55b..88fe5986c 100644 --- a/package/sudo/patches/patch-plugins_sudoers_match_c +++ b/package/sudo/patches/patch-plugins_sudoers_match_c @@ -1,6 +1,6 @@ ---- sudo-1.8.10.orig/plugins/sudoers/match.c 2014-03-07 22:51:19.000000000 +0100 -+++ sudo-1.8.10/plugins/sudoers/match.c 2014-03-24 16:16:24.000000000 +0100 -@@ -122,10 +122,12 @@ userlist_matches(const struct passwd *pw +--- sudo-1.8.11p2.orig/plugins/sudoers/match.c 2014-09-23 18:56:04.000000000 +0200 ++++ sudo-1.8.11p2/plugins/sudoers/match.c 2014-12-15 10:26:02.230233008 +0100 +@@ -126,10 +126,12 @@ userlist_matches(const struct passwd *pw case ALL: matched = !m->negated; break; @@ -13,7 +13,7 @@ case USERGROUP: if (usergr_matches(m->name, pw->pw_name, pw)) matched = !m->negated; -@@ -178,10 +180,12 @@ runaslist_matches(const struct member_li +@@ -182,10 +184,12 @@ runaslist_matches(const struct member_li case ALL: user_matched = !m->negated; break; @@ -26,7 +26,7 @@ case USERGROUP: if (usergr_matches(m->name, runas_pw->pw_name, runas_pw)) user_matched = !m->negated; -@@ -278,10 +282,12 @@ hostlist_matches(const struct member_lis +@@ -282,10 +286,12 @@ hostlist_matches(const struct member_lis case ALL: matched = !m->negated; break; @@ -39,7 +39,7 @@ case NTWKADDR: if (addr_matches(m->name)) matched = !m->negated; -@@ -930,6 +936,7 @@ sudo_getdomainname(void) +@@ -939,6 +945,7 @@ sudo_getdomainname(void) * else return false. Either of "lhost", "shost" or "user" may be NULL * in which case that argument is not checked... */ @@ -47,7 +47,7 @@ bool netgr_matches(const char *netgr, const char *lhost, const char *shost, const char *user) { -@@ -972,3 +979,4 @@ netgr_matches(const char *netgr, const c +@@ -981,3 +988,4 @@ netgr_matches(const char *netgr, const c debug_return_bool(rc); } diff --git a/package/sudo/patches/patch-src_Makefile_in b/package/sudo/patches/patch-src_Makefile_in new file mode 100644 index 000000000..4379371f6 --- /dev/null +++ b/package/sudo/patches/patch-src_Makefile_in @@ -0,0 +1,23 @@ +--- sudo-1.8.11p2.orig/src/Makefile.in 2014-10-07 22:26:20.000000000 +0200 ++++ sudo-1.8.11p2/src/Makefile.in 2014-12-15 13:03:47.830175190 +0100 +@@ -151,17 +151,17 @@ install-rc: + @if [ -n "$(INIT_SCRIPT)" ]; then \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(INIT_DIR) \ + `echo $(DESTDIR)$(RC_LINK) | $(SED) 's,/[^/]*$$,,'`; \ +- $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ ++ $(INSTALL) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ + rm -f $(DESTDIR)$(RC_LINK); \ + ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \ + fi + + install-binaries: install-dirs $(PROGS) +- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 04755 sudo $(DESTDIR)$(bindir)/sudo ++ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 sudo $(DESTDIR)$(bindir)/sudo + rm -f $(DESTDIR)$(bindir)/sudoedit + ln -s sudo $(DESTDIR)$(bindir)/sudoedit + if [ -f sesh ]; then \ +- INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OWNER) -m 0755 sesh $(DESTDIR)$(libexecdir)/sudo/sesh; \ ++ INSTALL_BACKUP='~' $(LIBTOOL) --mode=install $(INSTALL) -m 0755 sesh $(DESTDIR)$(libexecdir)/sudo/sesh; \ + fi + + install-doc: diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 2c5e63ad1..e61898872 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= usbutils -PKG_VERSION:= 007 +PKG_VERSION:= 008 PKG_RELEASE:= 1 -PKG_MD5SUM:= c9df5107ae9d26b10a1736a261250139 +PKG_MD5SUM:= 2780b6ae21264c888f8f30fb2aab1259 PKG_DESCR:= program to list usb devices PKG_SECTION:= sys/hw PKG_DEPENDS:= libusb libusb-compat libpthread zlib librt -PKG_BUILDDEP:= libusb libusb-compat zlib +PKG_BUILDDEP:= libusb libusb-compat zlib eudev PKG_SITES:= http://www.kernel.org/pub/linux/utils/usb/usbutils/ PKG_BB:= 1 @@ -21,9 +21,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) lsusb-install: - ${INSTALL_DIR} ${IDIR_LSUSB}/usr/share - ${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids.gz \ - ${IDIR_LSUSB}/usr/share/ ${INSTALL_DIR} ${IDIR_LSUSB}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/lsusb ${IDIR_LSUSB}/usr/bin diff --git a/package/uvd/Makefile b/package/uvd/Makefile index ba23ac42e..fdfd86f38 100644 --- a/package/uvd/Makefile +++ b/package/uvd/Makefile @@ -5,10 +5,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= uvd PKG_VERSION:= 0.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_DESCR:= udp server for version information PKG_SECTION:= sys/misc -PKG_URL:= http://openadk.org/ +PKG_URL:= http://www.openadk.org/ NO_DISTFILES:= 1 @@ -25,7 +25,7 @@ do-build: -o ${WRKBUILD}/uvd ${WRKBUILD}/uvd.c do-install: - ${INSTALL_DIR} ${IDIR_UVD}/sbin - ${INSTALL_BIN} ${WRKBUILD}/uvd ${IDIR_UVD}/sbin + ${INSTALL_DIR} ${IDIR_UVD}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/uvd ${IDIR_UVD}/usr/sbin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/wget/Makefile b/package/wget/Makefile index d1f69f7db..516f468b6 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wget -PKG_VERSION:= 1.15 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 506df41295afc6486662cc47470b4618 +PKG_VERSION:= 1.16 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 293a37977c41b5522f781d3a3a078426 PKG_DESCR:= retrieving files using http(s) and ftp PKG_SECTION:= net/http PKG_URL:= http://www.gnu.org/software/wget/ @@ -39,8 +39,6 @@ CONFIGURE_ARGS+= --with-ssl=gnutls \ --with-libgnutls-prefix="$(STAGING_TARGET_DIR)/usr" endif -AUTOTOOL_STYLE:= autoreconf - wget-install: ${INSTALL_DIR} ${IDIR_WGET}/etc ${IDIR_WGET}/usr/bin ${INSTALL_DATA} ${WRKBUILD}/doc/sample.wgetrc \ diff --git a/package/wget/patches/patch-Makefile_am b/package/wget/patches/patch-Makefile_am deleted file mode 100644 index c9c937c60..000000000 --- a/package/wget/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- wget-1.15.orig/Makefile.am 2014-01-04 13:49:47.000000000 +0100 -+++ wget-1.15/Makefile.am 2014-04-23 19:48:58.359897378 +0200 -@@ -41,7 +41,7 @@ distuninstallcheck_listfiles = find . -t - ACLOCAL_AMFLAGS = -I m4 - - # subdirectories in the distribution --SUBDIRS = lib src doc po tests util -+SUBDIRS = lib src util - - EXTRA_DIST = ChangeLog.README MAILING-LIST \ - msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \ diff --git a/package/wget/patches/patch-configure_ac b/package/wget/patches/patch-configure_ac deleted file mode 100644 index cfb3a165b..000000000 --- a/package/wget/patches/patch-configure_ac +++ /dev/null @@ -1,15 +0,0 @@ ---- wget-1.15.orig/configure.ac 2014-01-04 13:49:47.000000000 +0100 -+++ wget-1.15/configure.ac 2014-04-23 19:48:44.679755324 +0200 -@@ -104,12 +104,6 @@ AC_AIX - - gl_EARLY - --dnl --dnl Gettext --dnl --AM_GNU_GETTEXT([external],[need-ngettext]) --AM_GNU_GETTEXT_VERSION([0.17]) -- - AC_PROG_RANLIB - - AC_PROG_LEX diff --git a/package/wget/patches/patch-m4_spawn_h_m4 b/package/wget/patches/patch-m4_spawn_h_m4 deleted file mode 100644 index f49598f3b..000000000 --- a/package/wget/patches/patch-m4_spawn_h_m4 +++ /dev/null @@ -1,19 +0,0 @@ ---- wget-1.15.orig/m4/spawn_h.m4 2014-01-19 11:00:21.000000000 +0100 -+++ wget-1.15/m4/spawn_h.m4 2014-02-21 17:25:19.000000000 +0100 -@@ -64,7 +64,15 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN], - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) - -- AC_CHECK_FUNCS_ONCE([posix_spawn]) -+ LIB_POSIX_SPAWN= -+ AC_SUBST([LIB_POSIX_SPAWN]) -+ gl_saved_libs=$LIBS -+ AC_SEARCH_LIBS([posix_spawn], [rt], -+ [test "$ac_cv_search_posix_spawn" = "none required" || -+ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn]) -+ AC_CHECK_FUNCS([posix_spawn]) -+ LIBS=$gl_saved_libs -+ - if test $ac_cv_func_posix_spawn != yes; then - HAVE_POSIX_SPAWN=0 - fi diff --git a/package/wiringPi/Makefile b/package/wiringPi/Makefile new file mode 100644 index 000000000..5b6a76d6d --- /dev/null +++ b/package/wiringPi/Makefile @@ -0,0 +1,41 @@ +# 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 + +PKG_NAME:= wiringPi +# actually git checkout from 05.12.2014 +# 0a9fdeb29d31609ef834f050bdb8a7a65cd35e2b +PKG_VERSION:= 0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e1c9430b80476da2c1de5ef71a795a3d +PKG_DESCR:= GPIO access library for the BCM2835 used in the Raspberry Pi +PKG_SECTION:= libs/misc +PKG_URL:= http://wiringpi.com/ +PKG_SITES:= http://openadk.org/distfiles + +PKG_SYSTEM_DEPENDS:= raspberry-pi + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,WIRINGPI,wiringPi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +TARGET_CPPFLAGS+= -I../wiringPi + +do-build: + (cd $(WRKBUILD); $(MAKE) -C wiringPi) + (cd $(WRKBUILD); $(MAKE) -C devLib) + +wiringPi-install: + $(INSTALL_DIR) $(IDIR_WIRINGPI)/usr/lib + $(CP) $(WRKBUILD)/wiringPi/libwiringPi.so* $(IDIR_WIRINGPI)/usr/lib + $(CP) $(WRKBUILD)/devLib/libwiringPiDev.so* $(IDIR_WIRINGPI)/usr/lib + (cd $(IDIR_WIRINGPI)/usr/lib; ln -sf libwiringPi.so.2.0 libwiringPi.so) + (cd $(IDIR_WIRINGPI)/usr/lib; ln -sf libwiringPiDev.so.2.0 libwiringPiDev.so) + $(CP) $(WRKBUILD)/wiringPi/*.h $(STAGING_TARGET_DIR)/usr/include + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/wiringPi/patches/patch-devLib_Makefile b/package/wiringPi/patches/patch-devLib_Makefile new file mode 100644 index 000000000..8fa24bcc1 --- /dev/null +++ b/package/wiringPi/patches/patch-devLib_Makefile @@ -0,0 +1,30 @@ + fix upstream Makefile + +--- wiringPi-0.1.orig/devLib/Makefile 2014-12-05 14:48:57.000000000 +0100 ++++ wiringPi-0.1/devLib/Makefile 2014-12-05 15:35:35.470864970 +0100 +@@ -32,9 +32,9 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) + + #DEBUG = -g -O0 + DEBUG = -O2 +-CC = gcc ++CC ?= gcc + INCLUDE = -I. +-CFLAGS = $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC ++CFLAGS ?= -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC + + LIBS = + +@@ -59,11 +59,11 @@ $(STATIC): $(OBJ) + + $(DYNAMIC): $(OBJ) + @echo "[Link (Dynamic)]" +- @$(CC) -shared -Wl,-soname,libwiringPiDev.so -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) ++ $(CC) -shared -Wl,-soname,libwiringPiDev.so -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) + + .c.o: + @echo [Compile] $< +- @$(CC) -c $(CFLAGS) $< -o $@ ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ + + .PHONY: clean + clean: diff --git a/package/wiringPi/patches/patch-wiringPi_Makefile b/package/wiringPi/patches/patch-wiringPi_Makefile new file mode 100644 index 000000000..68053af79 --- /dev/null +++ b/package/wiringPi/patches/patch-wiringPi_Makefile @@ -0,0 +1,29 @@ +--- wiringPi-0.1.orig/wiringPi/Makefile 2014-12-05 14:48:57.000000000 +0100 ++++ wiringPi-0.1/wiringPi/Makefile 2014-12-05 15:38:39.214862303 +0100 +@@ -33,10 +33,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) + + #DEBUG = -g -O0 + DEBUG = -O2 +-CC = gcc ++CC ?= gcc + INCLUDE = -I. + DEFS = -D_GNU_SOURCE +-CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC ++CFLAGS ?= $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC + + LIBS = + +@@ -71,11 +71,11 @@ $(STATIC): $(OBJ) + + $(DYNAMIC): $(OBJ) + @echo "[Link (Dynamic)]" +- @$(CC) -shared -Wl,-soname,libwiringPi.so -o libwiringPi.so.$(VERSION) -lpthread $(OBJ) ++ $(CC) -shared -Wl,-soname,libwiringPi.so -o libwiringPi.so.$(VERSION) -lpthread $(OBJ) + + .c.o: + @echo [Compile] $< +- @$(CC) -c $(CFLAGS) $< -o $@ ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ + + .PHONY: clean + clean: |