View | Details | Raw Unified | Return to bug 186387
Collapse All | Expand All

(-)Makefile (-31 / +33 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	handbrake
4
PORTNAME=	handbrake
5
PORTVERSION=	0.9.8
5
PORTVERSION=	0.9.9
6
PORTREVISION=	2
6
PORTREVISION=	1
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
8
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
9
		http://download.handbrake.fr/handbrake/contrib/:contrib
9
		http://download.handbrake.fr/handbrake/contrib/:contrib
Lines 11-34 Link Here
11
		a52dec-0.7.4.tar.gz:contrib \
11
		a52dec-0.7.4.tar.gz:contrib \
12
		faac-1.28.tar.gz:contrib \
12
		faac-1.28.tar.gz:contrib \
13
		faad2-2.7.tar.gz:contrib \
13
		faad2-2.7.tar.gz:contrib \
14
		ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \
14
		libav-v9.6.tar.bz2:contrib \
15
		fontconfig-2.8.0.tar.gz:contrib \
16
		freetype-2.4.7.tar.bz2:contrib \
17
		lame-3.98.tar.gz:contrib \
15
		lame-3.98.tar.gz:contrib \
18
		libass-0.10.0-1.tar.gz:contrib \
16
		libbluray-0.2.3.tar.bz2:contrib \
19
		libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib \
20
		libdca-r81-strapped.tar.gz:contrib \
17
		libdca-r81-strapped.tar.gz:contrib \
21
		libdvdnav-svn1168.tar.gz:contrib \
18
		libdvdnav-svn1168.tar.gz:contrib \
22
		libdvdread-svn1168.tar.gz:contrib \
19
		libdvdread-svn1168.tar.gz:contrib \
23
		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
20
		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
24
		libogg-1.3.0.tar.gz:contrib \
25
		libsamplerate-0.1.4.tar.gz:contrib \
26
		libtheora-1.1.0.tar.bz2:contrib \
27
		libvorbis-aotuv_b6.03.tar.bz2:contrib \
28
		libxml2-2.7.7.tar.gz:contrib \
29
		mp4v2-trunk-r355.tar.bz2:contrib \
21
		mp4v2-trunk-r355.tar.bz2:contrib \
30
		mpeg2dec-0.5.1.tar.gz:contrib \
22
		mpeg2dec-0.5.1.tar.gz:contrib \
31
		x264-r2146-bcd41db.tar.gz:contrib
23
		x264-r2273-b3065e6.tar.gz:contrib
32
DIST_SUBDIR=	${PORTNAME}
24
DIST_SUBDIR=	${PORTNAME}
33
25
34
MAINTAINER=	dmarion@FreeBSD.org
26
MAINTAINER=	dmarion@FreeBSD.org
Lines 37-46 Link Here
37
LICENSE=	GPLv2
29
LICENSE=	GPLv2
38
30
39
BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
31
BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
40
LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
32
LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
33
		libfreetype.so:${PORTSDIR}/print/freetype2 \
34
		libfribidi.so:${PORTSDIR}/converters/fribidi \
35
		libxml2.so:${PORTSDIR}/textproc/libxml2 \
36
		libass.so:${PORTSDIR}/multimedia/libass \
37
		libogg.so:${PORTSDIR}/audio/libogg \
38
		libvorbis.so:${PORTSDIR}/audio/libvorbis \
39
		libvorbisenc.so:${PORTSDIR}/audio/libvorbis \
40
		libtheoradec.so:${PORTSDIR}/multimedia/libtheora \
41
		libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \
42
		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
43
		
41
RUN_DEPENDS=	${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
44
RUN_DEPENDS=	${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
42
45
43
USES=		gmake pkgconfig
46
USES=		gmake pkgconfig iconv
47
USE_GCC=	any
44
USE_AUTOTOOLS=	libtool aclocal
48
USE_AUTOTOOLS=	libtool aclocal
45
LIBTOOLFILES=	configure
49
LIBTOOLFILES=	configure
46
USE_PYTHON_BUILD=	yes
50
USE_PYTHON_BUILD=	yes
Lines 92-98 Link Here
92
# considered good in FreeBSD.  Instead, we will prepare everything manually.
96
# considered good in FreeBSD.  Instead, we will prepare everything manually.
93
post-extract: .SILENT
97
post-extract: .SILENT
94
# Unversioned directories can be copied in a loop
98
# Unversioned directories can be copied in a loop
95
.for d in a52dec lame libdca libdvdnav libdvdread libsamplerate mpeg2dec x264
99
.for d in a52dec lame libdca libdvdnav libdvdread mpeg2dec x264
96
	${MKDIR} ${BUILD_WRKSRC}/contrib/${d}
100
	${MKDIR} ${BUILD_WRKSRC}/contrib/${d}
97
	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
101
	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
98
.endfor
102
.endfor
Lines 102-122 Link Here
102
		libxml2 mp4v2
106
		libxml2 mp4v2
103
	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
107
	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
104
	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
108
	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
105
	${MV} ${WRKDIR}/ffmpeg-v0.7-1696-gcae4f4b \
109
	${MV} ${WRKDIR}/libav-v9.6 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v9.6
106
		${BUILD_WRKSRC}/contrib/ffmpeg
110
	${MV} ${WRKDIR}/libbluray-0.2.3 ${BUILD_WRKSRC}/contrib/libbluray
107
	${MV} ${WRKDIR}/fontconfig-2.8.0 ${BUILD_WRKSRC}/contrib/fontconfig
108
	${MV} ${WRKDIR}/freetype-2.4.7 ${BUILD_WRKSRC}/contrib/freetype
109
	${MV} ${WRKDIR}/libass-0.10.0-1 ${BUILD_WRKSRC}/contrib/libass
110
	${MV} ${WRKDIR}/libbluray-0.0.1-pre-213-ga869da8 \
111
		${BUILD_WRKSRC}/contrib/libbluray
112
	${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${BUILD_WRKSRC}/contrib/libmkv
111
	${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${BUILD_WRKSRC}/contrib/libmkv
113
	${MV} ${WRKDIR}/libogg-1.3.0 ${BUILD_WRKSRC}/contrib/libogg
114
	${MV} ${WRKDIR}/libtheora-1.1.0 ${BUILD_WRKSRC}/contrib/libtheora
115
	${MV} ${WRKDIR}/aotuv-b6.03_20110424 ${BUILD_WRKSRC}/contrib/libvorbis
116
	${MV} ${WRKDIR}/libxml2-2.7.7 ${BUILD_WRKSRC}/contrib/libxml2
117
	${MV} ${WRKDIR}/mp4v2-trunk-r355 ${BUILD_WRKSRC}/contrib/mp4v2
112
	${MV} ${WRKDIR}/mp4v2-trunk-r355 ${BUILD_WRKSRC}/contrib/mp4v2
118
# Remove one patch file that does not apply cleanly
119
	${RM} ${WRKSRC}/contrib/fontconfig/A00-config.patch
120
# Avoid conflict with `print/harfbuzz' (also installs "hb.h")
113
# Avoid conflict with `print/harfbuzz' (also installs "hb.h")
121
	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h
114
	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h
122
115
Lines 124-138 Link Here
124
	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \
117
	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \
125
		${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c
118
		${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c
126
	@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \
119
	@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \
127
		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.0.1-pre-213-ga869da8/configure.ac
120
		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.2.3/configure.ac
128
	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
121
	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
129
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
122
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
130
		${WRKSRC}/contrib/libass/module.defs \
131
		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
123
		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
132
	@${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \
124
	@${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \
133
		${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c
125
		${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c
134
	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
126
	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
135
		${REINPLACE_CMD} -e '/#include/s|hb\.h|hb-of-handbrake.h|'
127
		${REINPLACE_CMD} -e '/#include/s|hb\.h|hb-of-handbrake.h|'
128
	@${REINPLACE_CMD} -e "s|ToolProbe( 'GCC.gcc',   'gcc',|ToolProbe( 'GCC.gcc',   '${CC}',|" \
129
		${WRKSRC}/make/configure.py 
130
	@${REINPLACE_CMD} -e 's|avcodec avformat avutil avresample|avformat avcodec avresample avutil|' \
131
		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs 
132
.if empty(ICONV_LIB)	
133
	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/test/module.defs
134
	@${REINPLACE_CMD} -e 's|LIBHB.GCC.l += iconv|LIBHB.GCC.l += |' ${WRKSRC}/libhb/module.defs
135
.endif
136
	${TR} -d '\r' < ${WRKSRC}/contrib/mpeg2dec/A02-gwluserdata.patch > ${WRKDIR}/A02-gwluserdata.patch
137
	${MV} ${WRKDIR}/A02-gwluserdata.patch ${WRKSRC}/contrib/mpeg2dec/
136
138
137
do-install:
139
do-install:
138
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
140
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
(-)distinfo (-24 / +8 lines)
Lines 1-5 Link Here
1
SHA256 (handbrake/HandBrake-0.9.8.tar.bz2) = dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798
1
SHA256 (handbrake/HandBrake-0.9.9.tar.bz2) = a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3
2
SIZE (handbrake/HandBrake-0.9.8.tar.bz2) = 3156964
2
SIZE (handbrake/HandBrake-0.9.9.tar.bz2) = 9315199
3
SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
3
SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
4
SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
4
SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
5
SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
5
SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
Lines 6-23 Link Here
6
SIZE (handbrake/faac-1.28.tar.gz) = 678891
6
SIZE (handbrake/faac-1.28.tar.gz) = 678891
7
SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
7
SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
8
SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
8
SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
9
SHA256 (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497
9
SHA256 (handbrake/libav-v9.6.tar.bz2) = ea41941866fb64d7e363684a4705574f65786bd9eb0fe1f796dee4c0d459aa52
10
SIZE (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = 4242565
10
SIZE (handbrake/libav-v9.6.tar.bz2) = 4672723
11
SHA256 (handbrake/fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
12
SIZE (handbrake/fontconfig-2.8.0.tar.gz) = 1548409
13
SHA256 (handbrake/freetype-2.4.7.tar.bz2) = ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77
14
SIZE (handbrake/freetype-2.4.7.tar.bz2) = 1490543
15
SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
11
SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
16
SIZE (handbrake/lame-3.98.tar.gz) = 1411318
12
SIZE (handbrake/lame-3.98.tar.gz) = 1411318
17
SHA256 (handbrake/libass-0.10.0-1.tar.gz) = a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867
13
SHA256 (handbrake/libbluray-0.2.3.tar.bz2) = 2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea
18
SIZE (handbrake/libass-0.10.0-1.tar.gz) = 745314
14
SIZE (handbrake/libbluray-0.2.3.tar.bz2) = 465239
19
SHA256 (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76
20
SIZE (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 241927
21
SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
15
SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
22
SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
16
SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
23
SHA256 (handbrake/libdvdnav-svn1168.tar.gz) = 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7
17
SHA256 (handbrake/libdvdnav-svn1168.tar.gz) = 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7
Lines 26-44 Link Here
26
SIZE (handbrake/libdvdread-svn1168.tar.gz) = 946033
20
SIZE (handbrake/libdvdread-svn1168.tar.gz) = 946033
27
SHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97
21
SHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97
28
SIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 32742
22
SIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 32742
29
SHA256 (handbrake/libogg-1.3.0.tar.gz) = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
30
SIZE (handbrake/libogg-1.3.0.tar.gz) = 425144
31
SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
32
SIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
33
SHA256 (handbrake/libtheora-1.1.0.tar.bz2) = 74be9fe9f85d18c45bdcbb018cebf12c74e2234aeecb4d4c4cb92d80bdd287e2
34
SIZE (handbrake/libtheora-1.1.0.tar.bz2) = 1785634
35
SHA256 (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd
36
SIZE (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 1250659
37
SHA256 (handbrake/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
38
SIZE (handbrake/libxml2-2.7.7.tar.gz) = 4868502
39
SHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) = 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f
23
SHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) = 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f
40
SIZE (handbrake/mp4v2-trunk-r355.tar.bz2) = 475488
24
SIZE (handbrake/mp4v2-trunk-r355.tar.bz2) = 475488
41
SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
25
SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
42
SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
26
SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
43
SHA256 (handbrake/x264-r2146-bcd41db.tar.gz) = 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
27
SHA256 (handbrake/x264-r2273-b3065e6.tar.gz) = 956c82c9318740ef3744cf6e752fb6181be0716273e2e8976306624f0864a815
44
SIZE (handbrake/x264-r2146-bcd41db.tar.gz) = 656089
28
SIZE (handbrake/x264-r2273-b3065e6.tar.gz) = 681489
(-)files/patch-contrib_fontconfig_module.defs (-11 lines)
Lines 1-11 Link Here
1
--- ./contrib/fontconfig/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
2
+++ ./contrib/fontconfig/module.defs	2011-05-24 05:50:46.060808283 -0400
3
@@ -19,6 +19,8 @@
4
     FONTCONFIG.config_archoption  = --with-arch=i386
5
 else ifeq ($(BUILD.system),linux)
6
     FONTCONFIG.cc_archoption      = 
7
+else ifeq ($(BUILD.system),freebsd)
8
+    FONTCONFIG.cc_archoption      = 
9
 else
10
     FONTCONFIG.cc_archoption      = -arch $(FONTCONFIG.GCC.archs)
11
     FONTCONFIG.config_archoption  = --with-arch=$(FONTCONFIG.GCC.archs)
(-)files/patch-contrib_freetype_module.defs (-8 lines)
Lines 1-8 Link Here
1
--- ./contrib/freetype/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
2
+++ ./contrib/freetype/module.defs	2011-05-24 05:50:46.062809316 -0400
3
@@ -3,3 +3,5 @@
4
 
5
 FREETYPE.FETCH.url = http://download.m0k.org/handbrake/contrib/freetype-2.3.9.tar.gz
6
 FREETYPE.EXTRACT.tarbase = freetype-2.3.9
7
+FREETYPE.CONFIGURE.env.GNUMAKE = GNUMAKE="gmake"
8
+FREETYPE.CONFIGURE.env.args += !GNUMAKE
(-)files/patch-contrib_libass_module.defs (-14 lines)
Lines 1-14 Link Here
1
--- ./contrib/libass/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
2
+++ ./contrib/libass/module.defs	2011-05-24 05:50:46.096807667 -0400
3
@@ -7,9 +7,9 @@
4
 # Disable as many external dependencies as I can get away with
5
 # and tell configure where to find our version of freetype
6
 LIBASS.CONFIGURE.extra = \
7
-    --disable-png --disable-enca \
8
+    --disable-png --disable-enca --disable-harfbuzz \
9
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
10
-    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
11
+    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2 -I/usr/local/include" \
12
     FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
13
     FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
14
 
(-)files/patch-test_module.defs (-17 / +6 lines)
Lines 1-23 Link Here
1
--- ./test/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
1
--- ./test/module.defs.orig	2014-02-02 01:43:20.388459727 +0100
2
+++ ./test/module.defs	2011-05-24 05:50:46.097808812 -0400
2
+++ ./test/module.defs	2014-02-02 01:50:43.545619545 +0100
3
@@ -10,8 +10,8 @@
3
@@ -42,6 +42,9 @@
4
 TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
5
 
6
 TEST.libs = $(LIBHB.a) $(foreach n, \
7
-        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
8
-        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
9
+        a52 ass avformat avcodec avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
10
+        samplerate swscale theora vorbis vorbisenc ogg x264 xml2 bluray, \
11
         $(CONTRIB.build/)lib/lib$(n).a )
12
 
13
 TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
14
@@ -50,6 +50,9 @@
15
     TEST.GCC.l += iconv
4
     TEST.GCC.l += iconv
16
 else ifeq ($(BUILD.system),linux)
5
 else ifeq ($(BUILD.system),linux)
17
     TEST.GCC.l += pthread dl m
6
     TEST.GCC.l += pthread dl m
18
+else ifeq ($(BUILD.system),freebsd)
7
+else ifeq ($(BUILD.system),freebsd)
19
+	TEST.GCC.l += pthread iconv
8
+    TEST.GCC.l += pthread iconv
20
+	TEST.GCC.L += /usr/local/lib
9
+    TEST.GCC.L += /usr/local/lib
21
 else ifeq ($(BUILD.system),solaris)
10
 else ifeq ($(BUILD.system),solaris)
22
     TEST.GCC.l += pthread nsl socket
11
     TEST.GCC.l += pthread nsl socket iconv
23
 else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
12
 else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))

Return to bug 186387