From 3d1c6c84491a1262c7f33c2b5b73120ccfc69644 Mon Sep 17 00:00:00 2001 From: awiouy Date: Wed, 11 Jan 2017 00:36:13 +0100 Subject: [PATCH] serdisplib: use libusb-config from sysroot --- .../{ => lcdd-depends}/serdisplib/package.mk | 19 +++++++++++-------- .../serdisplib-disable_SDL_crosscompile.patch | 0 2 files changed, 11 insertions(+), 8 deletions(-) rename packages/addons/addon-depends/{ => lcdd-depends}/serdisplib/package.mk (75%) rename packages/addons/addon-depends/{ => lcdd-depends}/serdisplib/patches/serdisplib-disable_SDL_crosscompile.patch (100%) diff --git a/packages/addons/addon-depends/serdisplib/package.mk b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk similarity index 75% rename from packages/addons/addon-depends/serdisplib/package.mk rename to packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk index 678335714b..1233858125 100644 --- a/packages/addons/addon-depends/serdisplib/package.mk +++ b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk @@ -1,30 +1,29 @@ ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2017 Team LibreELEC # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) # -# OpenELEC is free software: you can redistribute it and/or modify +# LibreELEC 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 of the License, or # (at your option) any later version. # -# OpenELEC is distributed in the hope that it will be useful, +# LibreELEC 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. If not, see . +# along with LibreELEC. If not, see . ################################################################################ PKG_NAME="serdisplib" PKG_VERSION="1.97.9" -PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://serdisplib.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain libusb-compat" -PKG_SECTION="sysutils" PKG_SHORTDESC="serdisplib: a lcd control library" PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers" @@ -38,13 +37,17 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \ --with-drivers=all" pre_configure_target() { - # serdisplib fails to build in subdirs (found this in packages/devel/attr/package.mk) + # serdisplib fails to build in subdirs cd $ROOT/$PKG_BUILD rmdir .$TARGET_NAME + + # use libusb-config from sysroot + export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config } post_make_target() { - # copy necessary libs and headers to build the driver glcd from lcdproc + # copy necessary libs and headers to build serdisplib support + # into the driver glcd from lcdproc mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib mkdir -p $SYSROOT_PREFIX/usr/lib diff --git a/packages/addons/addon-depends/serdisplib/patches/serdisplib-disable_SDL_crosscompile.patch b/packages/addons/addon-depends/lcdd-depends/serdisplib/patches/serdisplib-disable_SDL_crosscompile.patch similarity index 100% rename from packages/addons/addon-depends/serdisplib/patches/serdisplib-disable_SDL_crosscompile.patch rename to packages/addons/addon-depends/lcdd-depends/serdisplib/patches/serdisplib-disable_SDL_crosscompile.patch