diff options
| author | joerg <joerg@pkgsrc.org> | 2013-06-13 14:30:17 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-06-13 14:30:17 +0000 |
| commit | de9604b44cba0310a076476cf68068f0af1a7061 (patch) | |
| tree | ddc005c6619cf032defc49905e93f69c8184e30e /multimedia/avidemux | |
| parent | 5f5bdd4de762edf8af646f00d5797c39b1b2c38a (diff) | |
| download | pkgsrc-de9604b44cba0310a076476cf68068f0af1a7061.tar.gz | |
Don't poison malloc and friends in a way that breaks cstdlib.
Diffstat (limited to 'multimedia/avidemux')
| -rw-r--r-- | multimedia/avidemux/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__assert.h | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo index 3d696b43383..16a32450eb4 100644 --- a/multimedia/avidemux/distinfo +++ b/multimedia/avidemux/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2012/07/03 17:38:31 joerg Exp $ +$NetBSD: distinfo,v 1.23 2013/06/13 14:30:17 joerg Exp $ SHA1 (avidemux_2.5.4.tar.gz) = 83d6f6d87442ce4fc4e4806735ec27ef5e90364c RMD160 (avidemux_2.5.4.tar.gz) = e20454a558210d5f7ab1418ae4013b618d1001d9 @@ -10,6 +10,7 @@ SHA1 (patch-as) = 391b9f173aaa329ec879cc0ac5a9a2a0ad48a924 SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp) = 54a6bb29553c0c039617e57aef39d9d32e25683a SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp) = 91c6741ad967e65a91f7f2e439453d44894e37df SHA1 (patch-avidemux_ADM__coreUI_include_DIA__factory.h) = 1aa53bdb0519122e63ac8fbcb76ca389cc97d6ba +SHA1 (patch-avidemux_ADM__core_include_ADM__assert.h) = ff039fcb901aa78a01c1fda07295ae170a5aaee4 SHA1 (patch-avidemux_ADM__core_include_ADM__mangle.h) = 54d580839fb5c1007379692e5e33979f72eedcbf SHA1 (patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c) = d9fb28f3db0978cff3e90746aa9efcef0084daa3 SHA1 (patch-avidemux_ADM_core_src_ADM_cpuCap.cpp) = c344cf9707c2e8dc9f03b6379f749997bf01b22b diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__assert.h b/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__assert.h new file mode 100644 index 00000000000..94ee0cab1f8 --- /dev/null +++ b/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__assert.h @@ -0,0 +1,21 @@ +$NetBSD: patch-avidemux_ADM__core_include_ADM__assert.h,v 1.1 2013/06/13 14:30:17 joerg Exp $ + +--- avidemux/ADM_core/include/ADM_assert.h.orig 2013-06-13 13:39:33.000000000 +0000 ++++ avidemux/ADM_core/include/ADM_assert.h +@@ -91,15 +91,7 @@ extern adm_fast_memcpy myAdmMemcpy; + #endif + + #if !defined(__APPLE__) && !defined(__WIN64) +-#ifndef ADM_LEGACY_PROGGY +- #define malloc #error +- #define realloc #error +- #define memalign #error +- #define free #error +- #undef strdup +- #define strdup #error +- #define calloc #error +-#else ++#ifdef ADM_LEGACY_PROGGY + #define malloc ADM_alloc + #define realloc ADM_realloc + #define memalign(x,y) ADM_alloc(y) |