From 5af48373207983d8c1101f7987aa8573d9eae1b2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 1 Jun 2011 19:16:22 +0200 Subject: [PATCH] evtest: build as shared lib, include needed libs Signed-off-by: Stephan Raue --- packages/addons/debugging/tools/evtest/addon | 9 +++++-- packages/addons/debugging/tools/evtest/build | 5 +--- .../debugging/tools/evtest/changelog.txt | 6 +++++ packages/addons/debugging/tools/evtest/meta | 6 ++--- .../debugging/tools/evtest/source/bin/evtest | 27 +++++++++++++++++++ .../tools/evtest/source/bin/evtest-capture | 27 +++++++++++++++++++ 6 files changed, 71 insertions(+), 9 deletions(-) create mode 100755 packages/addons/debugging/tools/evtest/source/bin/evtest create mode 100755 packages/addons/debugging/tools/evtest/source/bin/evtest-capture diff --git a/packages/addons/debugging/tools/evtest/addon b/packages/addons/debugging/tools/evtest/addon index 62520bc825..a79456f621 100755 --- a/packages/addons/debugging/tools/evtest/addon +++ b/packages/addons/debugging/tools/evtest/addon @@ -23,5 +23,10 @@ . config/options $1 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $PKG_BUILD/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest.bin + cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest-capture.bin + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + cp $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + cp $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + cp $BUILD/zlib-[0-9]*/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib diff --git a/packages/addons/debugging/tools/evtest/build b/packages/addons/debugging/tools/evtest/build index d93dcff91b..5559e24e5b 100755 --- a/packages/addons/debugging/tools/evtest/build +++ b/packages/addons/debugging/tools/evtest/build @@ -22,12 +22,9 @@ . config/options $1 -LDFLAGS="$LDFLAGS -static" -CFLAGS="$CFLAGS -pthread" - cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ -make LIBS="-lm -lz -liconv" +make diff --git a/packages/addons/debugging/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt index 365ebdd2e2..e7cdeca3a2 100644 --- a/packages/addons/debugging/tools/evtest/changelog.txt +++ b/packages/addons/debugging/tools/evtest/changelog.txt @@ -1,2 +1,8 @@ +0.99.2 +- build as shared lib +- include libiconv libs +- include libxml2 libs +- include zlib libs + 0.99.1 - initial addon based on evtest-1.27 diff --git a/packages/addons/debugging/tools/evtest/meta b/packages/addons/debugging/tools/evtest/meta index ce5e1dc402..2d0b0dd72d 100644 --- a/packages/addons/debugging/tools/evtest/meta +++ b/packages/addons/debugging/tools/evtest/meta @@ -20,13 +20,13 @@ PKG_NAME="evtest" PKG_VERSION="1.27" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://cgit.freedesktop.org/evtest/" PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libxml2" -PKG_BUILD_DEPENDS="toolchain libxml2" +PKG_DEPENDS="libiconv libxml2" +PKG_BUILD_DEPENDS="toolchain libiconv libxml2" PKG_PRIORITY="optional" PKG_SECTION="debug/tools" PKG_SHORTDESC="evtest: Simple tool for input event debugging." diff --git a/packages/addons/debugging/tools/evtest/source/bin/evtest b/packages/addons/debugging/tools/evtest/source/bin/evtest new file mode 100755 index 0000000000..bd4a157aec --- /dev/null +++ b/packages/addons/debugging/tools/evtest/source/bin/evtest @@ -0,0 +1,27 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest" + +chmod +x $ADDON_DIR/lib/* + +LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest.bin $@ diff --git a/packages/addons/debugging/tools/evtest/source/bin/evtest-capture b/packages/addons/debugging/tools/evtest/source/bin/evtest-capture new file mode 100755 index 0000000000..e2886aee7a --- /dev/null +++ b/packages/addons/debugging/tools/evtest/source/bin/evtest-capture @@ -0,0 +1,27 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest" + +chmod +x $ADDON_DIR/lib/* + +LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest-capture.bin $@