gerbera: add support for ffmpeg

Requires BUILD_PATENTED.

Added patch to fix compilation with it.

Removed include file hack. It's incorrect and it's also npupnp that
needs fixing.

Refreshed npupnp patch to the newest version sent upstream.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

multimedia/gerbera/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
@@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=LICENSE.md
 
 PKG_BUILD_DEPENDS:=libmatroska pugixml spdlog taglib
 PKG_BUILD_PARALLEL:=1
+PKG_CONFIG_DEPENDS:=CONFIG_BUILD_PATENTED
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -29,7 +30,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/gerbera
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+file +libnpupnp +libsqlite3 +libexif +libuuid +libfmt $(ICONV_DEPENDS)
+  DEPENDS:=+file +libnpupnp +libsqlite3 +libexif +libuuid +libfmt +BUILD_PATENTED:libffmpeg $(ICONV_DEPENDS)
   TITLE:=A free media server
   URL:=https://gerbera.io
   USERID:=gerbera:gerbera
@@ -54,7 +55,7 @@ CMAKE_OPTIONS += \
 	-DWITH_INOTIFY=ON \
 	-DWITH_JS=OFF \
 	-DWITH_TAGLIB=ON \
-	-DWITH_AVCODEC=OFF \
+	-DWITH_AVCODEC=$(if $(CONFIG_BUILD_PATENTED),ON,OFF) \
 	-DWITH_FFMPEGTHUMBNAILER=OFF \
 	-DWITH_EXIF=ON \
 	-DWITH_EXIV2=OFF \
@@ -62,12 +63,14 @@ CMAKE_OPTIONS += \
 	-DWITH_SYSTEMD=OFF \
 	-DWITH_LASTFM=OFF \
 	-DWITH_DEBUG=OFF \
-	-DWITH_TESTS=OFF
+	-DWITH_TESTS=OFF \
+	-DWITH_NPUPNP=ON
 
 TARGET_CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections \
-	-flto
+	-flto \
+	-I$(STAGING_DIR)/usr/include/npupnp/upnp
 
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed