Remove -static that broke build on 6.99.3/amd64, from drochner.

Merge two patches for the same file.

4 files changed, 27 insertions, 18 deletions

diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 031dd659436..e50f6f1c085 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
+$NetBSD: distinfo,v 1.2 2012/02/24 17:24:18 wiz Exp $
 
 SHA1 (vlc-2.0.0.tar.xz) = c28c4c8128110fd02a7bdf55c9dad5cc20eb91b8
 RMD160 (vlc-2.0.0.tar.xz) = 6c4d1401a7cc5b1c66dde7eb896347a728961d2b
 Size (vlc-2.0.0.tar.xz) = 17144876 bytes
 SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
-SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
 SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
-SHA1 (patch-at) = a7c16e363992271b3ae3e17fde63798a9fce5da2
+SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
 SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
 SHA1 (patch-av) = af36b4658a650136eb9bdb2f541c9dd5315073d5
 SHA1 (patch-aw) = 334648f9ba421184e41e4ead0da1eacc61c95b19
+SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
 SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
 SHA1 (patch-skins-ab) = bf8b3e33db5389dbf04dfedf1d2f1d120afed66a
diff --git a/multimedia/vlc2/patches/patch-ap b/multimedia/vlc2/patches/patch-ap
deleted file mode 100644
index 31dcd05123b..00000000000
--- a/multimedia/vlc2/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
-
---- bin/override.c.orig	2010-08-09 05:29:21.000000000 +0900
-+++ bin/override.c	2011-01-05 00:30:10.000000000 +0900
-@@ -120,7 +120,7 @@
-  *
-  * Some evil libraries modify the environment. We currently ignore the calls as
-  * they could crash the process. This may cause funny behaviour though. */
--int putenv (char *str)
-+int putenv (const char *str)
- {
-     if (override)
-     {
diff --git a/multimedia/vlc2/patches/patch-at b/multimedia/vlc2/patches/patch-at
index 35391e9f853..14b518db1ba 100644
--- a/multimedia/vlc2/patches/patch-at
+++ b/multimedia/vlc2/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
+$NetBSD: patch-at,v 1.2 2012/02/24 17:24:18 wiz Exp $
 
---- bin/override.c.orig	2012-02-19 10:05:26.000000000 +0000
+--- bin/override.c.orig	2011-12-08 18:00:25.000000000 +0000
 +++ bin/override.c
 @@ -27,7 +27,7 @@
  
@@ -11,3 +11,12 @@ $NetBSD: patch-at,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
   && (defined (__ELF__) && !defined (__sun__))
  /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */
  
+@@ -124,7 +124,7 @@ static void *getsym (const char *name)
+  *
+  * Some evil libraries modify the environment. We currently ignore the calls as
+  * they could crash the process. This may cause funny behaviour though. */
+-int putenv (char *str)
++int putenv (const char *str)
+ {
+     if (override)
+     {
diff --git a/multimedia/vlc2/patches/patch-modules_access_rtp_Modules.am b/multimedia/vlc2/patches/patch-modules_access_rtp_Modules.am
new file mode 100644
index 00000000000..37265fd9752
--- /dev/null
+++ b/multimedia/vlc2/patches/patch-modules_access_rtp_Modules.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-modules_access_rtp_Modules.am,v 1.1 2012/02/24 17:24:18 wiz Exp $
+
+--- modules/access/rtp/Modules.am.orig	2011-12-08 18:00:26.000000000 +0000
++++ modules/access/rtp/Modules.am
+@@ -15,7 +15,7 @@ librtp_plugin_la_DEPENDENCIES =
+ libvlc_srtp_la_SOURCES = srtp.c
+ libvlc_srtp_la_CPPFLAGS =
+ libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS)
+-libvlc_srtp_la_LDFLAGS = -static
++libvlc_srtp_la_LDFLAGS = 
+ libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS)
+ srtp_test_recv_CPPFLAGS =
+ srtp_test_recv_LDADD = libvlc_srtp.la