net-misc/gerbera-1.5.0-r2 : /.../upnp_headers.h: fatal error: ExtraHeaders.h: No such file or directory

Since I've upgraded net-libs/libupnp from 1.12.1 to 1.14.0, the emerge of net-misc/gerbera-1.5.0-r2 got failed. Someone reported the same isssue on Gentoo bugzilla (https://bugs.gentoo.org/738974), but no resoluation is mentioned on it. 

Anyway, the error is simply because header file "ExtraHeaders.h", which was included in libupnp up to verison 1.12.1, is missing from libupnp version 1.14.0. The error message of the compilation step got failed is as below. 

[7/95] /usr/bin/x86_64-pc-linux-gnu-g++ -DATRAILERS -DFMT_LOCALE -DFMT_SHARED -DHAVE_AVSTREAM_CODECPAR -DHAVE_CURL -DHAVE_FFMPEG -DHAVE_INOTIFY -DHAVE_JS -DHAVE_LIBEXIF -DHAVE_MAGIC -DHAVE_MATROSKA -DHAVE_MYSQL -DHAVE_NL_LANGINFO -DHAVE_SETLOCALE -DHAVE_SQLITE3 -DHAVE_TAGLIB -DONLINE_SERVICES -DPACKAGE_DATADIR=\"/usr/share/gerbera\" -DPACKAGE_NAME=\"Gerbera\" -DSOPCAST -DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_INFO -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -DSPDLOG_SHARED_LIB -DVERSION=\"1.5.0\" -I/data2/var/tmp/portage/portage/net-misc/gerbera-1.5.0-r2/work/gerbera-1.5.0/src -I/usr/include/upnp -I/usr/include/mysql -I/usr/include/libexif -I/usr/include/matroska -I/usr/include/ebml  -O2 -march=core-avx-i -pipe -Wall   -std=c++17 -MD -MT CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o -MF CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o.d -o CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o -c /data2/var/tmp/portage/portage/net-misc/gerbera-1.5.0-r2/work/gerbera-1.5.0/src/file_request_handler.cc
FAILED: CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o
/usr/bin/x86_64-pc-linux-gnu-g++ -DATRAILERS -DFMT_LOCALE -DFMT_SHARED -DHAVE_AVSTREAM_CODECPAR -DHAVE_CURL -DHAVE_FFMPEG -DHAVE_INOTIFY -DHAVE_JS -DHAVE_LIBEXIF -DHAVE_MAGIC -DHAVE_MATROSKA -DHAVE_MYSQL -DHAVE_NL_LANGINFO -DHAVE_SETLOCALE -DHAVE_SQLITE3 -DHAVE_TAGLIB -DONLINE_SERVICES -DPACKAGE_DATADIR=\"/usr/share/gerbera\" -DPACKAGE_NAME=\"Gerbera\" -DSOPCAST -DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_INFO -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -DSPDLOG_SHARED_LIB -DVERSION=\"1.5.0\" -I/data2/var/tmp/portage/portage/net-misc/gerbera-1.5.0-r2/work/gerbera-1.5.0/src -I/usr/include/upnp -I/usr/include/mysql -I/usr/include/libexif -I/usr/include/matroska -I/usr/include/ebml  -O2 -march=core-avx-i -pipe -Wall   -std=c++17 -MD -MT CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o -MF CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o.d -o CMakeFiles/libgerbera.dir/src/file_request_handler.cc.o -c /data2/var/tmp/portage/portage/net-misc/gerbera-1.5.0-r2/work/gerbera-1.5.0/src/file_request_handler.cc
In file included from /data2/var/tmp/portage/portage/net-misc/gerbera-1.5.0-r2/work/gerbera-1.5.0/src/file_request_handler.cc:49:
/data2/var/tmp/portage/portage/net-misc/gerbera-1.5.0-r2/work/gerbera-1.5.0/src/util/upnp_headers.h:29:10: fatal error: ExtraHeaders.h: No such file or directory
   29 | #include <ExtraHeaders.h>
      |          ^~~~~~~~~~~~~~~~
compilation terminated.

Then, I created symlink ExtraHeaders.h from new version of ExtraHeaders.h included in 1.14.0. 

# ln -s /usr/include/upnp/UpnpExtraHeaders.h /usr/include/upnp/ExtraHeaders.h

This simple change allows you to compile net-misc/gerbera-1.5.0-r2 without any errors.