Enable gstreamer and protobuf (#1)

Enable gstreamer and protobuf
PhotonVision · Oct 17, 2023 · dc67dc2 · dc67dc2
2 parents 8b427b6 + 3c93c97
commit dc67dc2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 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'
@@ -191,7 +194,7 @@ jobs:
         working-directory: combiner
       - name: Combine (Release)
         if: |
-          github.repository_owner == 'wpilibsuite' &&
+          github.repository_owner == 'PhotonVision' &&
           startsWith(github.ref, 'refs/tags/v')
         run: |
           ./gradlew publish -Pthirdparty

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
@@ -13,7 +13,7 @@ publishing {
     }
 }
 
-def pubVersion = "${project.ext.version}-1"
+def pubVersion = "${project.ext.version}-2"
 
 def outputsFolder = file("$project.buildDir/outputs")