From 3cfdfb26dd30781a97770bb60c31548e56ec7107 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Wed, 22 Mar 2017 18:58:43 -0700 Subject: libraries/libcec: Updated for version 4.0.2 Signed-off-by: Larry Hajali --- libraries/libcec/README | 2 ++ libraries/libcec/libcec-3.0.1_2f32a9d.patch | 25 ------------------------- libraries/libcec/libcec.SlackBuild | 20 +++++++------------- libraries/libcec/libcec.info | 6 +++--- 4 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 libraries/libcec/libcec-3.0.1_2f32a9d.patch (limited to 'libraries/libcec') diff --git a/libraries/libcec/README b/libraries/libcec/README index 183360bd2d..7edda116eb 100644 --- a/libraries/libcec/README +++ b/libraries/libcec/README @@ -1,2 +1,4 @@ libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - HDMI CEC Adaptor. + +Optional dependency: python3 diff --git a/libraries/libcec/libcec-3.0.1_2f32a9d.patch b/libraries/libcec/libcec-3.0.1_2f32a9d.patch deleted file mode 100644 index db94adb0bb..0000000000 --- a/libraries/libcec/libcec-3.0.1_2f32a9d.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2f32a9debc1f148b5dfcfc463480f1432bb71725 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Sat, 11 Jul 2015 00:53:17 +0200 -Subject: [PATCH] fixed: don't generate an invalid env.h when not built with - the .git dir present. closes #112 - ---- - support/git-rev.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/support/git-rev.sh b/support/git-rev.sh -index 5dce3d0..4aadae6 100755 ---- a/support/git-rev.sh -+++ b/support/git-rev.sh -@@ -1,5 +1,8 @@ - #!/bin/sh - - ## cmake doesn't read the variable when it doesn't end with a newline, and I haven't figured out how to have it add a newline directly... --echo -n "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`\n" -- -+if [ -d .git ]; then -+ echo "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`" -+else -+ echo "" -+fi diff --git a/libraries/libcec/libcec.SlackBuild b/libraries/libcec/libcec.SlackBuild index e441c6bec1..07cbbd59a0 100644 --- a/libraries/libcec/libcec.SlackBuild +++ b/libraries/libcec/libcec.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libcec -# Copyright 2011-2015 Larry Hajali +# Copyright 2011-2017 Larry Hajali # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libcec -VERSION=${VERSION:-3.0.1} +VERSION=${VERSION:-4.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz 2>/dev/null || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,12 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix libcec-3.0.1 issue 112/115 on Github (upstream commit 2f32a9d) -patch -p1 < $CWD/libcec-3.0.1_2f32a9d.patch - # Fix python install folder. sed -i \ - -e "s|lib/|lib${LIBDIRSUFFIX}/|" -e 's|dist-|site-|' \ + -e "s|lib/|lib${LIBDIRSUFFIX}/|" \ src/$PRGNAM/cmake/CheckPlatformSupport.cmake mkdir -p build @@ -92,9 +89,6 @@ cd - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Fix permissions on python file. -chmod 755 $PKG/usr/bin/pyCecClient.py - install -D -m 0644 debian/cec-client.1 $PKG/usr/man/man1/cec-client.1 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/libraries/libcec/libcec.info b/libraries/libcec/libcec.info index f3542436bd..c6c129a34e 100644 --- a/libraries/libcec/libcec.info +++ b/libraries/libcec/libcec.info @@ -1,8 +1,8 @@ PRGNAM="libcec" -VERSION="3.0.1" +VERSION="4.0.2" HOMEPAGE="http://libcec.pulse-eight.com/" -DOWNLOAD="https://github.com/Pulse-Eight/libcec/archive/libcec-3.0.1.tar.gz" -MD5SUM="216ab1a5f04300dcad9d5b5d67ef9100" +DOWNLOAD="https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2/libcec-4.0.2.tar.gz" +MD5SUM="47892140fbda566f6a6f944b52eb44fd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lockdev platform" -- cgit v1.2.3-65-gdbad