media-video/video2x: add 6.0.0, drop 6.0.0_beta5

Signed-off-by: Andrew Udvare <[email protected]>
Tatsh · Nov 3, 2024 · ad00da6 · ad00da6
1 parent e93bd3b
commit ad00da6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/media-video/video2x/Manifest b/media-video/video2x/Manifest
@@ -1,6 +1,6 @@
-AUX video2x-0001-build-system-fix.patch 2497 BLAKE2B 25e95b22f53887196195b84490a31a691b4bbf3056dc3e857859fcd332f05c2ad14de310b7e4903f4795c3ff1b7a849788721a4eb086cbfb8bb339eed6e1fd0d SHA512 552cb680ce0953f08be7c0bd520563f7b0f2f0e7e6a6f415a7ab96c98f35c6a129c2d355e79e52a112c59c3c32acf45bd3b02dada39cbfbfac045a6669ec8195
-DIST video2x-6.0.0_beta5.tar.gz 43367415 BLAKE2B 9e9ee70b1235d66ca6e4ce9fd40b30a812842fc0d30e14fbc3a9bdac7d47d5b5dfcdd13f9876384e6ce0445354bb178be45d69b9ca031d7fff9060bddb73c9d2 SHA512 799dfae87ff9530b8c380bf446174e8e2558b718440232b1bff6a2f2158dede44b281e6a7affe811330d6e58f78d4ec042d79c4c1ebae99ce9460475b9c0e093
+AUX video2x-0001-build-system-fix.patch 2495 BLAKE2B 934be9ef38856a5eeaca798982b8783628ad51b0c0f3378b3f102b7a05bb3fb04dc7fdc624fbd3a5e934e0c64da9d79e4cd2eb3c75c164bf68c19bc744bab341 SHA512 2ee32b754e264111b5c88ab03180ffc5f3445707fe9d93a7f233109bbc452967b43ef0d974c2e5e5dd3ee5c5c7e1a33fe9996d4a054e2203c6015fc9f5d9a42c
+DIST video2x-6.0.0.tar.gz 43810417 BLAKE2B 8ed89654160873ce5c3567d75e9c6d1074e798c861888c34be51d469cd774b81285f9cc621a951120348699632ba19cb1718b5434ff3a2481dfd04ece6d6bc36 SHA512 d24b07b0447ba960b4f64f34a82b069352376de89aa2428a77146a132f97371c92ad16252e070d8a49644a34629118ba93bbeaf88087181cfa91e521ac6e360b
 DIST video2x-libreal-esrgan-ncnn-vulkan-3e633ddb4f642ad88bd0cd5352b17e64c8c32a61.tar.gz 108399 BLAKE2B 3bef069997b4eeaab9e11cd8931ce07c81cbda5832770fe01539563369c597a08f9fe4fda57162ff72160954d297ed221b61cbd5a25107e8f955c1d5fe52e7c2 SHA512 475e81650dccc4a5fc7e9d74acd74b9dd298f057bd4448c08ee119a104dc5405e309f6fe080b6066eb16e5be141ac99d1318ccc05481441001a40d745a4e9dda
-EBUILD video2x-6.0.0_beta5.ebuild 1286 BLAKE2B 35b664a9c2bb3d667e59d899f86b2410a891a126109924e1d569577d61a107a668ea6104f349f681a56ba63d8328cfb7826a510b52746a90eb7ebad427db9458 SHA512 1cdbdc363dce9fa383e12ea4a44e16bc74b96e4f55e7982f70092e556af576f1b938f7316b940e2edf8af04564954450586fdf16ddae2a11b494bc17f2f7af50
+EBUILD video2x-6.0.0.ebuild 1287 BLAKE2B d8a5d9319beb68ee6ec135d0648acd5f1326b6d23243f15c3fc6b548d3141c5fa4b857be18bfe55771858db07d93500f6dd7ba8a182d55a8d861c3bc6f19d04b SHA512 504d536348483d6c2d12b383b4a4a3bb9554324cbfa5847a399e3986eb6655a55df7d1a76017cabe37b52d08016aecdbb24e2c066a4cb12c5db1cb753a82e3c0
 MISC livecheck.json 52 BLAKE2B 0d59afccac4e1597d98fbda28bdeaf754940154b45d5ca0831f10e7dab90423befb11e2a5c56fe99d27ead33c4e79470d7fc0e269497beb573a2fdab1d64718f SHA512 73057960b1add426098a2142f32e29efd77a3c3359eb81186fd63ea0952755277eb733555278c59cb586bd03a6faf3d5fed0d2a378775d204d95e542eb0eae70
 MISC metadata.xml 325 BLAKE2B 0ea7eb006fca13b5515153f44c1f20a4e5cece7344b0054a42e0281e07863b9179c6cba1a02752a14911721580748ad5a43eddf6008dc431b85cbc032eb77e68 SHA512 7c2ed36f4fb21ebac801eb4868f297b4723d4dff68f5aa4c742fcba16209bfc38955adea3ed300e5e2f6b780c95a74c974258c61b2172f48c9307f49286310bd
diff --git a/media-video/video2x/files/video2x-0001-build-system-fix.patch b/media-video/video2x/files/video2x-0001-build-system-fix.patch
@@ -1,4 +1,4 @@
-From a7da2ad9fd0b660999703701ea006378190e2ce1 Mon Sep 17 00:00:00 2001
+From 44ac77a11dd9af00040dc1749eee6f3c98e08a54 Mon Sep 17 00:00:00 2001
 From: Andrew Udvare <[email protected]>
 Date: Sun, 27 Oct 2024 06:08:21 -0400
 Subject: [PATCH] Build system fix
@@ -8,7 +8,7 @@ Subject: [PATCH] Build system fix
  1 file changed, 4 insertions(+), 26 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 86af44d..e407582 100644
+index 98e7e5f..269ac8d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -268,21 +268,7 @@ else()
@@ -18,10 +18,10 @@ index 86af44d..e407582 100644
 -# Include ExternalProject module
 -include(ExternalProject)
 -
--# Add libreal-esrgan-ncnn-vulkan as an external project
+-# Add librealesrgan-ncnn-vulkan as an external project
 -ExternalProject_Add(
 -    realesrgan
--    SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party/libreal_esrgan_ncnn_vulkan/src
+-    SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party/librealesrgan_ncnn_vulkan/src
 -    CMAKE_ARGS
 -        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 -        -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/realesrgan_install

diff --git a/...-video/video2x/video2x-6.0.0_beta5.ebuild → media-video/video2x/video2x-6.0.0.ebuild b/...-video/video2x/video2x-6.0.0_beta5.ebuild → media-video/video2x/video2x-6.0.0.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 PATCHES=( "${FILESDIR}/${PN}-0001-build-system-fix.patch" )
 
 src_prepare() {
-	rmdir third_party/libreal_esrgan_ncnn_vulkan || die
+	#rmdir third_party/libreal_esrgan_ncnn_vulkan || die
 	mv "${WORKDIR}/libreal-esrgan-ncnn-vulkan-${LIBREAL_ESRGAN_NCNN_VULKAN_SHA}/src" third_party/realesrgan || die
 	sed -re 's/(LIBRARY|ARCHIVE) DESTINATION lib/\1 DESTINATION lib64/' -i third_party/realesrgan/CMakeLists.txt || die
 	cmake_src_prepare