#update resolve

This commit is contained in:
Mario Fetka 2024-06-19 07:54:12 +02:00
parent 20ef8b5c88
commit 0f2e4f52f5
18 changed files with 208 additions and 522 deletions

View File

@ -1,4 +0,0 @@
DIST bottles-51.5.tar.gz 2168592 BLAKE2B 5aee4a6db1f066cfed10262e7af5ec8ec3416583d92095c69e5bc9c8f0c17f083c2eee44dedf79b2405f442e7433b58209cb1b73f47a95ed51aacb24115c54b1 SHA512 5d238d62053d2bdb6ba17cc0e2903b45c9c87f08b0d737264a4d1efa7e10ca9d77fc722333ae91ad4929a5b742a628692601dcc915d4553815d1361d1a0a110e
EBUILD bottles-51.5.ebuild 3276 BLAKE2B 3787223141e58e3c001491034ed01467c0fcfa2efedf4a7429f1f3d86cd5013b6fa41fea7f94a9319864ce5d6537fdd92594764fdc55b1565ecc97b25b2f7643 SHA512 dba16516eeb7fe0ec5bd957ea4472b9f582c7e3f89bcabf005f06f84284c06cb2451276e49fd7ea9c20c6f981e6abf3c0ae8257fdfddbc3752e19c4cbe4deec8
EBUILD bottles-9999.ebuild 3276 BLAKE2B 3787223141e58e3c001491034ed01467c0fcfa2efedf4a7429f1f3d86cd5013b6fa41fea7f94a9319864ce5d6537fdd92594764fdc55b1565ecc97b25b2f7643 SHA512 dba16516eeb7fe0ec5bd957ea4472b9f582c7e3f89bcabf005f06f84284c06cb2451276e49fd7ea9c20c6f981e6abf3c0ae8257fdfddbc3752e19c4cbe4deec8
MISC metadata.xml 361 BLAKE2B 2e06ad1de23d0a780764bb124bec58dd093ba76d4d4e006355b1edf74b7c7f5f6e272fb6b48f3e787b6afc4037b0477d02b8892dd489370fa5296e3be6ba4d96 SHA512 cd61671bca61241c488f88996f2585c177759e762da1181b70816fc886b54d0d52b02af5421ed8f10f5ce0abc32d2b7de106efd48c39e466104483d379ecc637

View File

@ -1,120 +0,0 @@
# Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# todo patool, icoextract
PYTHON_COMPAT=( python3_{9..12} )
inherit gnome2-utils python-single-r1 meson xdg optfeature
DESCRIPTION="Run Windows software and games on Linux"
HOMEPAGE="https://usebottles.com/"
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
else
SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Bottles-${PV}"
KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# tests are quite pointless as they check static files and releases are tagged with them still failing
RESTRICT="test"
# Very annoying to figure out the deps
# Script for getting python modules:
# https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
# Runtime programs needed can be quickly found with:
# grep -r "shutil.which"
# But look at context to gauge if they are optional or not
#
# BDPEPEND dependencies can be thankfully gathered from the meson.build files
# DEPEND are instrospection files which can be found as such
# find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
# grep -r "gi.require_version
# vkbasalt could be optional but vkbasalt-cli isnt
# It could work without wine but(!) it still requires all the runtime dependencies for wine
# so easier to depend on wine to get it for free
DEPEND="
gui-libs/gtk:4[introspection]
gui-libs/libadwaita[introspection]
"
RDEPEND="
${PYTHON_DEPS}
${DEPEND}
app-arch/cabextract
app-arch/p7zip
gui-libs/gtksourceview[introspection]
media-gfx/imagemagick
>=sys-libs/glibc-2.32
virtual/wine
x11-apps/xdpyinfo
$(python_gen_cond_dep '
app-arch/patool[${PYTHON_USEDEP}]
dev-python/FVS[${PYTHON_USEDEP}]
dev-python/pygobject[${PYTHON_USEDEP}]
dev-python/icoextract[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}]
dev-python/orjson[${PYTHON_USEDEP}]
dev-python/pathvalidate[${PYTHON_USEDEP}]
dev-python/pefile[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
')
"
BDEPEND="
${PYTHON_DEPS}
dev-util/blueprint-compiler
dev-libs/glib:2
sys-devel/gettext
test? (
dev-libs/appstream
dev-libs/glib
dev-util/desktop-file-utils
)
"
pkg_setup() {
python-single-r1_pkg_setup
}
src_configure() {
if [[ "${PV}" == "9999" ]]; then
local emesonargs=(
-Ddevel=true
)
fi
meson_src_configure
}
src_install() {
meson_src_install
python_optimize "${D}/usr/share/bottles/"
python_fix_shebang "${D}/usr/"
}
pkg_preinst() {
xdg_pkg_preinst
gnome2_schemas_savelist
}
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
optfeature "gamemode support" games-util/gamemode
optfeature "gamescope support" games-util/gamescope
optfeature "vmtouch support" dev-utils/vmtouch
#optfeature "MangoHub support" games-util/mangohub
#optfeature "obs-vkcapture support" media-video/obs-vkcapture
}

View File

@ -1 +0,0 @@
bottles-51.5.ebuild

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>xgqt@protonmail.com</email>
<name>Maciej Barć</name>
</maintainer>
<upstream>
<remote-id type="github">bottlesdevs/Bottles</remote-id>
</upstream>
</pkgmetadata>

View File

@ -15,4 +15,5 @@ AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553
DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
DIST virtualbox-help-7.0.18.tar.xz 3948116 BLAKE2B 5715a7e609297387b5fccce0951c62e5969fd68adeecb869712e69f5e90daef97384bd3ff3c39de40903a1fabe7ac6d2f8ecdbb40de16abe955d40e49b962eec SHA512 ec0f915b7221bc40d02f5f1675eb0defb5506b2f2bd96c063a96a9346e1c82428ccdda8b3adac43238c451ae185ac31af4a186da17ffe091469e14e696388b3a
DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
EBUILD virtualbox-7.0.18-r1.ebuild 20831 BLAKE2B 8ad95eb19a05980338b3a5ecde970f39210f818ea556410ca2d88274a8d000182bf1a5d0d84eee1b6f666b74faac071dff5becfcff4e463a670086f4e2c40976 SHA512 b1e88b396167dc5df0ba1567b702c7cb8a4a17f16dd479b5554fcab5a33298ab3fe2e2e3ac8c9f2b4de4fc82924d6457edf8574ad2421b9cb94cabb3b34bfc73
EBUILD virtualbox-7.0.18-r1.ebuild 20842 BLAKE2B c80bd4f4694272cbb06eae6d317dbc64c765834856cd86f5fd323d279354346c7df9f81c86e7111951957299ff4bbcb1579477a973cab68fa88a60a25018c3d9 SHA512 68cfaac8a5ee39f435999e692bca486930dc0fe20232087a9937e4408dc067ea04b180f4b8e79e1fc10c6b80c613904d9d45921800fefa48bcfb30bc25100038
MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9

View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ceamac@gentoo.org</email>
<name>Viorel Munteanu</name>
</maintainer>
<use>
<flag name="dtrace">Install dtrace Extension Pack.</flag>
<flag name="headless">Build without any graphic frontend.</flag>
<flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
<flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
<flag name="sdk">Enable building of SDK.</flag>
<flag name="udev">Controls installation of special USB udev rules.</flag>
<flag name="vboxwebsrv">Build and install the VirtualBox webservice.</flag>
<flag name="vde">Support for VDE networking via <pkg>net-misc/vde</pkg>.</flag>
<flag name="vmmraw">Enable 32-bit support on a 64-bit kernel.</flag>
</use>
</pkgmetadata>

View File

@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64"
KEYWORDS="amd64"
IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc"
unset WATCOM #856769
@ -125,7 +125,6 @@ RDEPEND="
java? ( virtual/jre:1.8 )
"
BDEPEND="
${PYTHON_DEPS}
>=app-arch/tar-1.34-r2
>=dev-lang/yasm-0.6.2
dev-libs/libIDL
@ -150,6 +149,7 @@ BDEPEND="
gui? ( dev-qt/linguist-tools:5 )
nls? ( dev-qt/linguist-tools:5 )
java? ( virtual/jdk:1.8 )
python? ( ${PYTHON_DEPS} )
"
QA_FLAGS_IGNORED="

View File

@ -1,9 +0,0 @@
AUX wxpython-4.2.0-cython-3.patch 621 BLAKE2B 047940edf05ba1556c8e3b7ee5f55dd1c31ebe6fbb249b40a4e0a70a3d8de7425c562e3e65ebba61da10e5f077b54b9e914d09b9b4d715d7164d92059c6c25b5 SHA512 1f99e75cc2a50f2de54312cfd148095f89e9ae1b0d110e750a73887bc66982c569bc2cf3e6f0dff3a717f5bdbe20a883cbc2ae381589de116b6bf3d053b9ab08
AUX wxpython-4.2.0-flags.patch 711 BLAKE2B d05ee176b010199f32ba4325452d7eddb60b78e80e2d80421223c061f33f3edf2d84528eac4d50acbf85af532f6fdfd6fb3cda2c8d97525cce5f66a0dd5c6891 SHA512 ac9c04b086af69d1bd7ce7ff6d9b87b8f6cf5c5273ada18089247f1f951f32009d181ff24758c01f1954183dcbf20fb0bce7501346cc615a18b4f43f2831c7bb
AUX wxpython-4.2.0-no-attrdict.patch 363 BLAKE2B 2ab3735103574959e069ecd647dc003ad6362760214a67632c91a7d216a372b4bf13450a7420bb8415bd744cac23a514726bf6feb09302b775a2a4c580094599 SHA512 b410023d186db3b07b3780fad2e1037d5a854f10771a5e1c8cd98da91a36e727931bf75944ff1a56e0730ff78a4ec8c9a3d81dec02efa3fe91191ad0a1639859
AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b34b745cfefd3938be1f22c810cb1bc4273d628aa34cf427c1023d90739784d8e5c8d381e6084689876bdc336a86a3d0db SHA512 fbe6825f266443b9dec68786e26d6e3842d4dec3b9927420ecaca45a834798c8ef83a95398ea498db386e7d1c659a6a3779a5b62867296cc7244401b06db9586
DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
EBUILD wxpython-4.2.0.ebuild 3924 BLAKE2B aedc834c6dd6af3ebd3d8bee6ed9a2a70c14578e1bce323766d5d365d83e2605e0c113005582b3ab989b77befcfeed9c97eafcfeb67f8f8f3cbae53391816770 SHA512 0c034372126a258992c52eac33a5680be316020b0b0474eaa1c7eea61e6020e6f0159aeed94da8aa45152860238531b6fc7fdfa6bce1b231dbe95bf3b50dfdb3
EBUILD wxpython-4.2.1.ebuild 3531 BLAKE2B 9cd940fe1b72952e73f3426be744da529880ea8bb09ceb856a21bb88e7439d945fd690976e47ffcea33c7ea17297d8e3b07622d0c563ca1a2d5ced75ace19e6c SHA512 4773f1bbc9ddfa99b07a1f7e8e1e417500fda09034d11113833bfaea8b7f9877ba491985bdeb6d0de3a98ca4aed08e68c957ab9f12023d0831de3c2d1799c698
MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa

View File

@ -1,19 +0,0 @@
https://bugs.gentoo.org/911703
https://github.com/wxWidgets/Phoenix/pull/2441
From aeb557d01e7cd37176ebbf0f1ae6d0b53c115378 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Tue, 25 Jul 2023 12:42:32 -0400
Subject: [PATCH] Fix compatibility with Cython 3.0.0
Remove unused import which seems to be removed in Cython 3.
--- a/wx/svg/_nanosvg.pyx
+++ b/wx/svg/_nanosvg.pyx
@@ -42,7 +42,6 @@ for manipulating the SVG shape info in memory.
import sys
-cimport cython.object
from cpython.buffer cimport (
Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE,
PyBuffer_Release)

View File

@ -1,16 +0,0 @@
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -236,9 +236,12 @@ class Configuration(object):
for lst in [self.cflags, self.cxxflags]:
lst.append('-O3')
+ self.cflags += os.environ.get('CFLAGS', '').split()
+ self.cxxflags += os.environ.get('CXXFLAGS', '').split()
+
lflags = self.getWxConfigValue('--libs')
self.MONOLITHIC = (lflags.find("_xrc") == -1)
- self.lflags = lflags.split()
+ self.lflags = lflags.split() + os.environ.get('LDFLAGS', '').split()
self.WXBASENAME = self.getWxConfigValue('--basename')
self.WXRELEASE = self.getWxConfigValue('--release')

View File

@ -1,13 +0,0 @@
As in https://src.fedoraproject.org/rpms/python-wxpython4/raw/rawhide/f/no-attrdict.patch.
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -27,8 +27,6 @@ from distutils.dep_util import newer
import distutils.sysconfig
-from attrdict import AttrDict
-
runSilently = False
#----------------------------------------------------------------------

View File

@ -1,27 +0,0 @@
--- a/wscript
+++ b/wscript
@@ -244,15 +244,6 @@
uselib_store='WXGL', mandatory=True,
msg='Finding libs for WXGL')
- if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
- wv_libs = '--libs webview,core,net'
- else:
- wv_libs = '--libs core,net'
- conf.check_cfg(path=conf.options.wx_config, package='',
- args='--cxxflags ' + wv_libs + rpath,
- uselib_store='WXWEBVIEW', mandatory=True,
- msg='Finding libs for WXWEBVIEW')
-
conf.check_cfg(path=conf.options.wx_config, package='',
args='--cxxflags --libs xml,core,net' + rpath,
uselib_store='WXXML', mandatory=True,
@@ -600,7 +591,6 @@
makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC')
makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML')
makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL')
- makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW')
makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML')
makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC')
makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT')

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>wxwidgets@gentoo.org</email>
<name>Gentoo wxWidgets Project</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<upstream>
<remote-id type="github">wxWidgets/Phoenix</remote-id>
<remote-id type="pypi">wxPython</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,123 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_IN_SOURCE_BUILD="1"
PYTHON_COMPAT=( python3_{10..12} )
PYPI_NO_NORMALIZE=1
PYPI_PN="wxPython"
WX_GTK_VER="3.2-gtk3"
inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
DESCRIPTION="A blending of the wxWindows C++ class library with Python"
HOMEPAGE="https://www.wxpython.org/"
LICENSE="wxWinLL-3"
SLOT="4.0"
KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="test webkit"
# Tests broken: #726812, #722716
# Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
RESTRICT="!test? ( test ) test"
# wxPython doesn't seem to be able to optionally disable features. webkit is
# optionally patched out because it's so huge, but other elements are not,
# which makes us have to require all features from wxGTK
RDEPEND="
>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
media-libs/libpng:=
media-libs/tiff:=
media-libs/libjpeg-turbo:=
"
DEPEND="${RDEPEND}"
BDEPEND="
app-text/doxygen
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
test? (
${VIRTUALX_DEPEND}
dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)
"
PATCHES=(
#"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
"${FILESDIR}/${PN}-4.2.0-no-attrdict.patch"
"${FILESDIR}/${PN}-4.2.0-flags.patch"
"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
)
python_prepare_all() {
if ! use webkit; then
eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
rm unittests/test_webview.py || die
fi
# Most of these tests disabled below fail because of the virtx/portage
# environment, but some fail for unknown reasons.
rm unittests/test_uiaction.py \
unittests/test_notifmsg.py \
unittests/test_mousemanager.py \
unittests/test_display.py \
unittests/test_pi_import.py \
unittests/test_lib_agw_thumbnailctrl.py \
unittests/test_sound.py || die
distutils-r1_python_prepare_all
}
src_configure() {
setup-wxwidgets
}
python_compile() {
DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die
# Refresh the bundled/pregenerated sip files
${PYTHON} build.py sip || die
# Build the bindings
${PYTHON} build.py build_py \
--use_syswx \
--no_magic \
--jobs="$(makeopts_jobs)" \
--verbose \
--release || die
}
python_test() {
EPYTEST_DESELECT=(
# Aborts, needs investigation
unittests/test_utils.py::utils_Tests::test_utilsSomeOtherStuff
# Failures, need investigation
unittests/test_frame.py::frame_Tests::test_frameRestore
unittests/test_fswatcher.py::fswatcher_Tests::test_fswatcher1
unittests/test_intl.py::intl_Tests::test_intlGetString
unittests/test_lib_busy.py::lib_busy_Tests::test_lib_busy5
unittests/test_lib_mixins_inspection.py::wit_TestCase::test_App_OnInit
unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
unittests/test_lib_pubsub_topicmgr.py::lib_pubsub_TopicMgr2_GetOrCreate_DefnProv::test20_UseProvider
unittests/test_windowid.py::IdManagerTest::test_newIdRef03
unittests/test_auibook.py::auibook_Tests::test_auibook02
unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerPersistValue
unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
unittests/test_auiframemanager.py::auiframemanager_Tests::test_auiframemanager02
)
# We use pytest-forked as opensuse does to avoid tests corrupting each
# other.
virtx epytest --forked -n "$(makeopts_jobs)" unittests
}
python_install() {
distutils-r1_python_install --skip-build
}

View File

@ -1,126 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_EXT=1
DISTUTILS_IN_SOURCE_BUILD="1"
PYTHON_COMPAT=( python3_{10..12} )
PYPI_NO_NORMALIZE=1
PYPI_PN="wxPython"
WX_GTK_VER="3.2-gtk3"
inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
DESCRIPTION="A blending of the wxWindows C++ class library with Python"
HOMEPAGE="
https://www.wxpython.org/
https://github.com/wxWidgets/Phoenix/
https://pypi.org/project/wxPython/
"
LICENSE="wxWinLL-3"
SLOT="4.0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
IUSE="test webkit"
RESTRICT="!test? ( test )"
# wxPython doesn't seem to be able to optionally disable features. webkit is
# optionally patched out because it's so huge, but other elements are not,
# which makes us have to require all features from wxGTK
DEPEND="
>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
media-libs/libpng:=
media-libs/tiff:=
media-libs/libjpeg-turbo:=
"
RDEPEND="
${DEPEND}
"
BDEPEND="
app-text/doxygen
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
test? (
${VIRTUALX_DEPEND}
dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
PATCHES=(
"${FILESDIR}/${PN}-4.2.0-flags.patch"
"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
)
python_prepare_all() {
if ! use webkit; then
eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
fi
distutils-r1_python_prepare_all
}
src_configure() {
setup-wxwidgets
}
python_compile() {
DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die
# Refresh the bundled/pregenerated sip files
"${EPYTHON}" build.py sip || die
# Build the bindings
"${EPYTHON}" build.py build_py \
--use_syswx \
--no_magic \
--jobs="$(makeopts_jobs)" \
--verbose \
--release || die
}
python_test() {
local EPYTEST_DESELECT=(
# virtx probably
unittests/test_display.py::display_Tests::test_display
unittests/test_frame.py::frame_Tests::test_frameRestore
unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1
unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar
unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp
unittests/test_uiaction.py::uiaction_MouseTests
# assertion (TODO)
unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor
# seems to rely on state from a previous test (sigh)
unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
# requires Spanish localization
unittests/test_intl.py::intl_Tests::test_intlGetString
# TODO
unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor
unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
unittests/test_windowid.py::IdManagerTest::test_newIdRef03
)
local EPYTEST_IGNORE=()
if ! use webkit; then
EPYTEST_IGNORE+=( unittests/test_webview.py )
fi
# We use pytest-forked as opensuse does to avoid tests corrupting each
# other.
virtx epytest --forked -n "$(makeopts_jobs)" unittests
}
python_install() {
distutils-r1_python_install --skip-build
}

View File

@ -1,17 +1,20 @@
AUX makeresolvedeb_gentoo_1.6.0.patch 3462 BLAKE2B 8072b571bc370b9f0c7b3b62504c9b48f1dbda6e661e60082178244afd9c91e8e969f7d667e70a690066e4cb76c1d7c2425dbd781c5d3815e02663274be1eb07 SHA512 3cb9f7ba8b9a68dced129511e51f1842d81df77cbc98b4ad9b9f4e830d451ad0e8ece2d1dbadf1af636e5202f960b62331478de71466f19706c297ba847be9b8
AUX makeresolvedeb_gentoo_1.6.4.patch 3082 BLAKE2B 8745b0117c8882c5175e331a21bcc2603c189db85aaeb00e7c6d4b7e49bfcf58e4ab4ca364a7fd2e51b1078e6a5f7e7f09be794c5759250c05e4056e947ce071 SHA512 eabff75c6344aa8f1a8e2cb9c2310ded387425d11f57c814b1bd4db6a7d75613d3e8e6bc1e9585af2aca07eed23912e1187ff838059feb79d382d772e7e38267
AUX makeresolvedeb_gentoo_1.7.1.patch 3082 BLAKE2B 8745b0117c8882c5175e331a21bcc2603c189db85aaeb00e7c6d4b7e49bfcf58e4ab4ca364a7fd2e51b1078e6a5f7e7f09be794c5759250c05e4056e947ce071 SHA512 eabff75c6344aa8f1a8e2cb9c2310ded387425d11f57c814b1bd4db6a7d75613d3e8e6bc1e9585af2aca07eed23912e1187ff838059feb79d382d772e7e38267
AUX makeresolvedeb_gentoo_1.7.1.patch 4017 BLAKE2B afc88a452565f045b01d262874b3594923f25c18641f41c881344a82522ef86fe6d6e6defddcc117be29438ca02badb20e71a8605433405eb9f6987317ddcdf0 SHA512 19917afbc2e14b8f399e3005823f74df0d5d537b0dc195fc39e19ed8e429b88184409ffd27e8b026cd6baf783cd860ca290e7758bc8a10b6dfcaed16ba1292f3
DIST DaVinci_Resolve_17.4.6_Linux.zip 2340066824 BLAKE2B 6e87a65f6657a8e9bd5cbcecb62b6dd74b45e4a8d6ae0d6e2aca6643d669a8aa49736e21e9826518897adbbf2d7f36d26bec402424158e4cb232560ab0c7ecdf SHA512 5067737e66d355d28aed34a5ff810ce552c6e8f07b9fcf1935cc7b2bfc65054de67e1a53c68560f58a60e3d63078bc47cba2c4257d0afaa3d76bfc50840a1409
DIST DaVinci_Resolve_18.1.4_Linux.zip 3185181538 BLAKE2B d27e829c0e740ca9791029f387160592463133418c2ccf5b6bfaf485e7ec2bf45b1e17a5eb51955c067858d987879bc42325c25738ecf4c7b80ddd1701c336ea SHA512 bba889e818051fc22190f671468c48ebe8fe8a802af37ada0314c255510e5e2fc22dc69e409772e79b8e90f259274d298451f3a2df4f3048428f2022d4e8f6c4
DIST DaVinci_Resolve_18.5_Linux.zip 2565526748 BLAKE2B daaf338fdfc911a141f88657d66868835cc5028576e67d9b6f27f6dbd5efd10a0d3196440e6838113797e2e84f8a1f92aeb8b9d1e5837dfa542924d2a593cadf SHA512 eed54f8cd4cac06e17117c41bb8dff0185e51b3eb7050cad0a965c2d3dde023f0818c8d423da6bd0f1a2863dbf37095a7e3f127fddc1ba83a3f7bbdc997af13b
DIST DaVinci_Resolve_18.6.5_Linux.zip 2596330483 BLAKE2B 2b9e51522bf4da6b9ce38001c5a5c77d5d05fccd090a50b5d8371d8e96011c789c1e5fa38dd68e5d453b1cf3489972b27ed2649ef865bd0b5a80f5ba23903a1d SHA512 756b77e3e36a9b4f233f9d3ec04d053b30b86aad924aa73bcafd6162d12d42412b8da6cec4e4830dea4874e809544fd40ab51715476bbcdda5c5e242154935e4
DIST DaVinci_Resolve_18.6.6_Linux.zip 2596581675 BLAKE2B d366b57810472811b2706b742ae62a7ecbd7ebad0bed73083b4e541346551fe4770583674376e791ee77e125052378236edbc356473c624fb8904fb7115605fa SHA512 c426393e5214a1523578a4d04636a70fe203318d47d23d00c26a6aabd550b6f1bdf187506b1804fb3939f950fffe4d8d9f908ed0ffaf6fd13b94fe2b97f384c6
DIST DaVinci_Resolve_19.0b3_Linux.zip 2729752767 BLAKE2B 11eb89875337800568a1df0e49d60fcc9fd0cc034e30440a204c56ecb0c1519fa6a8db5d9109c673ec060322e862336c2fd3f5cca248cd12378062a14ff7820f SHA512 aa393897230e0b23d961dc4487409ed72b77111030db6b43035db40897081c490de67ae30c41d51ddcf95a374564f5bdf25ced8aedebfa5b14aefe82ea58b043
DIST makeresolvedeb_1.6.0_multi.sh.tar.gz 4191 BLAKE2B ab2f09f339700ee31e011811152c6b97cc7e172698236efba0c0254cf69966c776dd222302e1da0266423f0af9c54ae426de4f5354d0d4550ae89b354f0a3d7a SHA512 02baae42c1e9d2163660b765ee6556660b337a3dfe25a60ee4bad9331d84700538ff9b339d045dd91cc0d89d1cd805e56437ae3a8d6ddf6502d0be0f0e5bc114
DIST makeresolvedeb_1.6.4_multi.sh.tar.gz 4338 BLAKE2B f3bab11a08432e765645e314e1906c677db5b4e321a477856d4bea6439af860c4037314d2f12200a8a227c6a36b940425688d556c312d165a77f04d6c4513cde SHA512 3e11bef55bce1947422b8f204987b5aabb645121f29f416050d73b569cb04105107ffc63a88443e795fca7eca5f022401a6c575ad1ae3311158483d6691398ce
DIST makeresolvedeb_1.7.1_multi.sh.tar.gz 4974 BLAKE2B dda1e77d88ec8c9065f4b26bc275f560ea147a3274540ae6ead10be35ce432904d4a4ef8ae69548bc88b44a628060f86cca5508477a100f1809a5f091ef0e137 SHA512 1cfcc1fc9b39dfb0424465453756c9f192d34bdfb046e4bad035bd1b516747bb04d1f2081d18d40da334a893d964e496cfab943f1262344a26926dffaf5f0a2a
EBUILD davinci-resolve-17.4.6.ebuild 2467 BLAKE2B fb9de7cd7a13482dcfe42f8e6823179daf144c72d4b8a8024b5aa5f502288862848dacc52bbe40f565f91c04dc991aaf02d5a0ef95e9ac626847f95ffbb16780 SHA512 dbc71120a6131aac4eeb7ab48a67ec153fb9a38316ce38a581fd99cae7f7479daa08b1afc3a88a208fc7c034b13df87fab0c7b104219f391e74fec2ab39781c7
EBUILD davinci-resolve-18.1.4.ebuild 2676 BLAKE2B 9e5d0fe3f172f4ac1a66f669fac95ce2c29803188eecc4b5e21e5044fb2403e48726d82d44440b64447aa7a3165a43984f1a1cc3836618d2aa93f631eb7a5c63 SHA512 04a11cf5f04926bfdf0446dfa0ce6223034d05e9ee8ffb63bbcc3ef37d2db5f50060acfd309c39aab6cebe5fe21c55d9d4f88c5a0d6eb80c1a3ffef812bde508
EBUILD davinci-resolve-18.5.ebuild 2704 BLAKE2B 55d5d8f34e7423acc8281aedb15b8210a0cc6246e061f8e4de3f7ecc5e35ccda2fc176fb0b4f4e74c62086108c55d6becf358a1c2db8e771052afb52a9269047 SHA512 b7def9977ed812b485d7dec598df4d673cc08ec1be39b5f488f167d86505fba12fd894170c26890614908ed36d1ae2c30a0a7bbd2091a3552182b538a8592695
EBUILD davinci-resolve-18.6.5.ebuild 2848 BLAKE2B b73ead231f3a99b514b3c757dc564046685b35d9364bf489e3a10f04d5a356e2d94b11460b67fb0731644cab79cfbbe3519388a439f49fc957719d163d5015e4 SHA512 dbfcfebaa24fce51cae81bc73b9c51fd9682a5489aaf00768a939226df0489acd5c55b34cf5a8fe40bf186c9eb6c6a6eb06f64106e8396ee32c099774aa430a8
EBUILD davinci-resolve-18.6.6.ebuild 2948 BLAKE2B 0a229f5f4b209286a89252ffe015357bb2a997d79594d5b1fba82ee9c624d6e16b0406eafe6d26c4936d173f939e8bf273338623a20251fe7acb46ff70fbebdb SHA512 24f8417e2d3618afe1f7909ac67c5c8831ebceb6705f0ba9fead7a6b69ebaba9634548054ace527a048b37841dadfd1803140042c323a7b7afee41375445f88d
EBUILD davinci-resolve-19.0_beta3.ebuild 2948 BLAKE2B fe0ce49f81b8875be46115e9e90a68ad8fa975b15073606748c1030fcc495c408199f4822fadeca3ba4c44adcbb58949c9cfd8c88065c4cfa9e74128ed09e5bf SHA512 728b482be0f95ff57a401d1eb8806a1c85d5ebfe8b4430f8f63a483fec9b081558931eff07c9e77fe35a56ce6a39c8440d2ab5fc8bd4d74e4d2840b975d8474f
MISC ChangeLog 984 BLAKE2B 6b5afde0d34caa62f7a6e336c651652380e9144d8c3382dcca2ee680b85724d93deca09c903565ccd79987d39ed61c517f1a5e717f37d3b00d24ac95c038edf3 SHA512 8110c143fd18310b7f12b9eb575f5179a574f0941bf1d6978c96ff4887289ecabfc4c3ab5fb4a9125d9b9d5e65d9d430ebc349965b925ba0bd35cf86466badba
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -0,0 +1,135 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
#MAJOR_VER="$(ver_cut 1-3)"
MAJOR_VER="19.0b3"
if [[ "${PN}" == "davinci-resolve-studio" ]] ; then
BASE_NAME="DaVinci_Resolve_Studio_${MAJOR_VER}_Linux"
CONFLICT_PKG="!!media-video/davinci-resolve"
else
BASE_NAME="DaVinci_Resolve_${MAJOR_VER}_Linux"
CONFLICT_PKG="!!media-video/davinci-resolve-studio"
fi
ARC_NAME="${BASE_NAME}.zip"
MRD_VER=1.7.1
inherit udev xdg
DESCRIPTION="Professional A/V post-production software suite"
HOMEPAGE="
https://www.blackmagicdesign.com/support/family/davinci-resolve-and-fusion
"
SRC_URI="${ARC_NAME}
https://www.danieltufvesson.com/download/?file=makeresolvedeb/makeresolvedeb_${MRD_VER}_multi.sh.tar.gz"
LICENSE="all-rights-reserved"
KEYWORDS="-* ~amd64"
SLOT="0"
IUSE="doc udev +system-glib"
RESTRICT="strip mirror bindist fetch userpriv"
RDEPEND="
virtual/glu
x11-libs/gtk+:=
virtual/libcrypt:=
${CONFLICT_PKG}
"
DEPEND="
dev-libs/apr-util
app-arch/libarchive
dev-libs/openssl-compat
dev-qt/qtcore:5
dev-qt/qtsvg:5
dev-qt/qtwebengine:5
dev-qt/qtwebsockets:5
dev-qt/qtvirtualkeyboard:5
media-libs/gstreamer
media-libs/libpng
sys-fs/fuse[suid]
udev? ( virtual/udev )
virtual/opencl
x11-misc/xdg-user-dirs
${RDEPEND}
"
BDEPEND="dev-util/patchelf"
S="${WORKDIR}"
DR="${WORKDIR}/davinci-resolve_${MAJOR_VER}-mrd${MRD_VER}_amd64"
QA_PREBUILT="*"
pkg_nofetch() {
einfo "Please download installation file"
einfo " - ${ARC_NAME}"
einfo "from ${HOMEPAGE} and place it in \$\{DISTDIR\}."
einfo "===="
einfo "Please download installation file"
einfo " - makeresolvedeb_${MRD_VER}_multi.sh.tar.gz"
einfo "from https://www.danieltufvesson.com/makeresolvedeb and place it in \$\{DISTDIR\}."
}
src_prepare() {
mv "${WORKDIR}"/makeresolvedeb*.sh "${WORKDIR}"/makeresolvedeb.sh
eapply -p0 "${FILESDIR}/makeresolvedeb_gentoo_${MRD_VER}.patch"
eapply_user
sed -i -e "s!#LIBDIR#!$(get_libdir)!" "${WORKDIR}"/makeresolvedeb.sh || die "Sed failed!"
}
_adjust_sandbox() {
addwrite /dev
addread /dev
addpredict /root
addpredict /etc
addpredict /lib
addpredict /usr
addpredict /sys
addpredict "/var/BlackmagicDesign"
addpredict "/var/BlackmagicDesign/DaVinci Resolve"
}
src_compile() {
_adjust_sandbox
cd "${WORKDIR}"
chmod u+x ${BASE_NAME}.run
CI_TEST="1" "${WORKDIR}"/makeresolvedeb.sh ${BASE_NAME}.run
}
src_install() {
cp -a ${DR}/lib "${ED}" || die
cp -a ${DR}/opt "${ED}" || die
cp -a ${DR}/usr "${ED}" || die
cp -a ${DR}/var "${ED}" || die
if use doc ; then
dodoc *.pdf
fi
# See bug 718070 for reason for the next line.
if use system-glib ; then
rm -f "${ED}"/opt/resolve/libs/libglib-*
rm -f "${ED}"/opt/resolve/libs/libgio-2.0.so*
rm -f "${ED}"/opt/resolve/libs/libgmodule-2.0.so*
fi
}
pkg_preinst() {
xdg_pkg_preinst
}
pkg_postinst() {
xdg_pkg_postinst
udev_reload
}
pkg_postrm() {
xdg_pkg_postrm
udev_reload
}

View File

@ -1,54 +1,67 @@
--- makeresolvedeb_1.6.2_multi.sh 2022-11-12 08:58:22.000000000 +0100
+++ makeresolvedeb.sh 2022-11-17 14:16:54.399577310 +0100
@@ -151,8 +151,8 @@
copy_object ${UNPACK_DIR}/libs/libBlackmagicRawAPI.so ${RESOLVE_BASE_DIR}/bin/
--- makeresolvedeb_1.7.1_multi.sh 2024-04-14 13:04:31.000000000 +0200
+++ makeresolvedeb.sh 2024-06-19 07:27:59.975132053 +0200
@@ -164,8 +164,8 @@
copy_object "${UNPACK_DIR}"/libs/libBlackmagicRawAPI.so "${RESOLVE_BASE_DIR}"/bin/
# Install panel API library
- create_directory ${DEB_DIR}/usr/lib/
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib/ libDaVinciPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
- create_directory "${DEB_DIR}"/usr/lib/
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib/ libDaVinciPanelAPI.so
+ create_directory "${DEB_DIR}"/usr/#LIBDIR#/
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR#/ libDaVinciPanelAPI.so
# Add postinst commands
cat >> ${DEB_DIR}/DEBIAN/postinst <<EOF
@@ -208,8 +208,8 @@
copy_object ${UNPACK_DIR}/share/default_cm_config.bin ${RESOLVE_BASE_DIR}/share/
cat >> "${DEB_DIR}"/DEBIAN/postinst <<EOF
@@ -221,8 +221,8 @@
copy_object "${UNPACK_DIR}"/share/default_cm_config.bin "${RESOLVE_BASE_DIR}"/share/
# Extract panel API library
- create_directory ${DEB_DIR}/usr/lib
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libDaVinciPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
- create_directory "${DEB_DIR}"/usr/lib
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libDaVinciPanelAPI.so
+ create_directory "${DEB_DIR}"/usr/#LIBDIR#
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libDaVinciPanelAPI.so
# BlackmagicRawAPI fixes
create_directory ${RESOLVE_BASE_DIR}/bin/BlackmagicRawAPI/
@@ -271,9 +271,9 @@
copy_object ${UNPACK_DIR}/share/default_cm_config.bin ${RESOLVE_BASE_DIR}/share/
create_directory "${RESOLVE_BASE_DIR}"/bin/BlackmagicRawAPI/
@@ -284,9 +284,9 @@
copy_object "${UNPACK_DIR}"/share/default_cm_config.bin "${RESOLVE_BASE_DIR}"/share/
# Extract panel API library
- create_directory ${DEB_DIR}/usr/lib
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libDaVinciPanelAPI.so
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libFairlightPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libFairlightPanelAPI.so
- create_directory "${DEB_DIR}"/usr/lib
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libDaVinciPanelAPI.so
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libFairlightPanelAPI.so
+ create_directory "${DEB_DIR}"/usr/#LIBDIR#
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libDaVinciPanelAPI.so
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libFairlightPanelAPI.so
# BlackmagicRawAPI fixes for 17.0 & 17.1
if [[ "$RESOLVE_VERSION" == 17.0* ]] || [[ "$RESOLVE_VERSION" == 17.1* ]];
@@ -333,9 +333,9 @@
@@ -346,9 +346,9 @@
fi
# Extract panel API library
- create_directory ${DEB_DIR}/usr/lib
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libDaVinciPanelAPI.so
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libFairlightPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libFairlightPanelAPI.so
- create_directory "${DEB_DIR}"/usr/lib
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libDaVinciPanelAPI.so
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libFairlightPanelAPI.so
+ create_directory "${DEB_DIR}"/usr/#LIBDIR#
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libDaVinciPanelAPI.so
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libFairlightPanelAPI.so
# Create common data dir
create_directory ${DEB_DIR}/var/BlackmagicDesign/DaVinci\ Resolve
@@ -621,8 +621,8 @@
create_directory "${DEB_DIR}"/var/BlackmagicDesign/DaVinci\ Resolve
@@ -398,9 +398,9 @@
copy_object "${UNPACK_DIR}"/share/remote-monitor-log-conf.xml "${RESOLVE_BASE_DIR}"/share/
# Extract panel API library
- create_directory "${DEB_DIR}"/usr/lib
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libDaVinciPanelAPI.so
- extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/lib libFairlightPanelAPI.so
+ create_directory "${DEB_DIR}"/usr/#LIBDIR#
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libDaVinciPanelAPI.so
+ extract_tgz "${UNPACK_DIR}"/share/panels/dvpanel-framework-linux-x86_64.tgz "${DEB_DIR}"/usr/#LIBDIR# libFairlightPanelAPI.so
# Create common data dir
create_directory "${DEB_DIR}"/var/BlackmagicDesign/DaVinci\ Resolve
@@ -780,8 +780,8 @@
# Verify that we have the commands we need
check_command tar