Enable gstreamer+protobuf

PhotonVision · Sep 30, 2024 · 4d8c1a9 · 4d8c1a9
1 parent c480bd1
commit 4d8c1a9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,6 +34,9 @@ jobs:
           submodules: 'true'
       - run: sudo apt-get update && sudo apt-get install ant -y && sudo rm -rf /var/lib/apt/lists/* && sudo rm -f /bin/ant && sudo ln -s /usr/share/ant/bin/ant /bin/ant
         name: Install Ant
+      - run: sudo apt-get update && sudo apt-get install --quiet -y --no-install-recommends gstreamer1.0-gl gstreamer1.0-opencv gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools libgstreamer-plugins-base1.0-dev libgstreamer1.0-0 libgstreamer1.0-dev 
+        name: Install gstreamer
+        if: matrix.artifact-name == 'Linux'
       - run: rm -rf /usr/local/arm-linux-gnueabihf && curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-9/armhf-raspi-bullseye-2023-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
         name: Replace arm32 compiler
         if: matrix.artifact-name == 'Arm32'
@@ -178,28 +181,32 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          repository: wpilibsuite/build-tools
+          repository: photonvision/build-tools
       - uses: actions/download-artifact@v4
         with:
           path: combiner/products/build/allOutputs
       - name: Flatten Artifacts
         run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/
-      - name: Combine
+      - name: Combine (Snapshot)
         if: |
           !startsWith(github.ref, 'refs/tags/v')
-        run: ./gradlew publish -Pthirdparty
+        run: ./gradlew publish -Pthirdparty -i
         working-directory: combiner
+        env:
+          MAVEN_PUBLISH_URL: 'https://maven.photonvision.org/snapshots'
+          MAVEN_PUBLISH_USERNAME: ghactions
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
       - name: Combine (Release)
         if: |
-          github.repository_owner == 'wpilibsuite' &&
+          github.repository_owner == 'PhotonVision' &&
           startsWith(github.ref, 'refs/tags/v')
         run: |
-          ./gradlew publish -Pthirdparty
+          ./gradlew publish -Pthirdparty -i
         working-directory: combiner
         env:
-          RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
-          ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          MAVEN_PUBLISH_URL: 'https://maven.photonvision.org/releases'
+          MAVEN_PUBLISH_USERNAME: ghactions
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
       - uses: actions/upload-artifact@v4
         with:
           name: Maven

diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ ext {
             '-DWITH_OPENCL=OFF',
             '-DWITH_FFMPEG=OFF',
             '-DWITH_OPENEXR=OFF',
-            '-DWITH_GSTREAMER=OFF',
+            '-DWITH_GSTREAMER=ON',
             '-DWITH_LAPACK=OFF',
             '-DWITH_GTK=OFF',
             '-DWITH_1394=OFF',
@@ -54,7 +54,7 @@ ext {
             '-DWITH_WEBP=OFF',
             '-DBUILD_JAVA=ON',
             '-DBUILD_WITH_STATIC_CRT=OFF',
-            '-DWITH_PROTOBUF=OFF',
+            '-DWITH_PROTOBUF=ON',
             '-DWITH_DIRECTX=OFF',
             '-DENABLE_CXX11=ON',
             '-DOPENCV_JAVA_SOURCE_VERSION=1.8',

diff --git a/publish.gradle b/publish.gradle
@@ -18,10 +18,10 @@ def pubVersion = "${project.ext.version}-4"
 def outputsFolder = file("$project.buildDir/outputs")
 
 def baseArtifactId = 'opencv'
-def artifactGroupId = 'edu.wpi.first.thirdparty.frc2024.opencv'
-def zipBaseName = '_GROUP_edu_wpi_first_thirdparty_frc2024_opencv_ID_opencv-cpp_CLS'
-def jniBaseName = "_GROUP_edu_wpi_first_thirdparty_frc2024_opencv_ID_opencv-jni_CLS"
-def javaBaseName = "_GROUP_edu_wpi_first_thirdparty_frc2024_opencv_ID_opencv-java_CLS"
+def artifactGroupId = 'org.photonvision.thirdparty.frc2024.opencv'
+def zipBaseName = '_GROUP_org_photonvision_thirdparty_frc2024_opencv_ID_opencv-cpp_CLS'
+def jniBaseName = "_GROUP_org_photonvision_thirdparty_frc2024_opencv_ID_opencv-jni_CLS"
+def javaBaseName = "_GROUP_org_photonvision_thirdparty_frc2024_opencv_ID_opencv-java_CLS"
 
 def versionFile = file("$outputsFolder/version.txt")
 
@@ -435,10 +435,5 @@ model {
                 version pubVersion
             }
         }
-        repositories {
-            maven {
-                url "${System.getProperty('user.home')}/releases/maven/${project.repo}"
-            }
-        }
     }
 }