media-libs/amdvlk: quote S,D and T variables

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
This commit is contained in:
Andrew Ammerlaan
2020-04-11 22:31:55 +02:00
parent 1a60e3b6aa
commit 114edb092c

View File

@@ -61,16 +61,16 @@ ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> CWPack-${CWPACK_COMMIT}.t
###EBUILD FUNCTIONS ###EBUILD FUNCTIONS
src_prepare() { src_prepare() {
##moving src to proper directories ##moving src to proper directories
mkdir -p ${S} mkdir -p "${S}"
mkdir -p ${S}/third_party mkdir -p "${S}/third_party"
mv AMDVLK-${CORRECT_AMDVLK_PV}/ ${S}/AMDVLK mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK"
mv xgl-${XGL_COMMIT}/ ${S}/xgl mv xgl-${XGL_COMMIT}/ "${S}/xgl"
mv pal-${PAL_COMMIT}/ ${S}/pal mv pal-${PAL_COMMIT}/ "${S}/pal"
mv llpc-${LLPC_COMMIT}/ ${S}/llpc mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
mv spvgen-${SPVGEN_COMMIT}/ ${S}/spvgen mv spvgen-${SPVGEN_COMMIT}/ "${S}/spvgen"
mv llvm-project-${LLVM_PROJECT_COMMIT}/ ${S}/llvm-project mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
mv MetroHash-${METROHASH_COMMIT}/ ${S}/third_party/metrohash mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
mv CWPack-${CWPACK_COMMIT}/ ${S}/third_party/cwpack mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
##Installing rule ##Installing rule
cat << EOF > "${T}/10-amdvlk-dri3.conf" || die cat << EOF > "${T}/10-amdvlk-dri3.conf" || die
Section "Device" Section "Device"
@@ -78,7 +78,7 @@ Identifier "AMDgpu"
Option "DRI" "3" Option "DRI" "3"
EndSection EndSection
EOF EOF
cd ${S}/xgl cd "${S}/xgl"
default default
} }
@@ -87,27 +87,27 @@ multilib_src_configure() {
-DBUILD_WAYLAND_SUPPORT=$(usex wayland ) \ -DBUILD_WAYLAND_SUPPORT=$(usex wayland ) \
-DCMAKE_BUILD_TYPE="$(usex debug "Debug" "Release")" \ -DCMAKE_BUILD_TYPE="$(usex debug "Debug" "Release")" \
-B${BUILD_DIR} ) -B${BUILD_DIR} )
cd ${S}/xgl cd "${S}"/xgl
cmake -H. "${mycmakeargs[@]}" cmake -H. "${mycmakeargs[@]}"
} }
multilib_src_install() { multilib_src_install() {
if use abi_x86_64 && multilib_is_native_abi; then if use abi_x86_64 && multilib_is_native_abi; then
mkdir -p ${D}/usr/lib64/ mkdir -p "${D}/usr/lib64/"
mv "${BUILD_DIR}/icd/amdvlk64.so" ${D}/usr/lib64/ mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/"
insinto /usr/share/vulkan/icd.d insinto /usr/share/vulkan/icd.d
doins ${S}/AMDVLK/json/Redhat/amd_icd64.json doins "${S}/AMDVLK/json/Redhat/amd_icd64.json"
else else
mkdir -p ${D}/usr/lib/ mkdir -p "${D}/usr/lib/"
mv "${BUILD_DIR}/icd/amdvlk32.so" ${D}/usr/lib/ mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/"
insinto /usr/share/vulkan/icd.d insinto /usr/share/vulkan/icd.d
doins ${S}/AMDVLK/json/Redhat/amd_icd32.json doins "${S}/AMDVLK/json/Redhat/amd_icd32.json"
fi fi
} }
multilib_src_install_all() { multilib_src_install_all() {
insinto /usr/share/X11/xorg.conf.d/ insinto /usr/share/X11/xorg.conf.d/
doins ${T}/10-amdvlk-dri3.conf doins "${T}/10-amdvlk-dri3.conf"
einfo "AMDVLK requires DRI3 mode so config file is istalled in /usr/share/X11/xorg.conf.d/10-amdvlk-dri3.conf" einfo "AMDVLK requires DRI3 mode so config file is istalled in /usr/share/X11/xorg.conf.d/10-amdvlk-dri3.conf"
einfo "It's safe to double xorg configuration files if you have already had ones" einfo "It's safe to double xorg configuration files if you have already had ones"
} }