Updates to build.gradle and Github actions to support change to ubuntu 22.04

Author: jusjoken

.github/workflows/ci.yml

@@ -9,8 +9,8 @@ on:
 jobs:
   build:
 
-#    runs-on: ubuntu-latest
-    runs-on: ubuntu-18.04
+#    runs-on: ubuntu-latest 2025-03-04 changed to 22.04 as 20.04 is no longer supported as of 4/1/2025
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2

build.gradle

@@ -48,7 +48,7 @@ ext {
 version = fullVersion
 
 // Just printing out the SAGETV build version for informational purposes
-// System.out.println("SAGETV VERSION ${versionArch}");
+//System.out.println("SAGETV VERSION ${versionArch}");
 
 // set gradle's buildDir to something other than the default 'build', or
 // we'll end up deleting EVERYTHING in 'build' when we ./gradlew clean
@@ -322,19 +322,22 @@ def getBuildNumber() {
 
   if (OperatingSystem.current().isLinux()) {
     // use git to find the build version
-    ant.exec(
-      command: 'git rev-list HEAD --count',
-      os: 'Linux',
-      failonerror: true,
-      outputproperty: 'sagebuildnum')
-
-    buildVer = ant.sagebuildnum
+    // 03-06-2025 jusjoken: Also we should note that you will get error code 128 if you have git
+    //  installed, but you did not pull this project using git because git will not know where 
+    //  to get the commit count from. 
+    new ByteArrayOutputStream().withStream { outputStream ->
+      exec {
+        executable 'git'
+        args 'rev-list', 'HEAD', '--count'
+        standardOutput = outputStream
+      }
+      buildVer = outputStream.toString().trim()
+    }
   } else if (OperatingSystem.current().isWindows()) {
     //ensure full path to git\bin is in the Path Environment variable on windows
     // 04-24-2017 JS: I changed this to remove the dependency on sh. Also we should note that
     // you will get error code 128 if you have git installed, but you did not pull this project
-    // using git because git will not know where to get the commit count from. This is likely
-    // true for Linux too.
+    // using git because git will not know where to get the commit count from. 
     new ByteArrayOutputStream().withStream { outputStream ->
       exec {
         executable 'git'
@@ -381,7 +384,7 @@ task(updateBuildNumber)  {
     // save buildnumber to file
     // we'll be referencing it later
     // Eventually we'll do this, but for now, fetch it every time
-    // new File('.buildnumber').write(buildVersion)
+    new File('.buildnumber').write(buildVersion)
   }
 }
 
@@ -406,7 +409,7 @@ compileJava.dependsOn updateBuildNumber
 sageJar.dependsOn cleanSageJar, classes, test
 miniclientJar.dependsOn clean, miniclientClasses, cleanMiniJar
 linuxMiniClientRelease.dependsOn miniclientJar
-sageJar.finalizedBy restoreSageConstants
+//sageJar.finalizedBy restoreSageConstants
 
 // Eclipse project setup
 eclipse {

build/buildmplayer.sh

@@ -38,7 +38,7 @@ if [ "$MPLAYER_NEW" = "1" ] ; then
 else
 	# use legacy mplayer build
 	cd ../third_party/mplayer/
-	LDFLAGS="-no-pie" ./configure --host-cc=gcc --disable-gcc-check --enable-runtime-cpudetection --disable-mencoder --disable-gl --enable-directx --enable-largefiles --disable-langinfo --disable-tv --disable-dvdread --disable-dvdread-internal --disable-menu --disable-libdvdcss-internal --enable-pthreads --disable-debug --disable-freetype --disable-fontconfig --enable-stv --enable-stream-sagetv --disable-ivtv --disable-x264 --extra-libs=-lpthread --disable-png || { echo "Build failed, exiting."; exit 1; }
+	LDFLAGS="-no-pie" ./configure --host-cc=gcc --disable-gcc-check --enable-runtime-cpudetection --disable-mencoder --disable-gl --enable-directx --enable-largefiles --disable-langinfo --disable-tv --disable-dvdread --disable-dvdread-internal --disable-menu --disable-libdvdcss-internal --enable-pthreads --disable-debug --disable-freetype --disable-fontconfig --enable-stv --enable-stream-sagetv --disable-ivtv --disable-x264 --extra-libs="-lpthread -pthread" --disable-png || { echo "Build failed, exiting."; exit 1; }
 	make -j32 || { echo "Build failed, exiting."; exit 1; }
   echo "Built OLD mplayer"
 	cp -v mplayer ../../build/elf

java/sage/SageConstants.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 The SageTV Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package sage;
+
+public final class SageConstants
+{
+  private SageConstants()
+  {
+    // Non-instantiable
+  }
+
+  public static final int BUILD_VERSION = 1056;
+}

native/so/HDHomeRun2.0/DTVChannel.cpp

@@ -463,10 +463,10 @@ int DTVChannel::setTuning(SageTuningParams *params)
 		}
 
 		if(dbg->debug_source[0]) {
-			if(dbg->source_fd > 0)
+			if(dbg->source_fd != 0)
 				fclose(dbg->source_fd);
 			dbg->source_fd = fopen(dbg->debug_source, "r");
-			if(dbg->source_fd > 0)
+			if(dbg->source_fd != 0)
 				flog("Native.log", "DTVChannel: Debug source file open: %s mode:%d (%d).\r\n",
 					  dbg->debug_source, dbg->debug_source_mode, dbg->source_fd );
 		}
@@ -712,7 +712,7 @@ void DTVChannel::splitStream(void *buffer, size_t size)
 	//flog("Native.log", "DTVChannel::splitStream(%p, %d this:0x%x 0x%x 0x%x)\r\n", buffer, size,  (uint32_t)this,
 	//         parserEnabled, scanChannelEnabled  );
 	mBytesIn += (off_t)size;
-	if ( 0 && dbg->dump_fd > 0 && dbg->dump_size > dbg->dumped_bytes )
+	if ( 0 && dbg->dump_fd != 0 && dbg->dump_size > dbg->dumped_bytes )
 	{
 		fwrite( pData, 1, lDataLen, dbg->dump_fd );
 		dbg->dumped_bytes += lDataLen;
@@ -1417,7 +1417,7 @@ int DTVChannel::scanChannelState( int *pScanState, int *pFoundChannelNum )
 	ASSERT( scanFilter != NULL );
 	*pScanState = ScanChannelState( scanFilter );
 	*pFoundChannelNum = ScanChannelNum( scanFilter );
-	return pScanState > 0;
+	return pScanState != 0;
 }
 
 int DTVChannel::scanChannelList( void** ppChannelList  )

third_party/mplayer/stream/stream_sagetv.c

@@ -664,7 +664,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
 #ifdef CONFIG_DARWIN
 		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 #else
-		pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 #endif
 		if (pthread_mutex_init(p->mutex, &attr) != 0)
 		{