summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2016-06-24 06:56:25 +0200
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-06-25 08:54:45 +0700
commit7aade40f6edd3da03be6e74d7b5f46cf201d7ea6 (patch)
tree27f622a9456b3a09599f4fbd98e07c76ef758ffc
parent889104ddb8db3ccad20cf919d6a0ae5752e6703a (diff)
downloadslackbuilds-7aade40f6edd3da03be6e74d7b5f46cf201d7ea6.tar.gz
libraries/qt5: Added a switch for proprietary codecs in qtwebengine.
Added the dependency libxkbcommon, fixed download location, added the optional dependencies opus and snappy Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/qt5/README10
-rw-r--r--libraries/qt5/qt5.SlackBuild8
-rw-r--r--libraries/qt5/qt5.info6
3 files changed, 18 insertions, 6 deletions
diff --git a/libraries/qt5/README b/libraries/qt5/README
index 26734d459c..c93e1cb10e 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -1,16 +1,22 @@
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
-Optional dependencies: unixodbc, libxkbcommon, freetds, OpenAL, libwebp,
+Optional dependencies: unixodbc, freetds, OpenAL, libwebp, opus, snappy,
and postgresql
Optional dependencies: wayland, openvg, libinput and firebird (not available
at slackbuilds.org)
-Note1: To build documentation pass DOCS=yes to the slackbuild.
+Note1: To build documentation pass DOCS=yes to the slackbuild
DOCS=yes ./qt5.SlackBuild
Note2: To build examples pass EXAMPLES=yes to the slackbuild
EXAMPLES=yes ./qt5.SlackBuild
+
+Note3: To build support for proprietary media codecs (note that this
+will produce a non-redistributable package in some countries) pass
+PROPRIETARY_CODECS=yes to the slackbuild
+
+ PROPRIETARY_CODECS=yes ./qt5.SlackBuild
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 493de8d248..7c0366f7c0 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -83,13 +83,17 @@ else
LIBDIRSUFFIX=""
fi
+# http://doc.qt.io/qt-5/qtwebengine-platform-notes.html#audio-and-video-codec-support
+PRCOD=""
+[ "$PROPRIETARY_CODECS" = "yes" ] && PRCOD="WEBENGINE_CONFIG += use_proprietary_codecs"
+
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
-tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz
+tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION-1.tar.xz
cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
chown -R root:root .
find -L . \
@@ -121,6 +125,8 @@ else
BUILD_EXAMPLES="-nomake examples"
fi
+echo "$PRCOD" >> qtwebengine/.qmake.conf
+
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
./configure -v \
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index f85f0e46fb..6166fadf28 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,10 +1,10 @@
PRGNAM="qt5"
VERSION="5.6.1"
HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.6/5.6.1/single/qt-everywhere-opensource-src-5.6.1.tar.xz"
-MD5SUM="d647574345c45b5ab8b41b2d46efffb9"
+DOWNLOAD="http://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz"
+MD5SUM="f44fd4fcae71087f90d9c68e9d8be449"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libxkbcommon"
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"