From 700c4a783da960797f9e93bd425e21e9fe1d7322 Mon Sep 17 00:00:00 2001 From: michaelpm54 <39412876+michaelpm54@users.noreply.github.com> Date: Sun, 24 Jun 2018 20:11:25 +0100 Subject: [PATCH] BUILD: Remove Qt Multimedia dependency --- CMakeLists.txt | 5 ++--- configure.ac | 2 +- dists/arch/PKGBUILD | 2 +- dists/debian/control | 2 +- dists/fedora/phaethon.spec | 2 +- m4/ax_check_qt5.m4 | 2 +- src/gui/panelpreviewsound.cpp | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65242f7f..046859b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,10 +283,9 @@ include_directories(${LIBLZMA_INCLUDE_DIRS}) list(APPEND PHAETHON_LIBRARIES ${LIBLZMA_LIBRARIES}) find_package(Qt5Widgets REQUIRED) -find_package(Qt5MultimediaWidgets REQUIRED) find_package(Qt5Concurrent REQUIRED) -include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5MultimediaWidgets_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS}) -list(APPEND PHAETHON_LIBRARIES Qt5::Widgets Qt5::MultimediaWidgets Qt5::Concurrent) +include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS}) +list(APPEND PHAETHON_LIBRARIES Qt5::Widgets Qt5::Concurrent) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") find_package(Iconv REQUIRED) diff --git a/configure.ac b/configure.ac index 31f37306..3f1fc613 100644 --- a/configure.ac +++ b/configure.ac @@ -188,7 +188,7 @@ AX_CHECK_ZLIB(1, 2, 3, 0, , AC_MSG_ERROR([zlib(>= 1.2.3.4) is required and could AX_CHECK_LZMA(5, 0, 3, 2, , AC_MSG_ERROR([liblzma(>= 5.0.5) is required and could not be found!])) dnl Graphic libraries -AX_CHECK_QT5(5.7.1, , AC_MSG_ERROR([Qt5 (>= 5.7.1, modules Core, Gui, Multimedia, Widgets) is required and could not be found!])) +AX_CHECK_QT5(5.7.1, , AC_MSG_ERROR([Qt5 (>= 5.7.1, modules Core, Gui, Widgets) is required and could not be found!])) dnl Sound libraries AX_CHECK_AL( , AC_MSG_ERROR([OpenAL or OpenAL Soft (>= 1.12) is required and could not be found!])) diff --git a/dists/arch/PKGBUILD b/dists/arch/PKGBUILD index e1004888..95111ff6 100644 --- a/dists/arch/PKGBUILD +++ b/dists/arch/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="A resource explorer for BioWare's Aurora engine games" arch=('i686' 'x86_64') url="https://xoreos.org/" license=('GPL3') -depends=('zlib' 'xz' 'boost' 'boost-libs' 'openal' 'libmad' 'libogg' 'libvorbis' 'faad2' 'xvidcore' 'qt5-multimedia') +depends=('zlib' 'xz' 'boost' 'boost-libs' 'openal' 'libmad' 'libogg' 'libvorbis' 'faad2' 'xvidcore') makedepends=() source=('git://github.com/xoreos/phaethon.git') md5sums=('SKIP') diff --git a/dists/debian/control b/dists/debian/control index 2c656d74..f4a0ae9c 100644 --- a/dists/debian/control +++ b/dists/debian/control @@ -2,7 +2,7 @@ Source: phaethon Section: misc Priority: optional Maintainer: Sven Hesse -Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, autoconf (>= 2.65), gettext, zlib1g-dev (>= 1:1.2.3.4), liblzma-dev (>= 5.0.5), libboost-dev (>= 1.53), libboost-atomic-dev (>= 1.53), libboost-date-time-dev (>= 1.53), libboost-filesystem-dev (>= 1.53), libboost-locale-dev (>= 1.53), libboost-regex-dev (>= 1.53), libboost-system-dev (>= 1.53), libboost-chrono-dev (>= 1.53), libboost-thread-dev (>= 1.53), libopenal-dev (>= 1:1.12), libmad0-dev (>= 0.15.1b), libogg-dev (>= 1.2.0), libvorbis-dev (>= 1.3.1), libfaad-dev (>= 2.7), libxvidcore-dev (>= 2:1.2.2), qtbase5-dev (>= 5.7.1), libqt5gui5 (>= 5.7.1), libqt5widgets5 (>= 5.7.1), qtmultimedia5-dev (>= 5.7.1~20161021-2) +Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, autoconf (>= 2.65), gettext, zlib1g-dev (>= 1:1.2.3.4), liblzma-dev (>= 5.0.5), libboost-dev (>= 1.53), libboost-atomic-dev (>= 1.53), libboost-date-time-dev (>= 1.53), libboost-filesystem-dev (>= 1.53), libboost-locale-dev (>= 1.53), libboost-regex-dev (>= 1.53), libboost-system-dev (>= 1.53), libboost-chrono-dev (>= 1.53), libboost-thread-dev (>= 1.53), libopenal-dev (>= 1:1.12), libmad0-dev (>= 0.15.1b), libogg-dev (>= 1.2.0), libvorbis-dev (>= 1.3.1), libfaad-dev (>= 2.7), libxvidcore-dev (>= 2:1.2.2), qtbase5-dev (>= 5.7.1), libqt5gui5 (>= 5.7.1), libqt5widgets5 (>= 5.7.1) Standards-Version: 3.9.6 Homepage: https://xoreos.org/ diff --git a/dists/fedora/phaethon.spec b/dists/fedora/phaethon.spec index 249c88dd..65fd1384 100644 --- a/dists/fedora/phaethon.spec +++ b/dists/fedora/phaethon.spec @@ -28,7 +28,7 @@ BuildRequires: zlib-devel, libogg-devel, openal-soft-devel, libvorbis-devel BuildRequires: libxml2-devel, lzma-devel, libtool, gettext-devel BuildRequires: qt5-devel qt5-qtbase-devel -BuildRequires: qt5-qtbase-gui qt5-qtmultimedia-devel +BuildRequires: qt5-qtbase-gui # Boost dependencies. BuildRequires: boost-devel, boost-system, boost-filesystem, boost-atomic diff --git a/m4/ax_check_qt5.m4 b/m4/ax_check_qt5.m4 index 8d11242a..16e6f405 100644 --- a/m4/ax_check_qt5.m4 +++ b/m4/ax_check_qt5.m4 @@ -11,7 +11,7 @@ dnl @version 2017-02-02 dnl @license Creative Commons CC0 1.0 Universal Public Domain Dedication AC_DEFUN([AX_CHECK_QT5], [ - PKG_CHECK_MODULES([QT5], [Qt5Core >= $1 Qt5Gui >= $1 Qt5Widgets >= $1 Qt5Multimedia >= $1 Qt5Concurrent >= $1], [$2], [$3]) + PKG_CHECK_MODULES([QT5], [Qt5Core >= $1 Qt5Gui >= $1 Qt5Widgets >= $1 Qt5Concurrent >= $1], [$2], [$3]) # Qt5 needs -fPIC... QT5_CFLAGS="$QT5_CFLAGS -fPIC" diff --git a/src/gui/panelpreviewsound.cpp b/src/gui/panelpreviewsound.cpp index c168c452..cde7d416 100644 --- a/src/gui/panelpreviewsound.cpp +++ b/src/gui/panelpreviewsound.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "verdigris/wobjectimpl.h"