diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-08-14 11:58:53 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-08-14 11:58:53 +0000 |
| commit | 3296a59e74e161cc6b8a4e952a96dcd4684b1261 (patch) | |
| tree | c5a7eca202a16968ab8cd4beef8a7b663ef8304f /multimedia/handbrake/files | |
| parent | c17dedd527a9469df04c893b54103f6a5123fd1b (diff) | |
| download | ports-3296a59e74e161cc6b8a4e952a96dcd4684b1261.tar.gz ports-3296a59e74e161cc6b8a4e952a96dcd4684b1261.zip | |
Unbreak the build after r324037:
1) `devel/libnotify' no longer pulls gtk20; we must depend explicitly;
2) `x11-toolkits/pango' now depends on `print/harfbuzz', which installs
header file ($localbase/include/harfbuzz/hb.h) that in turn confuses
bundled libass' configure script and conflicts with HandBrake's own
internal header.
NB: supposedly it should have been caught by exp-run for r324037, but it
was not for some reason.
Reported by: Sergey V. Dyatko
Notes
Notes:
svn path=/head/; revision=324705
Diffstat (limited to 'multimedia/handbrake/files')
| -rw-r--r-- | multimedia/handbrake/files/patch-contrib_libass_module.defs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/multimedia/handbrake/files/patch-contrib_libass_module.defs b/multimedia/handbrake/files/patch-contrib_libass_module.defs index 0f270f8062a8..b29f633b495b 100644 --- a/multimedia/handbrake/files/patch-contrib_libass_module.defs +++ b/multimedia/handbrake/files/patch-contrib_libass_module.defs @@ -1,10 +1,14 @@ --- ./contrib/libass/module.defs.orig 2010-09-28 18:10:49.000000000 -0400 +++ ./contrib/libass/module.defs 2011-05-24 05:50:46.096807667 -0400 -@@ -10,6 +10,6 @@ +@@ -7,9 +7,9 @@ + # Disable as many external dependencies as I can get away with + # and tell configure where to find our version of freetype LIBASS.CONFIGURE.extra = \ - --disable-png --disable-enca \ +- --disable-png --disable-enca \ ++ --disable-png --disable-enca --disable-harfbuzz \ FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \ - FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \ + FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2 -I/usr/local/include" \ FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \ FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" + |