diff options
| author | markd <markd@pkgsrc.org> | 2015-06-29 21:06:14 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2015-06-29 21:06:14 +0000 |
| commit | 1309328f8c3ad11bdee41d19ddd13b292a0c6032 (patch) | |
| tree | b9cdbb30151a526dd729a858a7032c71f75582ca /multimedia/libvpx | |
| parent | c94496325b7e1cd3cecc4d7b8b36303a7314e6a7 (diff) | |
| download | pkgsrc-1309328f8c3ad11bdee41d19ddd13b292a0c6032.tar.gz | |
Fix build with gcc 5.x
Diffstat (limited to 'multimedia/libvpx')
| -rw-r--r-- | multimedia/libvpx/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h | 15 | ||||
| -rw-r--r-- | multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c | 15 |
3 files changed, 33 insertions, 1 deletions
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo index 0b8d65bb209..cb8d67cf6ef 100644 --- a/multimedia/libvpx/distinfo +++ b/multimedia/libvpx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2014/11/14 11:51:01 jmcneill Exp $ +$NetBSD: distinfo,v 1.27 2015/06/29 21:09:11 markd Exp $ SHA1 (libvpx_1.3.0.orig.tar.bz2) = fd90afbdba7905b9b3ab6c707c41369627d208e9 RMD160 (libvpx_1.3.0.orig.tar.bz2) = f90e26d7657b26d8a3bdba82c55db5ecafc23835 @@ -10,6 +10,8 @@ SHA1 (patch-ad) = e63453d0d13ddbcbf243ece9818bbc9e1bd174b5 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891 SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd +SHA1 (patch-nestegg_halloc_src_align.h) = 8ad126c493be4c075c7c1a2d93f2a11f3ce4fd53 +SHA1 (patch-nestegg_halloc_src_halloc.c) = 0d2f7438d718b6ceb83fe11c05c86103e507128c SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c SHA1 (patch-test_sad__test.cc) = fb39c0ca4ce5f424d878779a2d58ebe77c41e8b3 SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be diff --git a/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h b/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h new file mode 100644 index 00000000000..e60db0ed4d0 --- /dev/null +++ b/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h @@ -0,0 +1,15 @@ +$NetBSD: patch-nestegg_halloc_src_align.h,v 1.1 2015/06/29 21:09:11 markd Exp $ + +rename to avoid conflict with gcc5.x stddef.h + +--- nestegg/halloc/src/align.h.orig 2013-11-18 22:18:52.000000000 +0000 ++++ nestegg/halloc/src/align.h +@@ -30,7 +30,7 @@ union max_align + void (*q)(void); + }; + +-typedef union max_align max_align_t; ++typedef union max_align h_max_align_t; + + #endif + diff --git a/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c b/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c new file mode 100644 index 00000000000..4c3a0e4c352 --- /dev/null +++ b/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c @@ -0,0 +1,15 @@ +$NetBSD: patch-nestegg_halloc_src_halloc.c,v 1.1 2015/06/29 21:09:11 markd Exp $ + +rename to avoid conflict with gcc5.x stddef.h + +--- nestegg/halloc/src/halloc.c.orig 2013-11-18 22:18:52.000000000 +0000 ++++ nestegg/halloc/src/halloc.c +@@ -30,7 +30,7 @@ typedef struct hblock + #endif + hlist_item_t siblings; /* 2 pointers */ + hlist_head_t children; /* 1 pointer */ +- max_align_t data[1]; /* not allocated, see below */ ++ h_max_align_t data[1]; /* not allocated, see below */ + + } hblock_t; + |