Sun Sep 10 00:28:29 2017 UTC ()
Requires -fheinous-gnu-extensions with clang.


(dholland)
diff -r1.42 -r1.43 pkgsrc/multimedia/handbrake/Makefile
cvs diff -r1.42 -r1.43 pkgsrc/multimedia/handbrake/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/Makefile 2017/02/12 06:25:47 1.42
+++ pkgsrc/multimedia/handbrake/Makefile 2017/09/10 00:28:28 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.42 2017/02/12 06:25:47 ryoon Exp $ 1# $NetBSD: Makefile,v 1.43 2017/09/10 00:28:28 dholland Exp $
2# 2#
3 3
4DISTNAME= HandBrake-0.9.3 4DISTNAME= HandBrake-0.9.3
5PKGNAME= ${DISTNAME:S/HandBrake/handbrake/} 5PKGNAME= ${DISTNAME:S/HandBrake/handbrake/}
6PKGREVISION= 32 6PKGREVISION= 32
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= http://download.m0k.org/handbrake/releases/ 8MASTER_SITES= http://download.m0k.org/handbrake/releases/
9MASTER_SITES+= http://download.m0k.org/handbrake/contrib/ 9MASTER_SITES+= http://download.m0k.org/handbrake/contrib/
10MASTER_SITES+= ${MASTER_SITE_FREEBSD:=handbrake/} 10MASTER_SITES+= ${MASTER_SITE_FREEBSD:=handbrake/}
11 11
12DIST_SUBDIR= handbrake 12DIST_SUBDIR= handbrake
13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 14DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -57,26 +57,32 @@ BUILD_DEPENDS+= gettext-m4-[0-9]*:../../ @@ -57,26 +57,32 @@ BUILD_DEPENDS+= gettext-m4-[0-9]*:../../
57 57
58CLI_CONFIGURE_ARGS= --release 58CLI_CONFIGURE_ARGS= --release
59 59
60# harfbuzz, which is now separate from pango, installs a header file 60# harfbuzz, which is now separate from pango, installs a header file
61# called hb.h, and the include path plopped out by autocrap causes it 61# called hb.h, and the include path plopped out by autocrap causes it
62# to be included instead of handbrake's own hb.h. Hack around it by 62# to be included instead of handbrake's own hb.h. Hack around it by
63# changing the include name to point specifically at the right hb.h. 63# changing the include name to point specifically at the right hb.h.
64SUBST_CLASSES+= inchack 64SUBST_CLASSES+= inchack
65SUBST_STAGE.inchack= pre-configure 65SUBST_STAGE.inchack= pre-configure
66SUBST_FILES.inchack= gtk/src/*.[ch] 66SUBST_FILES.inchack= gtk/src/*.[ch]
67SUBST_SED.inchack= -e "/^.include \"hb\.h\"/s,hb,../../libhb/hb," 67SUBST_SED.inchack= -e "/^.include \"hb\.h\"/s,hb,../../libhb/hb,"
68SUBST_MESSAGE.inchack= Working around harfbuzz header conflict. 68SUBST_MESSAGE.inchack= Working around harfbuzz header conflict.
69 69
 70.include "../../mk/compiler.mk"
 71
 72.if !empty(PKGSRC_COMPILER:Mclang)
 73CFLAGS+= -fheinous-gnu-extensions
 74.endif
 75
70post-extract: 76post-extract:
71 cp ${FILESDIR}/patch-ffmpeg-nodocs.patch \ 77 cp ${FILESDIR}/patch-ffmpeg-nodocs.patch \
72 ${WRKSRC}/contrib/ 78 ${WRKSRC}/contrib/
73.for distfile in ${CDISTFILES} 79.for distfile in ${CDISTFILES}
74 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \ 80 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
75 ${WRKSRC}/contrib/${distfile:C/-.*//}.tar.gz 81 ${WRKSRC}/contrib/${distfile:C/-.*//}.tar.gz
76.endfor 82.endfor
77 83
78pre-configure: 84pre-configure:
79 cd ${WRKSRC}/gtk && autoreconf -fi 85 cd ${WRKSRC}/gtk && autoreconf -fi
80 86
81do-configure: 87do-configure:
82 cd ${WRKSRC} && ./configure ${CLI_CONFIGURE_ARGS} 88 cd ${WRKSRC} && ./configure ${CLI_CONFIGURE_ARGS}