StepMania: use separate patches depending on ffmpeg version

Author: theofficialgman

apps/StepMania/install

@@ -83,8 +83,46 @@ index c092b76..36a6cf1 100644
 
 EOF
 
+cat << 'EOF' >> pre-7.1-ffmpeg.patch
+diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+index 935ddf324b0..d4eed01d599 100644
+--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
++++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+@@ -405,7 +405,7 @@ void MovieTexture_FFMpeg::RegisterProtocols()
+ 		return;
+ 	Done = true;
+ 
+-#if !FF_API_NEXT
++#if LIBAVCODEC_VERSION_MAJOR < 58
+ 	avcodec::avcodec_register_all();
+ 	avcodec::av_register_all();
+ #endif
+@@ -508,7 +508,7 @@ RString MovieDecoder_FFMpeg::OpenCodec()
+ 	if( m_pStreamCodec->codec )
+ 		avcodec::avcodec_close( m_pStreamCodec );
+ 
+-	avcodec::AVCodec *pCodec = avcodec::avcodec_find_decoder( m_pStreamCodec->codec_id );
++	const avcodec::AVCodec *pCodec = avcodec::avcodec_find_decoder( m_pStreamCodec->codec_id );
+ 	if( pCodec == nullptr )
+ 		return ssprintf( "Couldn't find decoder %i", m_pStreamCodec->codec_id );
+ 
+diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/src/arch/MovieTexture/MovieTexture_FFMpeg.h
+index c092b765fc2..99f5ffcb1be 100644
+--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.h
++++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.h
+@@ -13,6 +13,7 @@ namespace avcodec
+ 		#include <libavformat/avformat.h>
+ 		#include <libswscale/swscale.h>
+ 		#include <libavutil/pixdesc.h>
++		#include <libavcodec/avcodec.h>
+ 
+ 		#if LIBAVCODEC_VERSION_MAJOR >= 57
+ 		#define av_free_packet av_packet_unref
+
+EOF
+
 # minor edits from https://github.com/h-lunah/stepmania-ddr/commit/46ad6dae13d9c2786147a38bfbd3b3812573ad22.patch
-cat << 'EOF' >> newer-ffmpeg.patch
+cat << 'EOF' >> 7.1-ffmpeg.patch
 diff --git a/src/CMakeData-arch.cmake b/src/CMakeData-arch.cmake
 index 1c330a50bbc..6c3a6f24865 100644
 --- a/src/CMakeData-arch.cmake
@@ -151,7 +189,13 @@ index c092b765fc2..99f5ffcb1be 100644
 EOF
 
 git apply 0001-patch-upstream-for-ARM.patch || error "Applying patch failed"
-git apply newer-ffmpeg.patch || error "Applying patch failed"
+
+ffmpeg_version="$(package_latest_version ffmpeg | awk -F'[:.-]' '{print $2 $3}')"
+if [ "$ffmpeg_version" -ge 71 ] ; then
+  git apply 7.1-ffmpeg.patch || error "Applying patch failed"
+else
+  git apply pre-7.1-ffmpeg.patch || error "Applying patch failed"
+fi
 
 mkdir build && cd build || error "Could not create or enter build directory"
 status "Running cmake"