summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libcec/libcec-3.0.1_2f32a9d.patch25
-rw-r--r--libraries/libcec/libcec.SlackBuild3
2 files changed, 28 insertions, 0 deletions
diff --git a/libraries/libcec/libcec-3.0.1_2f32a9d.patch b/libraries/libcec/libcec-3.0.1_2f32a9d.patch
new file mode 100644
index 0000000000..db94adb0bb
--- /dev/null
+++ b/libraries/libcec/libcec-3.0.1_2f32a9d.patch
@@ -0,0 +1,25 @@
+From 2f32a9debc1f148b5dfcfc463480f1432bb71725 Mon Sep 17 00:00:00 2001
+From: Lars Op den Kamp <lars@opdenkamp.eu>
+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 "<unknown>"
++fi
diff --git a/libraries/libcec/libcec.SlackBuild b/libraries/libcec/libcec.SlackBuild
index c999ae146a..e441c6bec1 100644
--- a/libraries/libcec/libcec.SlackBuild
+++ b/libraries/libcec/libcec.SlackBuild
@@ -69,6 +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-|' \