From f95c5af4e4acb3dea94700bf5e305a5a22a07b1c Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Wed, 29 Apr 2020 18:20:15 -0400
Subject: [PATCH] client: update to jogl 2.4.0-rc-20200429

This also drops linux i586 support as I do not have any 32bit machines, and they are uncommon now anyway.
---
 runelite-client/pom.xml | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index d2108f4f81..578bd6e952 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -37,7 +37,7 @@
 
 	<properties>
 		<guice.version>4.1.0</guice.version>
-		<jogl.version>2.3.2</jogl.version>
+		<jogl.version>2.4.0-rc-20200429</jogl.version>
 
 		<jarsigner.skip>true</jarsigner.skip>
 	</properties>
@@ -92,71 +92,57 @@
 			<version>1.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.jogl</groupId>
+			<groupId>net.runelite.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
 			<version>${jogl.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.jogl</groupId>
+			<groupId>net.runelite.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
 			<version>${jogl.version}</version>
 			<classifier>natives-windows-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.jogl</groupId>
+			<groupId>net.runelite.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
 			<version>${jogl.version}</version>
 			<classifier>natives-windows-i586</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.jogl</groupId>
+			<groupId>net.runelite.jogl</groupId>
 			<artifactId>jogl-all</artifactId>
 			<version>${jogl.version}</version>
 			<classifier>natives-linux-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.jogl</groupId>
-			<artifactId>jogl-all</artifactId>
-			<version>${jogl.version}</version>
-			<classifier>natives-linux-i586</classifier>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jogamp.gluegen</groupId>
+			<groupId>net.runelite.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
 			<version>${jogl.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.gluegen</groupId>
+			<groupId>net.runelite.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
 			<version>${jogl.version}</version>
 			<classifier>natives-windows-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.gluegen</groupId>
+			<groupId>net.runelite.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
 			<version>${jogl.version}</version>
 			<classifier>natives-windows-i586</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jogamp.gluegen</groupId>
+			<groupId>net.runelite.gluegen</groupId>
 			<artifactId>gluegen-rt</artifactId>
 			<version>${jogl.version}</version>
 			<classifier>natives-linux-amd64</classifier>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jogamp.gluegen</groupId>
-			<artifactId>gluegen-rt</artifactId>
-			<version>${jogl.version}</version>
-			<classifier>natives-linux-i586</classifier>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>archive-patcher</artifactId>
@@ -315,13 +301,13 @@
 									</includes>
 								</filter>
 								<filter>
-									<artifact>org.jogamp.jogl:*</artifact>
+									<artifact>net.runelite.jogl:*</artifact>
 									<includes>
 										<include>**</include>
 									</includes>
 								</filter>
 								<filter>
-									<artifact>org.jogamp.gluegen:*</artifact>
+									<artifact>net.runelite.gluegen:*</artifact>
 									<includes>
 										<include>**</include>
 									</includes>