mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

multimedia/handbrake: fix r521913 upstreaming issues

Browse Source 
- Unbreak QSV build on non-FreeBSD
- LIBHB.dll is only used on MinGW
- No need to touch __deps__, just exclude MODULE

PR:		242849
This commit is contained in:
Jan Beich 2020-01-03 18:45:03 +00:00
parent 0628bd1c7e
commit 2ea470d6c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=521951
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs
View File

@ -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)"

32
multimedia/handbrake/files/patch-libhb_module.defs
View File

@ -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))

5
multimedia/handbrake/files/patch-make_include_main.defs
View File

@ -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