@@ -21,7 +21,7 @@

 License:        GPL-2.0-only

 Version:        2.8.1

 Release:        0

-URL:            http://avidemux.sourceforge.net/

+URL:            https://github.com/mean00/avidemux2

 ExclusiveArch:  %ix86 x86_64

 Source0:        https://github.com/mean00/avidemux2/releases/download/%{version}/avidemux_%{version}.tar.gz

 Patch0:         %name.patch

@@ -47,7 +47,9 @@

 BuildRequires:  yasm

 BuildRequires:  pkgconfig(vapoursynth)

 BuildRequires:  pkgconfig(vapoursynth-script)

+%if %suse_version < 1600

 BuildRequires:  pkgconfig(ffnvcodec) > 8

+%endif

 BuildRequires:  pkgconfig(fontconfig)

 BuildRequires:  pkgconfig(freetype2)

 BuildRequires:  pkgconfig(fribidi)

@@ -334,8 +336,10 @@

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so

+%if %suse_version < 1600

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvencH264.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvencHEVC.so

+%endif

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffv1.so

​

@@ -1,15 +0,0 @@

---- cmake/admCheckRequiredLibs.cmake.orig  2023-02-03 14:58:30.448925032 +0100

-+++ cmake/admCheckRequiredLibs.cmake   2023-02-03 14:58:30.464924977 +0100

-@@ -16,9 +16,9 @@

-        endif (DEFINED PKGCONFIG_FOUND)

- endif (${CMAKE_VERSION} VERSION_EQUAL 2.8.8)

- 

--IF (NOT PKG_CONFIG_FOUND)

--  MESSAGE(FATAL_ERROR "Could not find pkg-config")

--ENDIF (NOT PKG_CONFIG_FOUND)

-+#IF (NOT PKG_CONFIG_FOUND)

-+# MESSAGE(FATAL_ERROR "Could not find pkg-config")

-+#ENDIF (NOT PKG_CONFIG_FOUND)

- 

- MESSAGE(STATUS "Found pkg-config")

- 

​

@@ -1,3 +1,8 @@

+---

+ avidemux_core/ffmpeg_package/patches/upstream/avcodec-x86-mathops-clip-constants-used-with-shift-i.patch |   73 ++++++++++

+ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp                                                 |    8 +

+ 2 files changed, 81 insertions(+)

+

 --- /dev/null

 +++ b/avidemux_core/ffmpeg_package/patches/upstream/avcodec-x86-mathops-clip-constants-used-with-shift-i.patch

 @@ -0,0 +1,73 @@

@@ -74,3 +79,27 @@

 +     return a;

 + }

 + 

+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp

++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp

+@@ -207,13 +207,21 @@

+                         {

+                              param.rc.bStatWrite=1;

+                              param.rc.bStatRead=0;

++#if X265_BUILD >= 213

++                             snprintf(param.rc.statFileName, sizeof(param.rc.statFileName), "%s", logFile);

++#else

+                              param.rc.statFileName=strdup(logFile);

++#endif

+  

+                         }else

+                         {

+                              param.rc.bStatWrite=0;

+                              param.rc.bStatRead=1;

++#if X265_BUILD >= 213

++                             snprintf(param.rc.statFileName, sizeof(param.rc.statFileName), "%s", logFile);

++#else

+                              param.rc.statFileName=strdup(logFile);

++#endif

+                              if(!ADM_fileExist(logFile))

+                              {

+                                    ADM_error("Logfile %s does not exist \n",logFile);

​