Date: Fri, 3 Jan 2020 18:45:04 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521951 - head/multimedia/handbrake/files Message-ID: <202001031845.003Ij4vT041676@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Jan 3 18:45:03 2020 New Revision: 521951 URL: https://svnweb.freebsd.org/changeset/ports/521951 Log: multimedia/handbrake: fix r521913 upstreaming issues - Unbreak QSV build on non-FreeBSD - LIBHB.dll is only used on MinGW - No need to touch __deps__, just exclude MODULE PR: 242849 Deleted: head/multimedia/handbrake/files/patch-libhb_module.defs Modified: head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs (contents, props changed) head/multimedia/handbrake/files/patch-make_include_main.defs (contents, props changed) Modified: head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs ============================================================================== --- head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs Fri Jan 3 16:57:10 2020 (r521950) +++ head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs Fri Jan 3 18:45:03 2020 (r521951) @@ -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)" Modified: head/multimedia/handbrake/files/patch-make_include_main.defs ============================================================================== --- head/multimedia/handbrake/files/patch-make_include_main.defs Fri Jan 3 16:57:10 2020 (r521950) +++ head/multimedia/handbrake/files/patch-make_include_main.defs Fri Jan 3 18:45:03 2020 (r521951) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001031845.003Ij4vT041676>