Cleanup and version bumps

This commit is contained in:
Stefan Reimer 2019-09-10 09:26:07 +01:00
parent 313d738643
commit 0b08a52d96
4 changed files with 10 additions and 5878 deletions

View File

@ -1,2 +1,2 @@
DIST v1.3.1.tar.gz 642736 BLAKE2B e591d1ebba19caf0fb8de5ef54d36f037c52e3f74499d6b06b5f9232008e88dcb38798e3cd22a2720978118c8197c9091b940d4f6aa5f0cb1ebb8bef7d7c5e75 SHA512 cbb0618752dcf66798ea31477dc4592cc1a99693a578c9e7023260dcfbdf8e07b4b5a69e2b44c9d1969755288cb49ae66f4acc807cdb0f0d1d7b19a68c1b9dab DIST dxvk-1.3.4.tar.gz 648556 BLAKE2B 06106fbfac2c0a849ccdb611c5969fd60c328b6428658a87afbd0e42c780b4132b39a82fdab0887cf37957796503fcaf0ca54a1e54d273e4ddce537d99a99eb6 SHA512 4d13857f429725ec51034e05f00720a5bc2d1860acd9dbe9f0b4e77bfd219d301039ab92339c57834d90015f8f6bb40f593badfa02aaa81931c5ffd15bee65e3
EBUILD dxvk-1.3.1.ebuild 2078 BLAKE2B 4f728e9e522852c51a34a346189548721f59142ddf739e613c909b68f0e23a19b359e58a861cc4de7d4099440c24e8c62ac75825f9b8c03d7001450c2838f30a SHA512 c8b4d86fb25331d3e4531963e7ca2f736b5eee2f02cab7ea632d54f4bfd69da49f36dcc1ee92f9e86ffea249ba080e41dc1064f2a9c40b48f141ba2725366665 EBUILD dxvk-1.3.4.ebuild 2128 BLAKE2B 767f4daae863e87e3cf881e841ac3b7907264f86fd3aafb293ceca8fad6ae26d2d0754aa9dbbee0d2588b6be505b37abb35e6a6d77f297540a630296edbdc9c6 SHA512 414f8981d0b17af25be050281732f2d89e92bd32e24f427f39b8cb4b539b0ad442b64116612506e47181c39bd341868b29c13e850c85b3e1bb393e78c5e820d2

View File

@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/doitsujin/dxvk"
if [[ "${PV}" == "9999" ]]; then if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git" EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
else else
SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz" SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi fi
LICENSE="ZLIB" LICENSE="ZLIB"
@ -49,8 +49,8 @@ RDEPEND="
src_prepare() { src_prepare() {
default default
sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die sed -i "s|\"x64\"|\"usr/${LIBDIR_amd64}/dxvk\"|" setup_dxvk.sh || die
sed -i 's|"x32"|"usr/lib32/dxvk"|' setup_dxvk.sh || die sed -i "s|\"x32\"|\"usr/${LIBDIR_x86}/dxvk\"|" setup_dxvk.sh || die
if ! use abi_x86_64; then if ! use abi_x86_64; then
sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
@ -63,9 +63,10 @@ src_prepare() {
multilib_src_configure() { multilib_src_configure() {
local bit="${MULTILIB_ABI_FLAG:8:2}" local bit="${MULTILIB_ABI_FLAG:8:2}"
local emesonargs=( local emesonargs=(
--libdir=lib${bit}/dxvk --libdir=$(get_libdir)/dxvk
--bindir=lib${bit}/dxvk/bin --bindir=$(get_libdir)/dxvk/bin
--cross-file=../${P}/build-wine${bit}.txt --cross-file=../${P}/build-wine${bit}.txt
) )
meson_src_configure meson_src_configure

File diff suppressed because it is too large Load Diff

View File

@ -75,13 +75,8 @@ create_squashfs () {
customize () { customize () {
echo "Applying local customizations ..." echo "Applying local customizations ..."
# Reenable nvidia # Linphone
perl -i -p -e 's/^(app-admin\/conky nvidia|x11-drivers\/nvidia|nvidia|video_cards_nvidia|vdpau|cuda|opencl)/# disabled by update_portage.sh - $1/;' \ perl -i -p -e 's/^(net-voip\/linphone|net-libs\/libeXosip|net-libs\/libosip)/# disabled by update_portage.sh - $1/;' ${PORTAGE}/profiles/package.mask
${PORTAGE}/profiles/hardened/linux/package.mask \
${PORTAGE}/profiles/hardened/linux/amd64/package.mask \
${PORTAGE}/profiles/hardened/linux/use.mask \
${PORTAGE}/profiles/hardened/linux/amd64/use.mask \
${PORTAGE}/profiles/hardened/linux/amd64/package.use.mask
} }
cleanup () { cleanup () {