[patch] fix include and qml install paths and add mkspecs files

qtav-1.12.0-install_fixes.patch (text/plain), 2.16 KB, created by David Haller on 2020-01-13 03:39:00 UTC

diff -ub -x '*~' -purN a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch
--- a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch	1970-01-01 01:00:00.000000000 +0100
+++ b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch	2020-01-12 02:52:04.192331237 +0100
@@ -0,0 +1,17 @@
+diff -ub -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-06-21 03:47:15.000000000 +0200
++++ b/CMakeLists.txt	2020-01-12 02:51:41.692331365 +0100
+@@ -65,10 +65,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for
+ # Instruct CMake to run moc automatically when needed.
+ set(CMAKE_AUTOMOC ON)
+ if(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-  set(QTAV_INSTALL_HEADERS ${CMAKE_INSTALL_PREFIX}/include)
+-  set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/lib)
++  set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS})
++  set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+   set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin)
+-  set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml)
++  set(QTAV_INSTALL_QML ${QT_INSTALL_QML})
+ else()
+   set(CMAKE_INSTALL_PREFIX ${QT_INSTALL_PREFIX} CACHE PATH "default install path" FORCE)
+   set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS})
diff -ub -x '*~' -purN a/media-libs/qtav/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild
--- a/media-libs/qtav/qtav-1.12.0-r1.ebuild	2020-01-07 23:09:39.000000000 +0100
+++ b/media-libs/qtav/qtav-1.12.0-r1.ebuild	2020-01-12 02:52:21.612331139 +0100
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="QtAV"
 CAPI_HASH="b43aa93"
-inherit cmake
+inherit cmake qmake-utils
 
 DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
 HOMEPAGE="https://www.qtav.org"
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-installpaths.patch
 	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
 	"${FILESDIR}"/${P}-qt5.14.patch
 )
@@ -61,4 +61,12 @@ src_configure() {
 	)
 
 	cmake_src_configure
+	pushd tools/install_sdk >/dev/null
+	eqmake5
+	popd >/dev/null
+}
+
+src_install() {
+	cmake_src_install
+	emake -C tools/install_sdk INSTALL_ROOT="${ED}" install
 }