From 4ccfb3d5dbc0c082b364bd30433971f07685eb80 Mon Sep 17 00:00:00 2001
From: Alex <alex@blueselene.com>
Date: Mon, 1 Jul 2024 22:04:38 +0200
Subject: [PATCH] community/dolphin-emu: build with system libenet

With the enet upgrade in 896eddb6, we can now build Dolphin with system libenet once again
---
 community/dolphin-emu/APKBUILD | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/community/dolphin-emu/APKBUILD b/community/dolphin-emu/APKBUILD
index 4a93054facc..86485699900 100644
--- a/community/dolphin-emu/APKBUILD
+++ b/community/dolphin-emu/APKBUILD
@@ -2,10 +2,9 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=dolphin-emu
 pkgver=5.0_git20240429
-pkgrel=2
+pkgrel=3
 _commit="a9544510468740b77cf06ef28daaa65fe247fd32"
 _commit_cubeb="54217bca3f3e0cd53c073690a23dd25d83557909"
-_commit_enet="2a85cd64459f6ba038d233a634d9440490dbba12"
 _commit_tinygltf="c5641f2c22d117da7971504591a8f6a41ece488b"
 _commit_gtest="58d77fa8070e8cec2dc1ed015d66b454c8d78850"
 _commit_implot="cc5e1daa5c7f2335a9460ae79c829011dc5cef2d"
@@ -24,6 +23,7 @@ makedepends="
 	bluez-dev
 	cmake
 	curl-dev
+	enet-dev
 	eudev-dev
 	ffmpeg4-dev
 	fmt-dev
@@ -58,7 +58,6 @@ makedepends="
 # The following dependencies are required, but atm not supported for using system wide libraries
 # minizip-dev soundtouch-dev gtest-dev
 source="https://github.com/dolphin-emu/dolphin/archive/$_commit/dolphin-emu-$_commit.tar.gz
-	https://github.com/lsalzman/enet/archive/$_commit_enet/enet-$_commit_enet.tar.gz
 	https://github.com/mozilla/cubeb/archive/$_commit_cubeb/cubeb-$_commit_cubeb.tar.gz
 	https://github.com/syoyo/tinygltf/archive/$_commit_tinygltf/tinygltf-$_commit_tinygltf.tar.gz
 	https://github.com/google/googletest/archive/$_commit_gtest/googletest-$_commit_gtest.tar.gz
@@ -105,9 +104,6 @@ prepare() {
 	rmdir Externals/VulkanMemoryAllocator
 	mv "$srcdir"/VulkanMemoryAllocator-$_commit_vulkan_memory Externals/VulkanMemoryAllocator
 
-	rmdir Externals/enet/enet
-	mv "$srcdir"/enet-$_commit_enet Externals/enet/enet
-
 	# Make sure we never use non-system libraries except the ones that are not
 	# supported being used system-wide by removing them from the Externals
 	# folder
@@ -118,7 +114,6 @@ prepare() {
 		Vulkan
 		VulkanMemoryAllocator
 		cpp-optparse
-		enet
 		cubeb
 		expr
 		glslang
@@ -173,8 +168,7 @@ build() {
 		-DENABLE_ANALYTICS=ON \
 		-DUSE_SANITIZERS=OFF \
 		-DWITH_SANITIZER=OFF \
-		-DUSE_SYSTEM_FMT=ON \
-		-DUSE_SYSTEM_ENET=OFF
+		-DUSE_SYSTEM_FMT=ON
 	cmake --build build
 }
 
@@ -191,7 +185,6 @@ package() {
 
 sha512sums="
 e0ba33ce96a1e0eab9b9b9307284a9d9202a7c05fabb1a3bd55b981031ccb2fbad7e6d9c7f5bf8e97746b6033869ead05c079167325a7102fe0ba25df11094aa  dolphin-emu-a9544510468740b77cf06ef28daaa65fe247fd32.tar.gz
-42f2f0b75bcdb883db39d31c4912e6f2f100f27ca8c7da6198b53c826acf27d1737b9010f9b881510d7a90395109ae078c58b1e50e1f25490e17eef0e779db92  enet-2a85cd64459f6ba038d233a634d9440490dbba12.tar.gz
 7ba1cd5b74d49512d2ebf9b07889ee3ad46559afe3293bcbebae0613661f7502f0baaa20b6723738c21b2d71f9d8f72ed1252703533507dec5d2b5ad84784017  cubeb-54217bca3f3e0cd53c073690a23dd25d83557909.tar.gz
 486bcf32be137dea5746117074dc51bc978290698de7831e1c4bbaa4acb56ed99fc34c38e69878a955b3e5f10f43eab07b0637164f822beae0fddd099aa0c56d  tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz
 d8153c426e4f9c89a74721cc4a24dfcaf319810f4f10aa25fc972f99da2d96d66bc840cf2f51b756fef6b1ca47e8d2c8633f5862cc24e34d57309ad48802124a  googletest-58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz