Megapahit viewer 26.3.0-r55665 ebuild

Promoted right away since it's the only one that will build at the
moment of this commit, while previous ones wouldn't (hence deleted)
caused by VLC API changes, which is why this ebuild requires one
version older VLC to be the one installed instead.
The WebRTC patch doesn't seem to be needed any more (it can find
the WebRTC archive again now), and the Discord patch also isn't
needed any more, it's taken care of in the viewer codebase now.

7 files changed, 4 insertions, 172 deletions

diff --git a/games-rpg/megapahit/Manifest b/games-rpg/megapahit/Manifest
index 3616427..17f233d 100644
--- a/games-rpg/megapahit/Manifest
+++ b/games-rpg/megapahit/Manifest
@@ -2,17 +2,13 @@ DIST colladadom-v2.3-r11.tar.gz 19426401 BLAKE2B 496ef2cadf0d19f19a4c8abf8783247
 DIST cubemaptoequirectangular-1.1.0-linux64-cb8785a.tar.zst 3405 BLAKE2B 8db4254b72ba7b85cd7244eb04ac677fe809c38c1b5c601cb79ce26bb7b4a3cec21a9ca52e115f2d178d17045696743b5a660b400b2fc787581a47bb4d3a8c31 SHA512 fd4d8f88df81b61c316a6678d53012d080e86702f6f3f5a11d4ae398efe56906333bdbaeaba26b81bb7cd610412b2e489e6820fe5469e3bd8705bea11cb23a7c
 DIST curl-7.54.1-20982000504-linux64-20982000504.tar.zst 1485214 BLAKE2B cfbe32c3082137783528f1dd5571c4cd31aea6a7199d62c870e75d6e58edc4aa729ba7b66c8ed9d851b9b7d570d0b5ac70befb483dcf6992995b9370ecc3cdd0 SHA512 132af79c68cd74ddd73f9459bcd8c9dc27a88846b1b3ffa8434088dd7e80de61f45ee5396b1c3c6624264128fd1c5cd558f0906f24ca2b735c3908066bf1afa8
 DIST dictionaries-1.a01bb6c-common-a01bb6c.tar.zst 1826870 BLAKE2B c06f148e608c79bbd9bacd7f9b8b20e4df99ea23072bb341ef844d33644685f7e72f6ed4bfdd7ef897ab7d1117c47599ace29a5a2333701c8b2821d6c1fec045 SHA512 95c0f27727ea7b9e6af3f2fd25e560d93edd678fc6104ca74c0765ef9ae957cceacf029d159b1eb25571fdde0a721b956a59483e1820d1357e42a5c94a72ae86
-DIST dullahan-1.14.0.202408091637_118.4.1_g3dd6078_chromium-118.0.5993.54-linux64-10322607516.tar.zst 93285172 BLAKE2B b89c2ba8d3ca370bf2a65963b950beaf982c66e3a2f0c90f630ddf33ab4ff7fd6e770b3dc20aca2730299b778df9177b598a1e93b6b68fce01d4d269b490a080 SHA512 b797f525482d98a6dd919e352c1ba24156f74b174887af8acf68d5c73df13713cbe20fd58cea12b594586ed93c9094dbc6ed96b4ed11ac8fa9254881e84c78cb
 DIST dullahan-1.25.0.202510152245_139.0.40_g465474a_chromium-139.0.7258.139-linux64-18544680875.tar.zst 118530752 BLAKE2B 3d152fea4d659ae18c2abfbe004930ba8fb6451dc9d089438c2490e9e5513f442c70f6ed93c33bf9c43a4e96b3faa8059c15c06442100c4730f03279c2e9af39 SHA512 02cf561fa568531a7786b1e336f5c89ad304e0b9005c73c9d2d58d344ba094ac59c466f2333eb479105bad5079027a0f212b1bf71456ed9040ead6d4ab21386d
 DIST emoji_shortcodes-15.3.2.10207138275-common-10207138275.tar.zst 164530 BLAKE2B 4a68ce80623acdd737036eee2c295b527ce88668230463149139e34d91ba6371ee35979e19e07fb8c044d1b6bd31ecf9e15afd2d37df4194d186541f98912a24 SHA512 dd0466512023dccea716b2010cbfc048e6863770942b63a56116ce9e4d72d7661b601de5bec704aa20d520aede13a6b807eca5c9d6d8e996e3b9339fd6106238
 DIST glh_linear-1.0.1-dev4-common-984c397.tar.zst 18288 BLAKE2B 073c677d5aed4f2f4643c49b3e75edf8a0281418cde109f7501c19aa1150ed84576eba077a4806bb29789d74ad68fd2928fd8329084d532f936a8df22be70833 SHA512 53a82aef56ccc1a6ef71ba68ce3fcfaf8200152e5c5787817db7715982147ebcbaccad9e3e308b54882e83e05a51bfd55b9689f86f7535aa8b04040d0f2277d9
 DIST google_fonts-1.0.0.24469773244-common-24469773244.tar.zst 766996 BLAKE2B d7b8c07e2429158768ceddadd4f270b7488ad6bd4eebabfa040571ec3eb5812b08342a5765c06ec297abebce6410ce5c57b1380f567bc613f422f66a212adf21 SHA512 1144cb7942cf21d50ad0279e2d3acff1caf7cca7e21769c08537f332188cdf0b064fdd0787d391ffb522b10524cc964a7e08e041a01ab014e73d5e3219f2433d
 DIST jpegencoderbasic-1.0-linux64-790015a.tar.zst 8195 BLAKE2B 5858b5560fc6329b25926948a1528a8dfee904f701ab2cc768426f610808121f16dce917340a8bcf7b92fa186cc849f339e816cb608d0299f76dc4818fa524b4 SHA512 53def673d8ac6f207b8659a7c4bb7c82c95c956b51982d925df09c4592f32c3ba85fbfcfc9bada7b7b5bf019a14391d6cff2dec21f921f383e8345ce95755112
-DIST libwebrtc-linux-x64.tar.xz 61390608 BLAKE2B 390b6de5e79cbc48c253a69185b2ee4f967291af773b283d5783795933b6246cf51e1e10266470619e500487c84dcf724b08dbacf8783dd4446a5a4199eee256 SHA512 0efb40c7d08a8d796fb084ccde297bfd7d836134b6d607a94642b96e30a8de5795925080fa67d58398b5ebd258248e218ac21a3e1632b1a24ba80893d3c07ee0
 DIST llca-202407221423.0-common-10042698865.tar.zst 312496 BLAKE2B 0097fa44e57990a295f8fa2d7fb1e656f6b21ff97b4e04aac33cbfdf4a2ee7b85a578f7c19bbfe593d5a5f00060a8f4832cfd54fe14418ab1a46d4130d6b0209 SHA512 8abfb35394a4c32ad0c6d0b042c0bad44be84f60cab5c170fa8a965b45eb5baf21559c4840be41422cf95ad26803f3314fc1a2a0e3391460cc29de32c051d246
-DIST megapahit-26.2.0-r55409.tar.bz2 32932569 BLAKE2B 7e57dbcd5afe41982c5ad41c2f54248da82060247b3e183f8ed88d08ae4ce8990c5c342ea69cf7263262293e1573619aad97d0bbc8fbfcee91fa30f8696a92ce SHA512 e2f7b9cb381e05be5eceec0b1ac5480f9ac3a22c19ce2a5854fce7197d5268d20b9bf98800388b1d4e84cb82f94d13a02449b2fb19d12ec33885cde1a0127909
-DIST megapahit-26.3.0-r55654.tar.bz2 32923090 BLAKE2B 5910296e7e69ab6f06f69ce491e34438d62d2e98db391a8bb7025adee3deef643cc99ef6daf59fc5ea36951bc3d25d58b64bbd6358db362c7d485bbea322bb3f SHA512 e77135a068a36f9462b17cac8de139198c1bd9132aa5b1e9882debc33ba732e75e292ebbb8c376e53550fef527b19ca1671540debd94bfe6bd079bd46d02ae2a
-DIST meshoptimizer-1.0.1.tar.gz 515420 BLAKE2B 757ef3e2b8c3191ada29598827919e7d3939b533f5a0db3a14b45ce45ffd8259759a87d04d6295c5f72bafe5139d9422997f5479363d209d1012cbb01142c4cc SHA512 8083df3cf41b90a472aaede06bcc316ec4c1c2f34775fd1f436dcea11d241087ae9e18aad115d46e7b2aaca2d754dd672872cddb6910db22770c064097b31254
+DIST megapahit-26.3.0-r55665.tar.bz2 32927902 BLAKE2B b8d132ebe4052a7b3ca768c99f86f5675a55dcb29582394a6eacec0066542d2920f2d31fa7467c76e99ddac8ddf41721597906a0c16168e663b4ae036a96e80d SHA512 de45230f9b88a6fc53d44b461b27379830e2fe2807c4f1a6ec8f1d767639b8534aa4981b448f4b880bd7ed7937aec300aba4da54eb02bd60026ae63818fd7e34
 DIST meshoptimizer-1.2.tar.gz 565981 BLAKE2B 7ca523823a544d4672c929377b64f61dbe0b505e57df332b0ad45d346c2996f90a5460e9a7236690a7bed5e31d9b85f663a9a0c6452946f829081b862622f286 SHA512 23197a9dcd4cbbce625b9d142f2eaafc67c9cf92859f9a5ce94c4570fca8db07c97590d2737d97726dbf48e968f53c8d7dd26771678c2cade957c62a3600d88c
 DIST mikktspace-1-linux64-8756084692.tar.zst 14679 BLAKE2B d3ff6510bc6aaaf870d3e33a81e0e540707a3e845a7c3638aed714be9e72e572d97d162299e82b06f01cdb4359341d8a172c4ccdf220a2031d87941426eb114c SHA512 eac64b36c262188f4f52f42520e16721a34608fa7216103053cb3b3322dafb96430a5918db19cfa953625997119a30868bf7cf82ea7eb527e12f35c3d1adb899
 DIST open_libndofdev-0.14.8730039102-linux64-8730039102.tar.zst 21333 BLAKE2B 1fa02576a7b3da1a870760d2ea5289159004400e6c3b5be7f66428228d2eb72aba08114f2c18134c36ce595d5d6c7cdcb78c47e84b065e918143b358aa7cbf5d SHA512 228095abecb48c4ff3cb1ef3fe84ba4766bc2fcf9c5b6e597a7f2e901490acc8535b0ea51e42db22f01f1bf92c92045aebbae75d47026d1e09067e5b363ae503
diff --git a/games-rpg/megapahit/files/megapahit-26.2.0-discord_sdk.patch b/games-rpg/megapahit/files/megapahit-26.2.0-discord_sdk.patch
deleted file mode 100644
index f5ec750..0000000
--- a/games-rpg/megapahit/files/megapahit-26.2.0-discord_sdk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- viewer/indra/cmake/Discord.cmake.orig	2025-07-20 19:39:36.291295755 +0800
-+++ viewer/indra/cmake/Discord.cmake	2025-07-20 19:39:46.854182818 +0800
-@@ -5,7 +5,7 @@
- 
- if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/discord_installed OR NOT ${discord_installed} EQUAL 0)
-     file(ARCHIVE_EXTRACT
--        INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.8.13395.zip
-+        INPUT /var/cache/distfiles/DiscordSocialSdk-1.8.13395.zip
-         DESTINATION ${CMAKE_BINARY_DIR}
-         )
-     file(
diff --git a/games-rpg/megapahit/files/megapahit-26.2.0-webrtc.patch b/games-rpg/megapahit/files/megapahit-26.2.0-webrtc.patch
deleted file mode 100644
index c19f57c..0000000
--- a/games-rpg/megapahit/files/megapahit-26.2.0-webrtc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- viewer/indra/cmake/WebRTC.cmake.orig	2025-11-07 07:21:42.631406840 +0800
-+++ viewer/indra/cmake/WebRTC.cmake	2025-11-07 07:21:52.737747450 +0800
-@@ -79,12 +79,7 @@
-     endif ()
- endif ()
- 
--find_library(WEBRTC_LIBRARY
--    NAMES
--    webrtc
--    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
--
--target_link_libraries( ll::webrtc INTERFACE ${WEBRTC_LIBRARY} )
-+target_link_libraries( ll::webrtc INTERFACE webrtc )
- 
- if (DARWIN)
-     if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
diff --git a/games-rpg/megapahit/files/megapahit-26.3.0-discord_sdk.patch b/games-rpg/megapahit/files/megapahit-26.3.0-discord_sdk.patch
deleted file mode 100644
index 5d6b986..0000000
--- a/games-rpg/megapahit/files/megapahit-26.3.0-discord_sdk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- viewer/indra/cmake/Discord.cmake.orig	2025-07-20 19:39:36.291295755 +0800
-+++ viewer/indra/cmake/Discord.cmake	2025-07-20 19:39:46.854182818 +0800
-@@ -5,7 +5,7 @@
- 
- if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/discord_installed OR NOT ${discord_installed} EQUAL 0)
-     file(ARCHIVE_EXTRACT
--        INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.9.17379.zip
-+        INPUT /var/cache/distfiles/DiscordSocialSdk-1.9.17379.zip
-         DESTINATION ${CMAKE_BINARY_DIR}
-         )
-     file(
diff --git a/games-rpg/megapahit/files/megapahit-26.3.0-webrtc.patch b/games-rpg/megapahit/files/megapahit-26.3.0-webrtc.patch
deleted file mode 100644
index c19f57c..0000000
--- a/games-rpg/megapahit/files/megapahit-26.3.0-webrtc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- viewer/indra/cmake/WebRTC.cmake.orig	2025-11-07 07:21:42.631406840 +0800
-+++ viewer/indra/cmake/WebRTC.cmake	2025-11-07 07:21:52.737747450 +0800
-@@ -79,12 +79,7 @@
-     endif ()
- endif ()
- 
--find_library(WEBRTC_LIBRARY
--    NAMES
--    webrtc
--    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
--
--target_link_libraries( ll::webrtc INTERFACE ${WEBRTC_LIBRARY} )
-+target_link_libraries( ll::webrtc INTERFACE webrtc )
- 
- if (DARWIN)
-     if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
diff --git a/games-rpg/megapahit/megapahit-26.2.0-r55409.ebuild b/games-rpg/megapahit/megapahit-26.2.0-r55409.ebuild
deleted file mode 100644
index 2e95f14..0000000
--- a/games-rpg/megapahit/megapahit-26.2.0-r55409.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake unpacker
-
-DESCRIPTION="A fork of the Second Life viewer"
-HOMEPAGE="https://megapahit.net"
-SRC_URI="
-	https://megapahit.net/downloads/${PF}.tar.bz2
-	https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r11.tar.gz -> colladadom-v2.3-r11.tar.gz
-	https://github.com/secondlife/3p-cubemap_to_eqr_js/releases/download/v1.1.0-cb8785a/cubemaptoequirectangular-1.1.0-linux64-cb8785a.tar.zst
-	https://github.com/secondlife/3p-curl/releases/download/v7.54.1-r4/curl-7.54.1-20982000504-linux64-20982000504.tar.zst
-	https://github.com/secondlife/3p-dictionaries/releases/download/v1-a01bb6c/dictionaries-1.a01bb6c-common-a01bb6c.tar.zst
-	https://github.com/secondlife/dullahan/releases/download/v1.14.0-r3/dullahan-1.14.0.202408091637_118.4.1_g3dd6078_chromium-118.0.5993.54-linux64-10322607516.tar.zst
-	https://github.com/secondlife/3p-emoji-shortcodes/releases/download/v15.3.2-r1/emoji_shortcodes-15.3.2.10207138275-common-10207138275.tar.zst
-	https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev4-984c397/glh_linear-1.0.1-dev4-common-984c397.tar.zst
-	https://github.com/secondlife/3p-google-fonts/releases/download/v1.0.0-r6/google_fonts-1.0.0.24469773244-common-24469773244.tar.zst
-	https://github.com/secondlife/3p-jpeg_encoder_js/releases/download/v1.0-790015a/jpegencoderbasic-1.0-linux64-790015a.tar.zst
-	https://github.com/crow-misia/libwebrtc-bin/releases/download/137.7151.3.1/libwebrtc-linux-x64.tar.xz
-	https://github.com/secondlife/llca/releases/download/v202407221723.0-a0fd5b9/llca-202407221423.0-common-10042698865.tar.zst
-	https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.1.tar.gz -> meshoptimizer-1.0.1.tar.gz
-	https://github.com/secondlife/3p-mikktspace/releases/download/v2-e967e1b/mikktspace-1-linux64-8756084692.tar.zst
-	https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r2/open_libndofdev-0.14.8730039102-linux64-8730039102.tar.zst
-	https://github.com/secondlife/3p-openssl/releases/download/v1.1.1w-r4/openssl-1.1.1w-r4-linux64-20981673556.tar.zst
-	https://github.com/secondlife/3p-openxr/releases/download/v1.1.40-r1/openxr-1.1.40-r1-linux64-10710818432.tar.zst
-	https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-5da28d9/threejs-0.132.2-common-8454371083.tar.zst
-	https://github.com/secondlife/3p-tinyexr/releases/download/v1.0.9-5e8947c/tinyexr-1.0.9-5e8947c-common-10475846787.tar.zst
-	https://github.com/secondlife/3p-tinygltf/releases/download/v2.9.3-r1/tinygltf-2.9.3-r1-common-10341018043.tar.zst
-	https://github.com/kmammou/v-hacd/archive/refs/tags/v4.1.0.tar.gz -> v-hacd-4.1.0.tar.gz
-	https://github.com/secondlife/3p-viewer-fonts/releases/download/v1.1.0-r1/viewer_fonts-1.0.0.10204976553-common-10204976553.tar.zst
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="discord"
-
-RDEPEND="
-	media-libs/freealut
-	dev-libs/apr-util
-	dev-libs/boost[context]
-	x11-libs/fltk
-	app-text/hunspell
-	net-libs/nghttp2
-	media-libs/openjpeg
-	media-libs/libsdl2[opengl]
-	media-video/vlc
-	sys-libs/zlib[minizip]
-	app-accessibility/at-spi2-core
-"
-DEPEND="
-	${RDEPEND}
-	media-libs/glm
-	media-libs/nanosvg
-	media-video/pipewire
-	media-libs/libpulse
-	dev-libs/xxhash
-"
-BDEPEND="
-	dev-build/cmake
-	dev-util/pkgconf
-	app-arch/zstd
-"
-S="${WORKDIR}/viewer"
-
-CMAKE_BUILD_TYPE="Release"
-
-pkg_setup() {
-	export LL_BUILD="-fPIC -DLL_LINUX=1"
-	export revision="$(ver_cut 2- ${PR})"
-}
-
-src_unpack() {
-	unpacker
-	cd ${WORKDIR}
-	mkdir -p viewer/indra_build/packages
-	mv 3p-colladadom-2.3-r11 meshoptimizer-1.0.1 v-hacd-4.1.0 viewer/indra_build/
-	mv LICENSES NOTICE VERSION autobuild-package.xml bin ca-bundle.crt dictionaries docs fonts include js lib meta mikktspace.txt resources xui viewer/indra_build/packages/
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-webrtc.patch
-	eapply "${FILESDIR}"/${P}-discord_sdk.patch
-	eapply_user
-	cd ${S}/indra
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DADDRESS_SIZE:STRING=64
-		-DUSE_OPENAL:BOOL=ON
-		-DUSE_FMODSTUDIO:BOOL=OFF
-		-DUSE_DISCORD:BOOL=$(usex discord)
-		-DENABLE_MEDIA_PLUGINS:BOOL=ON
-		-DLL_TESTS:BOOL=OFF
-		-DNDOF:BOOL=ON
-		-DROOT_PROJECT_NAME:STRING=Megapahit
-		-DVIEWER_CHANNEL:STRING=Megapahit
-		-DVIEWER_BINARY_NAME:STRING=${PN}
-		-DBUILD_SHARED_LIBS:BOOL=OFF
-		-DINSTALL:BOOL=ON
-		-DPACKAGE:BOOL=OFF
-	)
-	cmake_src_configure
-}
diff --git a/games-rpg/megapahit/megapahit-26.3.0-r55654.ebuild b/games-rpg/megapahit/megapahit-26.3.0-r55665.ebuild
index e194118..fc5e40c 100644
--- a/games-rpg/megapahit/megapahit-26.3.0-r55654.ebuild
+++ b/games-rpg/megapahit/megapahit-26.3.0-r55665.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="discord"
 
 RDEPEND="
@@ -46,7 +46,7 @@ RDEPEND="
 	net-libs/nghttp2
 	media-libs/openjpeg
 	media-libs/libsdl2[opengl]
-	media-video/vlc
+	<media-video/vlc-4.0.0_pre20260625
 	sys-libs/zlib[minizip]
 	app-accessibility/at-spi2-core
 "
@@ -78,12 +78,10 @@ src_unpack() {
 	cd ${WORKDIR}
 	mkdir -p viewer/indra_build/packages
 	mv 3p-colladadom-2.3-r11 meshoptimizer-1.2 v-hacd-4.1.0 viewer/indra_build/
-	mv LICENSES NOTICE VERSION autobuild-package.xml bin ca-bundle.crt dictionaries docs fonts include js lib meta mikktspace.txt resources xui viewer/indra_build/packages/
+	mv LICENSES autobuild-package.xml bin ca-bundle.crt dictionaries docs fonts include js lib meta mikktspace.txt resources xui viewer/indra_build/packages/
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-webrtc.patch
-	eapply "${FILESDIR}"/${P}-discord_sdk.patch
 	eapply_user
 	cd ${S}/indra
 	cmake_src_prepare