Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (23b1d15126389ca9dbba03176f931ef7328eb70b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (23b1d15126389ca9dbba03176f931ef7328eb70b)
  • Date: Mon, 20 Apr 2015 13:11:20 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video-libs/live/DETAILS | 4 ++--
video-libs/live/HISTORY | 3 +++
video/vlc/BUILD | 6 +++++-
video/vlc/HISTORY | 3 +++
4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 23b1d15126389ca9dbba03176f931ef7328eb70b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/live: version 2015.04.16

commit c576e7263d398df3b0545fd141aae4b37f99ebc8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/vlc: fix build error due to moc not being found

diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index b966216..9a79484 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
SPELL=live
- VERSION=2013.10.11
+ VERSION=2015.04.16
SOURCE=$SPELL.$VERSION.tar.gz
-
SOURCE_HASH=sha512:7ffc5eed9480cf6f1094b82040784977dda162c2351695de205986d5fa396f7e512cf2e7b46cebbf9c35bbea48cc1860776dc37dc17d34af5c29c71287ae446c
+
SOURCE_HASH=sha512:22006bf4afea9e9e18235bf6892d83eb70d89a1aec4b4e8cd47f4a0e5b217fa221d32e21be779f4d0e0c7704dda03a0329dc1fc6d51ca3c66a263867b3b2e6e0
#SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index c332411..6d5f25d 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2015-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2015.04.16
+
2013-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2013.10.11

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index ecbecdf..e4eaaf2 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -26,4 +26,8 @@ fi &&
if is_depends_enabled $SPELL goom; then
LDFLAGS=${LDFLAGS/-Wl,--as-needed}
fi &&
-default_build
+if is_depends_enabled $SPELL qt4; then
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" PATH="$QTDIR/bin/qt4:$PATH"
default_build
+else
+ default_build
+fi
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 2270b30..02a2666 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2015-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: fix build error if qt4 is enabled, moc was not found
+
2015-04-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.2.1
* DEPENDS,BUILD: add qt4/qt5 support



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (23b1d15126389ca9dbba03176f931ef7328eb70b), Florian Franzmann, 04/20/2015

Archive powered by MHonArc 2.6.24.

Top of Page