Move to our VLCJ-natives fork (#81)

This was done to stay ahead with the new VLC discovery, code patches and few optimizations Tested-by: SrRapero720 <[email protected]> Reviewed-by: SrRapero720 <[email protected]>
WaterMediaTeam · Jun 6, 2024 · 08346f9 · 08346f9
1 parent 9d73a12
commit 08346f9
Show file tree

Hide file tree

Showing 501 changed files with 1,367 additions and 9,794 deletions.
diff --git a/build.gradle b/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     // DEPENDENCIES
     shadow "net.java.dev.jna:jna:$jna_version"
     shadow "net.java.dev.jna:jna-platform:$jnaplatform_version"
-//    shadow "com.github.WaterMediaTeam:videolan-natives:$vlcj_natives_version"
+    shadow "com.github.WaterMediaTeam:videolan-natives:$vlcj_natives_version"
     shadow "com.github.WaterMediaTeam:ytdl-java:$jyd_version"
     shadow "org.apache.commons:commons-compress:$commoncompress_version" // CARRIES 'CODEC', 'LANG3' AND 'COMMONS-IO'
     shadow "org.tukaani:xz:$tukaani_version"
@@ -110,6 +110,7 @@ shadowJar {
     relocate 'org.apache.commons', 'me.lib720.apache'
     relocate 'org.tukaani', 'me.lib720.tukaani'
     relocate 'com.sun.jna', 'me.lib720.jna'
+    relocate 'uk.co.caprica', 'me.lib720.caprica'
 
     exclude "META-INF/versions/**"
     exclude "META-INF/proguard/**"

diff --git a/lib-vlcj/build.gradle b/lib-vlcj/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 base {
+    archivesName = id
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
@@ -15,12 +16,26 @@ java {
 
 repositories {
     mavenCentral()
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
+    implementation "com.github.WaterMediaTeam:videolan-natives:$vlcj_natives_version"
     compileOnly 'uk.co.caprica:vlcj-osx-stubs:1.0.0'
     compileOnly 'net.java.dev.jna:jna:4.4.0'
     compileOnly 'net.java.dev.jna:platform:3.4.0'
     compileOnly 'org.apache.logging.log4j:log4j-api:2.15.0'
     compileOnly 'org.apache.logging.log4j:log4j-core:2.17.1'
+}
+
+jar {
+    manifest {
+        attributes "Specification-Title": id
+        attributes "Specification-Vendor": authors
+        attributes "Specification-Version": version
+        attributes "Implementation-Title": brandname
+        attributes "Implementation-Version": version
+        attributes "Implementation-Vendor": authors
+        attributes "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+    }
 }
diff --git a/lib-vlcj/gradle.properties b/lib-vlcj/gradle.properties
@@ -0,0 +1,18 @@
+#########################
+#### Gradle runtime ####
+########################
+org.gradle.jvmargs=-Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -Dsun.rmi.dgc.server.gcInterval=2147483646 -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M
+org.gradle.daemon=false
+org.gradle.caching=false
+
+systemProp.file.encoding=utf-8
+
+#############################
+#### Project properties ####
+###########################
+id=vlcj
+name=VLCJ
+brandname=VLCJ
+group=me.srrapero720
+version=4.8.3
+github=SrRapero720/watermedia
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/VideoLan4J.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/VideoLan4J.java
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/Kernel32.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/Kernel32.java
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibC.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibC.java
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibDwmApi.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibDwmApi.java