Thu Jun 13 14:30:17 2013 UTC ()
Don't poison malloc and friends in a way that breaks cstdlib.


(joerg)
diff -r1.22 -r1.23 pkgsrc/multimedia/avidemux/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__assert.h
cvs diff -r1.22 -r1.23 pkgsrc/multimedia/avidemux/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/avidemux/distinfo 2012/07/03 17:38:31 1.22
+++ pkgsrc/multimedia/avidemux/distinfo 2013/06/13 14:30:17 1.23
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.22 2012/07/03 17:38:31 joerg Exp $ 1$NetBSD: distinfo,v 1.23 2013/06/13 14:30:17 joerg Exp $
2 2
3SHA1 (avidemux_2.5.4.tar.gz) = 83d6f6d87442ce4fc4e4806735ec27ef5e90364c 3SHA1 (avidemux_2.5.4.tar.gz) = 83d6f6d87442ce4fc4e4806735ec27ef5e90364c
4RMD160 (avidemux_2.5.4.tar.gz) = e20454a558210d5f7ab1418ae4013b618d1001d9 4RMD160 (avidemux_2.5.4.tar.gz) = e20454a558210d5f7ab1418ae4013b618d1001d9
5Size (avidemux_2.5.4.tar.gz) = 18154965 bytes 5Size (avidemux_2.5.4.tar.gz) = 18154965 bytes
6SHA1 (patch-CMakeLists.txt) = e86945a4cf51ae9275f94d2545be4ec3ed711b88 6SHA1 (patch-CMakeLists.txt) = e86945a4cf51ae9275f94d2545be4ec3ed711b88
7SHA1 (patch-ab) = 2fb71f3eb3d04503ef6b34bb960a891ba3afa64f 7SHA1 (patch-ab) = 2fb71f3eb3d04503ef6b34bb960a891ba3afa64f
8SHA1 (patch-addons_avsfilter_CMakeLists.txt) = f6b08d7e62f26fdb5a2ab32dd6002303b76e4111 8SHA1 (patch-addons_avsfilter_CMakeLists.txt) = f6b08d7e62f26fdb5a2ab32dd6002303b76e4111
9SHA1 (patch-as) = 391b9f173aaa329ec879cc0ac5a9a2a0ad48a924 9SHA1 (patch-as) = 391b9f173aaa329ec879cc0ac5a9a2a0ad48a924
10SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp) = 54a6bb29553c0c039617e57aef39d9d32e25683a 10SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldASM.cpp) = 54a6bb29553c0c039617e57aef39d9d32e25683a
11SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp) = 91c6741ad967e65a91f7f2e439453d44894e37df 11SHA1 (patch-avidemux_ADM__coreImage_src_ADM__vidFieldBlend.cpp) = 91c6741ad967e65a91f7f2e439453d44894e37df
12SHA1 (patch-avidemux_ADM__coreUI_include_DIA__factory.h) = 1aa53bdb0519122e63ac8fbcb76ca389cc97d6ba 12SHA1 (patch-avidemux_ADM__coreUI_include_DIA__factory.h) = 1aa53bdb0519122e63ac8fbcb76ca389cc97d6ba
 13SHA1 (patch-avidemux_ADM__core_include_ADM__assert.h) = ff039fcb901aa78a01c1fda07295ae170a5aaee4
13SHA1 (patch-avidemux_ADM__core_include_ADM__mangle.h) = 54d580839fb5c1007379692e5e33979f72eedcbf 14SHA1 (patch-avidemux_ADM__core_include_ADM__mangle.h) = 54d580839fb5c1007379692e5e33979f72eedcbf
14SHA1 (patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c) = d9fb28f3db0978cff3e90746aa9efcef0084daa3 15SHA1 (patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c) = d9fb28f3db0978cff3e90746aa9efcef0084daa3
15SHA1 (patch-avidemux_ADM_core_src_ADM_cpuCap.cpp) = c344cf9707c2e8dc9f03b6379f749997bf01b22b 16SHA1 (patch-avidemux_ADM_core_src_ADM_cpuCap.cpp) = c344cf9707c2e8dc9f03b6379f749997bf01b22b
16SHA1 (patch-avidemux_ADM_core_src_ADM_crashdump.cpp) = cdbd0419a100601b0c8f125228b2e3bf1c42fd14 17SHA1 (patch-avidemux_ADM_core_src_ADM_crashdump.cpp) = cdbd0419a100601b0c8f125228b2e3bf1c42fd14
17SHA1 (patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp) = 334fb6c2195b0e9e294ea461aa88ab9bd4828c53 18SHA1 (patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp) = 334fb6c2195b0e9e294ea461aa88ab9bd4828c53
18SHA1 (patch-avidemux_CMakeLists.txt) = 00b6e92b77af1d575e801a824664921dae067db0 19SHA1 (patch-avidemux_CMakeLists.txt) = 00b6e92b77af1d575e801a824664921dae067db0
19SHA1 (patch-ax) = 09d676d910dfcccb30b4f73d1a935647492c259a 20SHA1 (patch-ax) = 09d676d910dfcccb30b4f73d1a935647492c259a
20SHA1 (patch-cmake_admCheckMiscLibs.cmake) = 2ece918805b2561f2ec47510265aed6352433c42 21SHA1 (patch-cmake_admCheckMiscLibs.cmake) = 2ece918805b2561f2ec47510265aed6352433c42
21SHA1 (patch-cmake_admFFmpegPrepareTar.cmake) = 690039fb2a74f628c905200a5e767da2904f2df3 22SHA1 (patch-cmake_admFFmpegPrepareTar.cmake) = 690039fb2a74f628c905200a5e767da2904f2df3
22SHA1 (patch-db) = f4fd01633de4dc459286158f15d4bc0233b5ca61 23SHA1 (patch-db) = f4fd01633de4dc459286158f15d4bc0233b5ca61
23SHA1 (patch-plugins_ADM_audioDevices_Oss_ADM_deviceoss.cpp) = a208e06b9ec8ef11c0a341a9a3bada4ee9380888 24SHA1 (patch-plugins_ADM_audioDevices_Oss_ADM_deviceoss.cpp) = a208e06b9ec8ef11c0a341a9a3bada4ee9380888
24SHA1 (patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp) = 07e0fc94cc5c8e9bdb5a472a4dcf7f0b00ee11e9 25SHA1 (patch-plugins_ADM_audioDevices_Sdl_ADM_deviceSDL.cpp) = 07e0fc94cc5c8e9bdb5a472a4dcf7f0b00ee11e9
File Added: pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__core_include_ADM__assert.h
$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)