From 10753c0be2ade6780ad9aed4be665bcdddd71e13 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 10 Nov 2017 18:39:33 +0100
Subject: [PATCH] vlc: remove workaround for posix_spawn.

---
 media-video/vlc/patches/vlc-2.2.6.patchset | 31 ----------------------
 media-video/vlc/vlc-2.2.6.recipe           |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/media-video/vlc/patches/vlc-2.2.6.patchset b/media-video/vlc/patches/vlc-2.2.6.patchset
index fcc667c7b..6061ef610 100644
--- a/media-video/vlc/patches/vlc-2.2.6.patchset
+++ b/media-video/vlc/patches/vlc-2.2.6.patchset
@@ -664,37 +664,6 @@ index ea1b1b9..acdd9b1 100644
              case SOCK_SEQPACKET:
  #ifdef SOCK_DCCP
              case SOCK_DCCP:
-diff --git a/src/posix/netconf.c b/src/posix/netconf.c
-index 4dd751b..54accaa 100644
---- a/src/posix/netconf.c
-+++ b/src/posix/netconf.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <fcntl.h>
--#include <spawn.h>
-+#ifndef __HAIKU__
-+#  include <spawn.h>
-+#endif
- #include <unistd.h>
- 
- extern char **environ;
-@@ -45,6 +47,9 @@ extern char **environ;
-  */
- char *vlc_getProxyUrl(const char *url)
- {
-+#ifdef __HAIKU__
-+   return NULL;
-+#else
-     /* libproxy helper */
-     pid_t pid;
-     posix_spawn_file_actions_t actions;
-@@ -115,4 +120,5 @@ char *vlc_getProxyUrl(const char *url)
-     if (var != NULL)
-         var = strdup(var);
-     return var;
-+#endif
- }
 -- 
 2.13.1
 
diff --git a/media-video/vlc/vlc-2.2.6.recipe b/media-video/vlc/vlc-2.2.6.recipe
index 74cd8959a..f79e11680 100644
--- a/media-video/vlc/vlc-2.2.6.recipe
+++ b/media-video/vlc/vlc-2.2.6.recipe
@@ -5,7 +5,7 @@ VCDs, and various streaming protocols."
 HOMEPAGE="https://www.videolan.org/vlc/"
 COPYRIGHT="1998-2017 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
 CHECKSUM_SHA256="c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8"
 PATCHES="vlc-$portVersion.patchset"