diff --git a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs index 8803450232a6..5b9155ee0367 100644 --- a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs +++ b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs @@ -1,16 +1,6 @@ --- contrib/ffmpeg/module.defs.orig 2019-11-09 20:44:32 UTC +++ contrib/ffmpeg/module.defs -@@ -1,7 +1,9 @@ - __deps__ := BZIP2 ZLIB FDKAAC LIBDAV1D LIBVPX LAME LIBOPUS LIBSPEEX XZ - ifeq (1,$(FEATURE.qsv)) -+ifeq (,$(filter $(HOST.system),freebsd)) - __deps__ += LIBMFX - endif -+endif - ifeq (1,$(FEATURE.vce)) - __deps__ += AMF - endif -@@ -60,7 +62,7 @@ FFMPEG.CONFIGURE.extra = \ +@@ -60,7 +60,7 @@ FFMPEG.CONFIGURE.extra = \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" diff --git a/multimedia/handbrake/files/patch-libhb_module.defs b/multimedia/handbrake/files/patch-libhb_module.defs deleted file mode 100644 index f91fb8b75f66..000000000000 --- a/multimedia/handbrake/files/patch-libhb_module.defs +++ /dev/null @@ -1,32 +0,0 @@ ---- libhb/module.defs.orig 2019-11-09 20:44:32 UTC -+++ libhb/module.defs -@@ -1,12 +1,16 @@ - __deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \ - LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \ -- LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \ -+ LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBGNURX JANSSON \ - HARFBUZZ LIBOPUS LIBSPEEX LIBDAV1D - - ifeq (,$(filter $(HOST.system),darwin cygwin mingw)) - __deps__ += FONTCONFIG - endif - -+ifeq (,$(filter $(HOST.system),freebsd)) -+ __deps__ += LIBMFX -+endif -+ - $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) - $(eval $(call import.GCC,LIBHB)) - -@@ -111,7 +115,11 @@ LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a - endif - - ifeq (1,$(FEATURE.qsv)) -+ifeq (,$(filter $(HOST.system),freebsd)) - LIBHB.dll.libs += $(CONTRIB.build/)lib/libmfx.a -+else -+ LIBHB.GCC.l += mfx -+endif - endif - - ifeq (1,$(FEATURE.x265)) diff --git a/multimedia/handbrake/files/patch-make_include_main.defs b/multimedia/handbrake/files/patch-make_include_main.defs index ab9f3cbd4109..76608653f9a3 100644 --- a/multimedia/handbrake/files/patch-make_include_main.defs +++ b/multimedia/handbrake/files/patch-make_include_main.defs @@ -1,11 +1,10 @@ --- make/include/main.defs.orig 2019-11-09 20:44:32 UTC +++ make/include/main.defs -@@ -52,8 +52,10 @@ MODULES += contrib/libdvdread - MODULES += contrib/libdvdnav +@@ -53,7 +53,9 @@ MODULES += contrib/libdvdnav MODULES += contrib/libbluray -+ifneq (,$(filter $(HOST.system),freebsd)) ifeq (1,$(FEATURE.qsv)) ++ifeq (,$(filter $(HOST.system),freebsd)) MODULES += contrib/libmfx +endif endif