diff options
| author | joerg <joerg@pkgsrc.org> | 2014-05-30 11:34:51 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-05-30 11:34:51 +0000 |
| commit | cf539e65a718ed21388685cccc343a10a6e2fe16 (patch) | |
| tree | 9451025a80fcb9de1f8156730c82f913b364844d /multimedia/mlt/patches | |
| parent | 20ae11eb3c8b0eb3127239da7c0210234a19d3ed (diff) | |
| download | pkgsrc-cf539e65a718ed21388685cccc343a10a6e2fe16.tar.gz | |
Restrict random GCC options to GCC. Fix build with newer Freetype2.
Diffstat (limited to 'multimedia/mlt/patches')
| -rw-r--r-- | multimedia/mlt/patches/patch-configure | 31 | ||||
| -rw-r--r-- | multimedia/mlt/patches/patch-src_modules_gtk2_producer__pango.c | 14 |
2 files changed, 45 insertions, 0 deletions
diff --git a/multimedia/mlt/patches/patch-configure b/multimedia/mlt/patches/patch-configure new file mode 100644 index 00000000000..e1f095781d3 --- /dev/null +++ b/multimedia/mlt/patches/patch-configure @@ -0,0 +1,31 @@ +$NetBSD: patch-configure,v 1.4 2014/05/30 11:34:51 joerg Exp $ + +--- configure.orig 2014-05-28 20:18:38.000000000 +0000 ++++ configure +@@ -78,14 +78,18 @@ build_config() + [ "$amd64" = "true" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64" + [ "$arch" != "" ] && echo "TARGETARCH=-march=$arch" + [ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu" +- if [ "$optimisations" = "true" ] +- then +- echo "OPTIMISATIONS=-O2 -pipe" +- # Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash. +- echo "OPTIMISATIONS+=-fno-tree-dominator-opts" +- # Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash. +- echo "OPTIMISATIONS+=-fno-tree-pre" +- fi ++ case $(${CC} --version 2> /dev/null) in ++ gcc*) ++ if [ "$optimisations" = "true" ] ++ then ++ echo "OPTIMISATIONS=-O2 -pipe" ++ # Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash. ++ echo "OPTIMISATIONS+=-fno-tree-dominator-opts" ++ # Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash. ++ echo "OPTIMISATIONS+=-fno-tree-pre" ++ fi ++ ;; ++ esac + + echo "CFLAGS+=-Wall -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)" + diff --git a/multimedia/mlt/patches/patch-src_modules_gtk2_producer__pango.c b/multimedia/mlt/patches/patch-src_modules_gtk2_producer__pango.c new file mode 100644 index 00000000000..3e8defc8aa4 --- /dev/null +++ b/multimedia/mlt/patches/patch-src_modules_gtk2_producer__pango.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_modules_gtk2_producer__pango.c,v 1.1 2014/05/30 11:34:51 joerg Exp $ + +--- src/modules/gtk2/producer_pango.c.orig 2014-05-28 20:46:18.000000000 +0000 ++++ src/modules/gtk2/producer_pango.c +@@ -25,7 +25,8 @@ + #include <string.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #include <iconv.h> + #include <pthread.h> + #include <ctype.h> |