Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1038292c958945ad49007f8ee1e2ca5933a6a5f5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1038292c958945ad49007f8ee1e2ca5933a6a5f5)
  • Date: Mon, 28 Nov 2016 16:00:31 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

qt5/qtbase/HISTORY | 5 +++++
qt5/qtbase/PRE_BUILD | 5 +++--
video/avidemux3/BUILD | 4 ++--
video/avidemux3/DEPENDS | 11 ++++++-----
video/avidemux3/DETAILS | 4 ++--
video/avidemux3/HISTORY | 4 ++++
6 files changed, 22 insertions(+), 11 deletions(-)

New commits:
commit 1038292c958945ad49007f8ee1e2ca5933a6a5f5
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

avidemux3: update to 2.6.15 and switch to ony supported GUI qt5

commit cabf81b4fccf6b360262e8fa38a7439a2e866944
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qtbase: ldconfig

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 5ac1880..298ef54 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,8 @@
+2016-11-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: ldconfig helps when we added things to ld.so.conf .
+ Otherwise, stuff needing a freshly cast qtbase may break
+ (e.g. avidemux3).
+
2016-10-05 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: SSL => openssl; libressl is not supported

diff --git a/qt5/qtbase/PRE_BUILD b/qt5/qtbase/PRE_BUILD
index 6f5cb2f..ba59eb1 100755
--- a/qt5/qtbase/PRE_BUILD
+++ b/qt5/qtbase/PRE_BUILD
@@ -3,8 +3,9 @@
if grep -q qt5 /etc/ld.so.conf ;then
echo /etc/ld.so.conf already contains an entry for qt5
else
- echo adding entry for qt5 to /etc/ld.so.conf
- echo $QT5DIR/lib >> /etc/ld.so.conf
+ echo adding entry for qt5 to /etc/ld.so.conf &&
+ echo $QT5DIR/lib >> /etc/ld.so.conf &&
+ ldconfig
fi &&

default_pre_build &&
diff --git a/video/avidemux3/BUILD b/video/avidemux3/BUILD
index da07626..f00d139 100755
--- a/video/avidemux3/BUILD
+++ b/video/avidemux3/BUILD
@@ -1,5 +1,5 @@
-if is_depends_enabled $SPELL qt4; then
- PATH="$QT4DIR/bin:$PATH"
+if is_depends_enabled $SPELL qtbase; then
+ PATH="$QT5DIR/bin:$PATH"
fi &&
# Don't pollute /tmp.
sed -i 's,/tmp/log,log,g' bootStrap.bash &&
diff --git a/video/avidemux3/DEPENDS b/video/avidemux3/DEPENDS
index e9e1f80..fe0d477 100755
--- a/video/avidemux3/DEPENDS
+++ b/video/avidemux3/DEPENDS
@@ -4,11 +4,12 @@ depends libxml2 &&
depends yasm &&
depends sqlite &&

-# As of version 2.6.8, the gtk version just crashes (not just on SMGL).
-# See http://avidemux.org/smuf/index.php?topic=12721.0 .
-optional_depends gtk+3 "--with-gtk" "--without-gtk" \
-"for gtk+3 gui (unstable!)" &&
-optional_depends qt4 "--with-qt4" "--without-qt4" "for Qt gui" &&
+# QT5 is upstream default and the only thing that supposedly
+# works properly.
+optional_depends qtbase "" "--without-qt4" "for Qt gui" &&
+if is_depends_enabled $SPELL qtbase; then
+ depends qttools
+fi &&

# Sorry, using the simple bootstrap script, so no selective disabling
# of plugins. So what ever is present will be used.
diff --git a/video/avidemux3/DETAILS b/video/avidemux3/DETAILS
index f27a760..0da6f96 100755
--- a/video/avidemux3/DETAILS
+++ b/video/avidemux3/DETAILS
@@ -1,11 +1,11 @@
SPELL=avidemux3
- VERSION=2.6.12
+ VERSION=2.6.15
SOURCE=${SPELL%3}_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%3}_$VERSION"
# There's fosshub, too, but that is unfriendly to wget(?).

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL%3}/$SOURCE
WEB_SITE=http://fixounet.free.fr/avidemux/
-
SOURCE_HASH=sha512:ca5a03eae6bb583d20499da68400645cc7b66c27255fc77f18ffe311d3d27eaaf3ca813aff25a54934d76fe5d10d9fb48b2ad30d662377764f3ec1b620d5a824
+
SOURCE_HASH=sha512:42964509cb51133abe624631d07bd223a7cee9fcfd971655ce26193598a48428a2eb1ba0c43034477b60a626fd332431281217644baa82f935f4aeb945d4508a
LICENSE[0]=GPL
ENTERED=20140319
KEYWORDS="video"
diff --git a/video/avidemux3/HISTORY b/video/avidemux3/HISTORY
index b2c6efc..2598a16 100644
--- a/video/avidemux3/HISTORY
+++ b/video/avidemux3/HISTORY
@@ -1,3 +1,7 @@
+2016-11-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.6.15
+ * DEPENDS, BUILD: switch to qt5 (the only supported upstream GUI)
+
2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.6.12




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1038292c958945ad49007f8ee1e2ca5933a6a5f5), Thomas Orgis, 11/28/2016

Archive powered by MHonArc 2.6.24.

Top of Page