diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2021-01-19 06:31:42 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2021-01-19 06:31:42 +0000 |
| commit | 2343820f5036556a8d2192b5fc9cb2250b9ddd22 (patch) | |
| tree | be0af19ee2bd29f0c505461210987ec7775afcf8 /multimedia/handbrake | |
| parent | 0afc732b292634d3f3567f3c69c4cdf7d7fe8776 (diff) | |
| download | ports-2343820f5036556a8d2192b5fc9cb2250b9ddd22.tar.gz ports-2343820f5036556a8d2192b5fc9cb2250b9ddd22.zip | |
- Fix build when multimedia/dav1d is not installed. This can happen
when multimedia/ffmpeg is compiled with no DAV1D option.
- Split mkdir ${WRKSRC}/download from copying files into it.
Submitted by: Mike Cui
Approved by: Yuichiro NAITO (maintainer)
PR: 251044
Notes
Notes:
svn path=/head/; revision=562028
Diffstat (limited to 'multimedia/handbrake')
| -rw-r--r-- | multimedia/handbrake/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index bbe1be4ac420..0c0afe33280e 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -3,7 +3,7 @@ PORTNAME= handbrake DISTVERSION= 1.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia DIST_SUBDIR= ${PORTNAME} @@ -117,9 +117,11 @@ X11_USE= gstreamer1=gdkpixbuf,libav \ # considered good in FreeBSD. Instead, we will provide the downloaded files. post-extract: .SILENT ${MKDIR} ${WRKSRC}/download -.for f in ${CONTRIB_FILES} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download -.endfor + +pre-configure: + cd ${DISTDIR}/${DIST_SUBDIR} && \ + ${INSTALL_DATA} ${CONTRIB_FILES} \ + ${WRKSRC}/download # Install version information. ${CP} ${FILESDIR}/version.txt ${WRKSRC} # Following patches reduces warnings with clang. diff --git a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs index 5b9155ee0367..4fb336e67c57 100644 --- a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs +++ b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs @@ -1,6 +1,10 @@ ---- contrib/ffmpeg/module.defs.orig 2019-11-09 20:44:32 UTC +--- contrib/ffmpeg/module.defs.orig 2020-06-13 14:05:35 UTC +++ contrib/ffmpeg/module.defs -@@ -60,7 +60,7 @@ FFMPEG.CONFIGURE.extra = \ +@@ -57,10 +57,11 @@ FFMPEG.CONFIGURE.extra = \ + --disable-decoder=*_crystalhd \ + --enable-libdav1d \ + --enable-decoder=libdav1d \ ++ --pkg-config-flags=--static \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" |