xrdpvr was successfully recompiled at Fedora 35 (ffmpeg 4.4.3)

.github/workflows/build.yml

@@ -96,7 +96,7 @@ jobs:
                   --disable-pixman"
       CONF_FLAGS_amd64_max: "--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
                   --enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter
-                  --enable-pixman --with-imlib2 --with-freetype2"
+                  --enable-pixman --enable-xrdpvr --with-imlib2 --with-freetype2"
       CONF_FLAGS_i386_max: "--enable-ipv6 --enable-jpeg --enable-mp3lame
                   --enable-opus --enable-rfxcodec --enable-painter
                   --disable-pixman --with-imlib2 --with-freetype2

configure.ac

@@ -530,6 +530,55 @@ if test "x$enable_strict_locations" != "xyes"; then
   localstatedir="/var";
 fi
 
+# checking for ffmpeg-devel
+if test "x$enable_xrdpvr" = xyes; then
+    save_CC="$CC"
+
+    # For some strange reason, at Ubuntu 20.04 g++ compiles conftest.c
+    # as if it were a c++ program, with c++ mangling, which causes
+    # some AC_CHECK_LIB tests to fail
+    #
+    # So here we implement an ugly workaround by temporary replacing
+    # CC="g++" with CC="gcc", only for tests
+    if test "x$CC" = "xg++"; then
+        CC="gcc"
+    fi
+
+    PKG_CHECK_MODULES([LIBAV], libavformat libavcodec, [],
+      [AC_MSG_ERROR([please install libavcodec-dev libavformat-dev or ffmpeg-devel])])
+
+    AC_CHECK_LIB(avformat, avformat_open_input,
+                 AC_DEFINE([HAVE_AVFORMAT_OPEN_INPUT], 1,
+                           [Use avformat_open_input instead of av_open_input_file], []))
+
+    AC_CHECK_LIB(avformat, avformat_close_input,
+                 AC_DEFINE([HAVE_AVFORMAT_CLOSE_INPUT], 1,
+                           [Use avformat_close_input instead of av_close_input_file], []))
+
+    AC_CHECK_LIB(avformat, avformat_find_stream_info,
+                 AC_DEFINE([HAVE_AVFORMAT_FIND_STREAM_INFO], 1,
+                           [Use avformat_find_stream_info instead of av_find_stream_info], []))
+
+    AC_CHECK_LIB(avcodec, avcodec_open2,
+                 AC_DEFINE([HAVE_AVCODEC_OPEN2], 1,
+                           [Use avcodec_open2 instead of avcodec_open], []))
+
+    AC_CHECK_LIB(avcodec, av_destruct_packet,
+                 AC_DEFINE([HAVE_AV_DESTRUCT_PACKET], 1,
+                           [av_destruct_packet is available], []))
+
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$LIBAV_CFLAGS"
+    AC_CHECK_DECLS(AV_CODEC_ID_AAC,,, [#include <libavcodec/avcodec.h>])
+    AC_CHECK_DECLS(AV_CODEC_ID_H264,,, [#include <libavcodec/avcodec.h>])
+    AC_CHECK_DECLS(AVMEDIA_TYPE_AUDIO,,, [#include <libavcodec/avcodec.h>])
+    AC_CHECK_DECLS(AVMEDIA_TYPE_VIDEO,,, [#include <libavcodec/avcodec.h>])
+    AC_CHECK_DECLS(AV_PKT_FLAG_KEY,,, [#include <libavcodec/avcodec.h>])
+
+    CFLAGS="$save_CFLAGS"
+    CC="$save_CC"
+fi
+
 PKG_INSTALLDIR
 
 AC_CHECK_HEADERS([sys/prctl.h])

scripts/install_xrdp_build_dependencies_with_apt.sh

@@ -88,6 +88,8 @@ in
                 PACKAGES="$PACKAGES \
                     $PACKAGES_AMD64_MIN
                     $LIBFREETYPE_DEV \
+		    libavcodec-dev \
+		    libavformat-dev \
                     libfuse-dev \
                     libjpeg-dev \
                     libmp3lame-dev \

xrdpvr/Makefile.am

@@ -1,7 +1,14 @@
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/xrdpapi \
+  $(LIBAV_CFLAGS)
+
 module_LTLIBRARIES = \
   libxrdpvr.la
 
 libxrdpvr_la_SOURCES = \
   xrdpvr.c \
   xrdpvr.h \
   xrdpvr_internal.h
+
+libxrdpvr_la_LIBADD = \
+  $(LIBAV_LIBS)