diff options
| author |   Gerion Entrup <gerion.entrup@flump.de> | 2021-01-14 14:40:35 +0100 |
|---|---|---|
| committer | Gerion Entrup <gerion.entrup@flump.de> | 2021-01-14 14:41:07 +0100 |
| commit | 0c00cbdcc1812c528f82e0b8bdb85460ddfa253b (patch) | |
| tree | df9a8bfb5d1fce17d1995f3dab5b13a37873f0e6 /media-plugins | |
| parent | media-plugins/hyperion: fix systemd service file (diff) | |
| download | gerislay-0c00cbdcc1812c528f82e0b8bdb85460ddfa253b.tar.gz gerislay-0c00cbdcc1812c528f82e0b8bdb85460ddfa253b.tar.bz2 gerislay-0c00cbdcc1812c528f82e0b8bdb85460ddfa253b.zip | |
media-plugins/hyperion: fix out-of-tree build
Signed-off-by: Gerion Entrup <gerion.entrup@flump.de>
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/hyperion/Manifest | 3 | ||||
| -rw-r--r-- | media-plugins/hyperion/files/0001-webserver-Cmake-fix-out-of-tree-build.patch | 43 | ||||
| -rw-r--r-- | media-plugins/hyperion/hyperion-9999.ebuild | 1 |
3 files changed, 46 insertions, 1 deletions
diff --git a/media-plugins/hyperion/Manifest b/media-plugins/hyperion/Manifest index e587053..aa2a64a 100644 --- a/media-plugins/hyperion/Manifest +++ b/media-plugins/hyperion/Manifest @@ -1,6 +1,7 @@ AUX 0001-CMake-prevent-lib-copies-for-package-creation.patch 1006 BLAKE2B a88281a4b39570be849daba0d9e84554f7177a9f32ab32dec277cb379f754648b0a386ed2d3aa0c99a456b642f8608893806fba2d16b0c039eadfc28386a6b5d SHA512 1e2d19de445b16df491133c18634d11b35460d3b11407b61006e4909d1a769cb6f2973a48eba8e7b564f3e1604ed76952aec6e3c9a30c2f816c930570287f35f AUX 0001-Cmake-fix-rpath.patch 1066 BLAKE2B 1ca9a013ef64c709464f709410f71cb9f5d72070d28c7d7e3c1c723964f8190eacd818a0efbf8fb05861508ca1745bcc28a8ef8941f754101dd96dc355dfdbe9 SHA512 5a7503f7d7f35a0fb5721899ab9ddae6ebf84a0e114da2a3f0ed13c942d4d2772eb8052efddd8cd03db6b06554a3d1da2790a828a143410d4d64be12d0c07e61 AUX 0001-Proto-fix-Error-macro-conflict.patch 2492 BLAKE2B f32a90de8092da740d44ea179b87bcc5580c61d9225deb3077888044cdc5a308db518bb19a267810e9909fc98a1cf1928624f9317c3601d3bb7b598a765697c6 SHA512 656a81d27ce088d99bd3b22eecceb2b51d382d500553a8eedcfdb726c051b37bcd9a0ad937e077298ef4ddc9973cc7eab94fdbb6a5f0eb94b4a9e67260cfcf0e +AUX 0001-webserver-Cmake-fix-out-of-tree-build.patch 1717 BLAKE2B e1215d9ee96a7eeb581d44996839ed010cfd5b78673199103fb918ea6fe9c4783f244e80542a00f9b9132f30abf30c15160b46978a7158e42f32f751261748b9 SHA512 8b363533a9c1600415008e7b3d0ab254cf5e250f9d16c6dbdc729199971d28a8bd699cd7b436c5d695a208062493459a6fcd7849368043ed8d3faaeea55b2d80 AUX hyperion.initd 465 BLAKE2B 32b0a8272f7b91aef3f02100d3a271f7ae569c24efe38ae1246b3bae5c39d51c6537d13664f482900de16bb012109c7594318116206cc3534b9a0e58ac3a062f SHA512 df1a0c5c0bca4585be5014807f280cbf3cd22298ef6feebcb9fc01bdf7b207186510aad7987bc49e3b0cf3d18dce05829ae3b3d4fc2969e38682ce9ec5a86998 -EBUILD hyperion-9999.ebuild 2677 BLAKE2B ddac48078288e8cfc8ec8e882bb28bbc1b90472cc01c049787ee5897b3bfe4b79cfb48f8b94fe3f855ad29ca6099a4deb209abbec386e6ba2ac0fcc1234e142f SHA512 ae91df23c9029196ccf39bf8367fd8a5e8a47dfdfb96b68ae900a45683518f5ccff65459778049cfdf960c1b98436cbc6cdca02b1096a1860b84f11e98eb22c4 +EBUILD hyperion-9999.ebuild 2741 BLAKE2B 0f0e3a36787743150c3dbc5f7ed392aa9cd81f917c4d64bcc387cd7c2c9d0403c47194ea2f7df7d695564603bb6148bc8d13ce9516e4661461400fcaada2bef9 SHA512 5f6c5556cd57d85d31fb0483b110db0b5d53fd8647cc33c7023b09229d005c935034bafdb79bcc8dd13d4e7f156f032df43bb7dce5a93953bcb392f68cfa2cf9 MISC metadata.xml 605 BLAKE2B cca61cdcb5dfa7ce9424cbd9551a1f0b6ad0ee5e09b24922d44860b797d34c90b4e16790f3b5bac278271cb909627c3b5eb1248b8e75d1aa1aa5a911554a1b3b SHA512 3e648db4b0063e5d53722f5a3859b52761655d950cf8c9f975190f44a63c9ce2451d3039b474515f9c3f6df7c8e7a0b7f7870468da988061eecc8de7090e212a diff --git a/media-plugins/hyperion/files/0001-webserver-Cmake-fix-out-of-tree-build.patch b/media-plugins/hyperion/files/0001-webserver-Cmake-fix-out-of-tree-build.patch new file mode 100644 index 0000000..9778c62 --- /dev/null +++ b/media-plugins/hyperion/files/0001-webserver-Cmake-fix-out-of-tree-build.patch @@ -0,0 +1,43 @@ +From 64a010a76a2fd36e933a6922e34b3b76920a352a Mon Sep 17 00:00:00 2001 +From: Gerion Entrup <gerion.entrup@flump.de> +Date: Thu, 14 Jan 2021 14:27:30 +0100 +Subject: [PATCH] webserver/Cmake: fix out-of-tree build + +When using a cmake directory that is not a subfolder of the repository +root folder the current path replacement logic for webresources does not +work. This commit makes the replacement pattern also relative to the +build directory. + +Reproduce with: +git clone hyperion-repo +mkdir build; cd build +cmake ../hyperion-repo + +Without this chance the build itself succeeds but browsing the +webinterface results in: +404 - Requested file: index.html + +Related: #834 +--- + libsrc/webserver/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libsrc/webserver/CMakeLists.txt b/libsrc/webserver/CMakeLists.txt +index 175df60e..3a6843dd 100644 +--- a/libsrc/webserver/CMakeLists.txt ++++ b/libsrc/webserver/CMakeLists.txt +@@ -5,9 +5,10 @@ set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/webserver) + + FILE ( GLOB WebConfig_SOURCES "${CURRENT_HEADER_DIR}/*.h" "${CURRENT_SOURCE_DIR}/*.h" "${CURRENT_SOURCE_DIR}/*.cpp" ) + FILE ( GLOB_RECURSE webFiles RELATIVE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/assets/webconfig/* ) ++FILE ( RELATIVE_PATH webConfigPath ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/assets/webconfig) + + FOREACH( f ${webFiles} ) +- STRING ( REPLACE "../assets/webconfig/" "" fname ${f}) ++ STRING ( REPLACE "${webConfigPath}/" "" fname ${f}) + SET(HYPERION_WEBCONFIG_RES "${HYPERION_WEBCONFIG_RES}\n\t\t<file alias=\"/webconfig/${fname}\">${f}</file>") + ENDFOREACH() + CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/WebConfig.qrc.in ${CMAKE_BINARY_DIR}/WebConfig.qrc ) +-- +2.26.2 + diff --git a/media-plugins/hyperion/hyperion-9999.ebuild b/media-plugins/hyperion/hyperion-9999.ebuild index c1e576c..b4c7a05 100644 --- a/media-plugins/hyperion/hyperion-9999.ebuild +++ b/media-plugins/hyperion/hyperion-9999.ebuild @@ -63,6 +63,7 @@ PATCHES=( "${FILESDIR}"/0001-Proto-fix-Error-macro-conflict.patch "${FILESDIR}"/0001-CMake-prevent-lib-copies-for-package-creation.patch "${FILESDIR}"/0001-Cmake-fix-rpath.patch + "${FILESDIR}"/0001-webserver-Cmake-fix-out-of-tree-build.patch ) src_configure() { |