From f97675ef0897df2ad36a7b9ee970a8a03f3883cb Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Fri, 12 Aug 2022 15:06:05 +0200
Subject: [PATCH] media-video/davinci-resolve: Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
---
 media-video/davinci-resolve/ChangeLog         |  7 +++
 media-video/davinci-resolve/Manifest          |  8 +--
 ...1.ebuild => davinci-resolve-18.0.1.ebuild} | 20 +++++---
 ...atch => makeresolvedeb_gentoo_1.6.0.patch} | 51 ++++++++-----------
 4 files changed, 44 insertions(+), 42 deletions(-)
 rename media-video/davinci-resolve/{davinci-resolve-18.0_beta1.ebuild => davinci-resolve-18.0.1.ebuild} (86%)
 rename media-video/davinci-resolve/files/{makeresolvedeb-gentoo.patch => makeresolvedeb_gentoo_1.6.0.patch} (70%)

diff --git a/media-video/davinci-resolve/ChangeLog b/media-video/davinci-resolve/ChangeLog
index fa977066..402dd513 100644
--- a/media-video/davinci-resolve/ChangeLog
+++ b/media-video/davinci-resolve/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2022 Gentoo Authors; Distributed under the GPL v2
 # $Header: $
 
+*davinci-resolve-18.0.1 (12 Aug 2022)
+
+  12 Aug 2022; Mario Fetka <mario.fetka@gmail.com>
+  +davinci-resolve-18.0.1.ebuild, +files/makeresolvedeb_gentoo_1.6.0.patch,
+  -davinci-resolve-18.0_beta1.ebuild, -files/makeresolvedeb-gentoo.patch:
+  media-video/davinci-resolve: Bump
+
   05 Apr 2022; Mario Fetka <mario.fetka@gmail.com>
   davinci-resolve-17.4.5.ebuild:
   media-video/davinci-resolve: update metadata
diff --git a/media-video/davinci-resolve/Manifest b/media-video/davinci-resolve/Manifest
index ea1a45a2..cba58cee 100644
--- a/media-video/davinci-resolve/Manifest
+++ b/media-video/davinci-resolve/Manifest
@@ -1,6 +1,6 @@
-AUX makeresolvedeb-gentoo.patch 3164 BLAKE2B 798d172b151cb339f0e4b3c612928b845e73479ea65f88a0de27fbb5f3490aafc84d2e0ae80cd68c22038845bfe5bb6dbc1585309c3a09381db7e8a1d4d8ebec SHA512 41fa34f56634b06afacba28e29d07bd00cf0698a24a4470a7aee1faae26f117db6707e105df74ac34d3d1391a62cb70a555ba6e3d839d925760d44c480d5d8de
-DIST DaVinci_Resolve_18.0b1_Linux.zip 2570231721 BLAKE2B 0ba203a6e0e11154271f394562f93e1dfe767efc75e34f0b4273f13b158e4cd96aa1e6418e79d0eb8f35791001168d2e87cfcbf41bcf91f86679072c6d9c17a3 SHA512 0ca11fe44a5867c2b54304ccddb0bc1f9c7c81125f8d3ad4204816a81b17f6350b258e95a5cd937c820cf438a16919a643481f714b58859908114e088e56bc11
+AUX makeresolvedeb_gentoo_1.6.0.patch 3462 BLAKE2B 8072b571bc370b9f0c7b3b62504c9b48f1dbda6e661e60082178244afd9c91e8e969f7d667e70a690066e4cb76c1d7c2425dbd781c5d3815e02663274be1eb07 SHA512 3cb9f7ba8b9a68dced129511e51f1842d81df77cbc98b4ad9b9f4e830d451ad0e8ece2d1dbadf1af636e5202f960b62331478de71466f19706c297ba847be9b8
+DIST DaVinci_Resolve_18.0.1_Linux.zip 2872982286 BLAKE2B ebdb40b4d2a744857c31b3d9387571fe55f39080633e4df6af71bbd5ee3dc3d14dbeeb9579653c28d1df81d0d96bc21a4ffbd139edbd1c9f490d2b25cafc1313 SHA512 9433e31043aad890c53adf14abfef68ec6fedff92a9afabff7e93fbebef6dc38fb059ad3cfe5d4b9f3de68356b9a618937f94f0f59a01ebc4cbc5fd0fdb2d955
 DIST makeresolvedeb_1.6.0_multi.sh.tar.gz 4191 BLAKE2B ab2f09f339700ee31e011811152c6b97cc7e172698236efba0c0254cf69966c776dd222302e1da0266423f0af9c54ae426de4f5354d0d4550ae89b354f0a3d7a SHA512 02baae42c1e9d2163660b765ee6556660b337a3dfe25a60ee4bad9331d84700538ff9b339d045dd91cc0d89d1cd805e56437ae3a8d6ddf6502d0be0f0e5bc114
-EBUILD davinci-resolve-18.0_beta1.ebuild 2398 BLAKE2B 3ab08f350638446691b12139723001f5aeb40c5c2ec32b906f9c179173ccf9d1c813b5cb2e0557b09bdaa6b4c9c712fd9c47e8028d7ad4cdee93be4eab058cb1 SHA512 376d36a1d8d3f307bbfa124006bfcb4cbc57c21c75df3babb63dc970d8b4871e1fea637bd6ebf0997d97e888a4bb6b618a89675ee5d6d04df98ab8d01b3be55c
-MISC ChangeLog 502 BLAKE2B 247fa913b14508daf08104382c93d1fa21697fa9ad936e2ca02902726afdea2fdc86b70a86c5a45fa6b47678b96035ca5a6c32717cd2c6e7595a0a4f23c88599 SHA512 6a26eaf09cd118457312bf3ff32438683188a8969543562af40fc8de6bcb4430c90629ef8d3f0ee6d60142ab6dbd6cbcba93b5334c367bb5b5902ec3d377b293
+EBUILD davinci-resolve-18.0.1.ebuild 2456 BLAKE2B 46d0c333a79ec89a2c14668cf49b92722660f44e806964dd03782e7e8fe88aff0ef38d2592b1e67591f69c33228a2499031dd0605a3f45c88ffac673f6e1d84b SHA512 f71de45d097584a246b3be6e16bd52183ad1723d42d7ee0a1f4c54f0fca695668836b6367782f58bc1a91df75adc06cb1a3f7f9741065e73fabee20399c17748
+MISC ChangeLog 779 BLAKE2B 9f998e11e24a19a9a472c760129b4d70f858ec9616935799aff48fe51f80fc6298439bff39b25daf551a0762738eeec42d8db37f464ce51e722ec0f918aa65ea SHA512 f94d0437290a450cfd8c087d5c0d9b3b0a7c8c5f320023e401c3bbc30465d25959b30ee4e4092085a44927e4d44c8e1744ab40149d6224b751dbb0837672b28f
 MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/media-video/davinci-resolve/davinci-resolve-18.0_beta1.ebuild b/media-video/davinci-resolve/davinci-resolve-18.0.1.ebuild
similarity index 86%
rename from media-video/davinci-resolve/davinci-resolve-18.0_beta1.ebuild
rename to media-video/davinci-resolve/davinci-resolve-18.0.1.ebuild
index eb6879f8..8df783fd 100644
--- a/media-video/davinci-resolve/davinci-resolve-18.0_beta1.ebuild
+++ b/media-video/davinci-resolve/davinci-resolve-18.0.1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-#MAJOR_VER="$(ver_cut 1-3)"
-MAJOR_VER="18.0b1"
+MAJOR_VER="$(ver_cut 1-3)"
+#MAJOR_VER="18.0b1"
 if [[ "${PN}" == "davinci-resolve-studio" ]] ; then
 	BASE_NAME="DaVinci_Resolve_Studio_${MAJOR_VER}_Linux"
 	CONFLICT_PKG="!!media-video/davinci-resolve"
@@ -28,7 +28,7 @@ KEYWORDS="-* ~amd64"
 SLOT="0"
 IUSE="doc udev"
 
-RESTRICT="strip mirror bindist fetch"
+RESTRICT="strip mirror bindist fetch userpriv"
 
 RDEPEND="
 	virtual/glu
@@ -45,7 +45,7 @@ DEPEND="
 	dev-qt/qtwebsockets:5
 	media-libs/gstreamer
 	media-libs/libpng
-	sys-fs/fuse
+	sys-fs/fuse[suid]
 	udev? ( virtual/udev )
 	virtual/opencl
 	x11-misc/xdg-user-dirs
@@ -71,7 +71,7 @@ pkg_nofetch() {
 
 src_prepare() {
 	mv "${WORKDIR}"/makeresolvedeb*.sh "${WORKDIR}"/makeresolvedeb.sh
-	eapply -p0 "${FILESDIR}/makeresolvedeb-gentoo.patch"
+	eapply -p0 "${FILESDIR}/makeresolvedeb_gentoo_${MRD_VER}.patch"
 
 	eapply_user
 
@@ -81,15 +81,19 @@ src_prepare() {
 _adjust_sandbox() {
 	addwrite /dev
 	addread /dev
-	addpredict /var/lib/portage/home/.config
-	addpredict /var/lib/portage/home/.local
+	addpredict /root
+	addpredict /etc
+	addpredict /lib
+	addpredict /usr
+	addpredict /sys
 	addpredict "/var/BlackmagicDesign/DaVinci Resolve"
 }
 
 src_compile() {
 	_adjust_sandbox
 	cd "${WORKDIR}"
-	"${WORKDIR}"/makeresolvedeb.sh ${BASE_NAME}.run
+	chmod u+x *.run
+	CI_TEST="1" "${WORKDIR}"/makeresolvedeb.sh ${BASE_NAME}.run
 }
 
 src_install() {
diff --git a/media-video/davinci-resolve/files/makeresolvedeb-gentoo.patch b/media-video/davinci-resolve/files/makeresolvedeb_gentoo_1.6.0.patch
similarity index 70%
rename from media-video/davinci-resolve/files/makeresolvedeb-gentoo.patch
rename to media-video/davinci-resolve/files/makeresolvedeb_gentoo_1.6.0.patch
index 00830819..54c7b324 100644
--- a/media-video/davinci-resolve/files/makeresolvedeb-gentoo.patch
+++ b/media-video/davinci-resolve/files/makeresolvedeb_gentoo_1.6.0.patch
@@ -1,5 +1,5 @@
---- makeresolvedeb_1.5.1_multi.sh	2021-07-01 12:08:41.000000000 +0200
-+++ makeresolvedeb.sh	2022-02-23 20:14:54.737362574 +0100
+--- makeresolvedeb_1.6.0_multi.sh	2022-04-19 14:20:47.000000000 +0200
++++ makeresolvedeb.sh	2022-08-12 14:12:15.163328371 +0200
 @@ -151,8 +151,8 @@
      copy_object ${UNPACK_DIR}/libs/libBlackmagicRawAPI.so ${RESOLVE_BASE_DIR}/bin/
  
@@ -9,9 +9,9 @@
 +    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 desktop shortcuts
-     assert_object ${DEB_DIR}/opt/resolve/graphics/DV_Resolve.png
-@@ -237,8 +237,8 @@
+     # 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/
  
      # Extract panel API library
@@ -22,7 +22,7 @@
  
      # BlackmagicRawAPI fixes
      create_directory ${RESOLVE_BASE_DIR}/bin/BlackmagicRawAPI/
-@@ -329,9 +329,9 @@
+@@ -271,9 +271,9 @@
      copy_object ${UNPACK_DIR}/share/default_cm_config.bin ${RESOLVE_BASE_DIR}/share/
  
      # Extract panel API library
@@ -35,7 +35,20 @@
  
      # BlackmagicRawAPI fixes for 17.0 & 17.1
      if [[ "$RESOLVE_VERSION" == 17.0* ]] || [[ "$RESOLVE_VERSION" == 17.1* ]];
-@@ -457,7 +457,7 @@
+@@ -333,9 +333,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 common data dir
+     create_directory ${DEB_DIR}/var/BlackmagicDesign/DaVinci\ Resolve
+@@ -511,7 +511,7 @@
  	echo "[ERROR] DaVinci Resolve installer archive is not executable"
  	exit 1
      fi
@@ -44,7 +57,7 @@
      echo "Found ${NUMEXTRACT} objects"
      if [[ -z "$(ls -A ${UNPACK_DIR})" ]];
      then
-@@ -589,8 +589,8 @@
+@@ -620,8 +620,8 @@
  
  # Verify that we have the commands we need
  check_command tar
@@ -55,25 +68,3 @@
  echo
  
  # Create destination directories
-@@ -634,15 +634,15 @@
- 
- # Create Debian package
- close_deb
--echo "Creating Debian package"
--if ! fakeroot dpkg-deb -b ${DEB_DIR} ${DEB_DIR}.deb;
--then
--    ERRORS=$((ERRORS+1))
--fi
-+#echo "Creating Debian package"
-+#if ! fakeroot dpkg-deb -b ${DEB_DIR} ${DEB_DIR}.deb;
-+#then
-+#    ERRORS=$((ERRORS+1))
-+#fi
- 
- # Clean up
- remove_directory ${UNPACK_DIR}
--remove_directory ${DEB_DIR}
-+#remove_directory ${DEB_DIR}
- 
- # Report
- echo