diff options
| author | joerg <joerg> | 2014-05-30 11:34:51 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-05-30 11:34:51 +0000 |
| commit | 268d5609106d8e79f810e7828b9a8c84770fbdb7 (patch) | |
| tree | 91b43d3efd77c01350874dbad118daf72ff2b657 /multimedia | |
| parent | 2b71170102de6ac927a054fa2388ed3ecc5954de (diff) | |
| download | pkgsrc-268d5609106d8e79f810e7828b9a8c84770fbdb7.tar.gz | |
Restrict random GCC options to GCC. Fix build with newer Freetype2.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mlt/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mlt/patches/patch-configure | 31 | ||||
| -rw-r--r-- | multimedia/mlt/patches/patch-src_modules_gtk2_producer__pango.c | 14 |
3 files changed, 48 insertions, 1 deletions
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo index d0a23d6992e..91cf2d09579 100644 --- a/multimedia/mlt/distinfo +++ b/multimedia/mlt/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.7 2014/03/30 19:42:53 abs Exp $ +$NetBSD: distinfo,v 1.8 2014/05/30 11:34:51 joerg Exp $ SHA1 (mlt-0.9.0.tar.gz) = 76bf18f4442801fae963c5a676d6626e383d1617 RMD160 (mlt-0.9.0.tar.gz) = c58b21463562367ad1fad46fa3e524f283bd4c82 Size (mlt-0.9.0.tar.gz) = 1167943 bytes +SHA1 (patch-configure) = 0abcfe32e1e9c5505e00690226e7ae99349839bb SHA1 (patch-src_framework_mlt__properties.c) = 9a4f0351ddcbed4c431a65a16375a19357605d76 SHA1 (patch-src_framework_mlt__property.c) = 7471031721b64dfcc8dccc828ca10b5eee1fb37d SHA1 (patch-src_framework_mlt__property.h) = 638ec43f6ad073b0f5dff48604f20e59dd0460e4 +SHA1 (patch-src_modules_gtk2_producer__pango.c) = 86d7df6d82fe795a0f94afb9fae1d025bb4a7f4a 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> |