svn commit: r562028 - in head/multimedia/handbrake: . files
Hiroki Sato
hrs at FreeBSD.org
Tue Jan 19 06:31:43 UTC 2021
Author: hrs
Date: Tue Jan 19 06:31:42 2021
New Revision: 562028
URL: https://svnweb.freebsd.org/changeset/ports/562028
Log:
- 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
Modified:
head/multimedia/handbrake/Makefile
head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs
Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile Tue Jan 19 06:04:07 2021 (r562027)
+++ head/multimedia/handbrake/Makefile Tue Jan 19 06:31:42 2021 (r562028)
@@ -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.
Modified: head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs
==============================================================================
--- head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs Tue Jan 19 06:04:07 2021 (r562027)
+++ head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs Tue Jan 19 06:31:42 2021 (r562028)
@@ -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)"
More information about the svn-ports-head
mailing list