Fri Dec 21 05:33:47 2012 UTC ()
Work around header naming conflict with harfbuzz. Fixes build.


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

--- pkgsrc/multimedia/handbrake/Makefile 2012/10/08 23:02:11 1.23
+++ pkgsrc/multimedia/handbrake/Makefile 2012/12/21 05:33:47 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2012/10/08 23:02:11 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2012/12/21 05:33:47 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= 17 6PKGREVISION= 17
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= http://download.m0k.org/handbrake/releases/ \ 8MASTER_SITES= http://download.m0k.org/handbrake/releases/ \
9 http://download.m0k.org/handbrake/contrib/ 9 http://download.m0k.org/handbrake/contrib/
10 10
11DIST_SUBDIR= handbrake 11DIST_SUBDIR= handbrake
12EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 12EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
13DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 13DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
14CDISTFILES= a52dec-0.7.4.tar.gz \ 14CDISTFILES= a52dec-0.7.4.tar.gz \
@@ -45,26 +45,36 @@ NO_SRC_ON_FTP= ${RESTRICTED} @@ -45,26 +45,36 @@ NO_SRC_ON_FTP= ${RESTRICTED}
45 45
46GNU_CONFIGURE= yes 46GNU_CONFIGURE= yes
47USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash 47USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash
48USE_TOOLS+= autoconf automake aclocal autoreconf m4 48USE_TOOLS+= autoconf automake aclocal autoreconf m4
49USE_LIBTOOL= yes 49USE_LIBTOOL= yes
50USE_LANGUAGES= c c++ 50USE_LANGUAGES= c c++
51 51
52BUILD_DEPENDS+= jam>=2.5.2:../../devel/jam 52BUILD_DEPENDS+= jam>=2.5.2:../../devel/jam
53BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm 53BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm
54BUILD_DEPENDS+= yasm>=0.6.1:../../devel/yasm 54BUILD_DEPENDS+= yasm>=0.6.1:../../devel/yasm
55 55
56CLI_CONFIGURE_ARGS= --release 56CLI_CONFIGURE_ARGS= --release
57 57
 58# harfbuzz, which is now separate from pango, installs a header file
 59# called hb.h, and the include path plopped out by autocrap causes it
 60# to be included instead of handbrake's own hb.h. Hack around it by
 61# changing the include name to point specifically at the right hb.h.
 62SUBST_CLASSES+= inchack
 63SUBST_STAGE.inchack= pre-configure
 64SUBST_FILES.inchack= gtk/src/*.[ch]
 65SUBST_SED.inchack= -e "/^.include \"hb\.h\"/s,hb,../../libhb/hb,"
 66SUBST_MESSAGE.inchack= Working around harfbuzz header conflict.
 67
58post-extract: 68post-extract:
59 cp ${FILESDIR}/patch-ffmpeg-nodocs.patch \ 69 cp ${FILESDIR}/patch-ffmpeg-nodocs.patch \
60 ${WRKSRC}/contrib/ 70 ${WRKSRC}/contrib/
61.for distfile in ${CDISTFILES} 71.for distfile in ${CDISTFILES}
62 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \ 72 cp ${DISTDIR}/${DIST_SUBDIR}/${distfile} \
63 ${WRKSRC}/contrib/${distfile:C/-.*//}.tar.gz 73 ${WRKSRC}/contrib/${distfile:C/-.*//}.tar.gz
64.endfor 74.endfor
65 75
66pre-configure: 76pre-configure:
67 cd ${WRKSRC}/gtk && ./autogen.sh 77 cd ${WRKSRC}/gtk && ./autogen.sh
68 78
69do-configure: 79do-configure:
70 cd ${WRKSRC} && ./configure ${CLI_CONFIGURE_ARGS} 80 cd ${WRKSRC} && ./configure ${CLI_CONFIGURE_ARGS}