summaryrefslogtreecommitdiff
path: root/multimedia/vlc/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/vlc/patches')
-rw-r--r--multimedia/vlc/patches/patch-ab35
-rw-r--r--multimedia/vlc/patches/patch-ar69
-rw-r--r--multimedia/vlc/patches/patch-au38
-rw-r--r--multimedia/vlc/patches/patch-configure49
4 files changed, 62 insertions, 129 deletions
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
deleted file mode 100644
index 52e5502690b..00000000000
--- a/multimedia/vlc/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/01/24 18:54:04 drochner Exp $
-
---- configure.ac.orig 2010-11-12 07:49:28.000000000 +0900
-+++ configure.ac 2011-01-04 22:47:39.000000000 +0900
-@@ -2688,13 +2688,13 @@
- AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
- echo "VAAPI acceleration activated"
- ],[
-- AS_IF([test "${enable_libva}" == "yes"],
-+ AS_IF([test "${enable_libva}" = "yes"],
- [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
- [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
- ])
- VLC_RESTORE_FLAGS
- ],[
-- AS_IF([test "${enable_libva}" == "yes"],
-+ AS_IF([test "${enable_libva}" = "yes"],
- [AC_MSG_ERROR([Could not find required libva.])],
- [AC_MSG_WARN([libva not found ])])
- ])
-@@ -2721,12 +2721,12 @@
- AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
- echo "DxVA2 acceleration activated"
- ],[
-- AS_IF([test "${enable_dxva2}" == "yes"],
-+ AS_IF([test "${enable_dxva2}" = "yes"],
- [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
- [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
- ])
- ],[
-- AS_IF([test "${enable_dxva2}" == "yes"],
-+ AS_IF([test "${enable_dxva2}" = "yes"],
- [AC_MSG_ERROR([Could not find required dxva2api.h])],
- [AC_MSG_WARN([dxva2api.h not found])])
- ])
diff --git a/multimedia/vlc/patches/patch-ar b/multimedia/vlc/patches/patch-ar
index 52012658754..5c6181053cb 100644
--- a/multimedia/vlc/patches/patch-ar
+++ b/multimedia/vlc/patches/patch-ar
@@ -1,11 +1,12 @@
-$NetBSD: patch-ar,v 1.1 2011/01/24 18:54:04 drochner Exp $
+$NetBSD: patch-ar,v 1.2 2011/10/07 19:13:20 drochner Exp $
---- modules/misc/inhibit/xdg.c.orig 2010-11-26 22:32:46.000000000 +0000
+--- modules/misc/inhibit/xdg.c.orig 2011-10-05 21:21:12.000000000 +0000
+++ modules/misc/inhibit/xdg.c
-@@ -26,7 +26,11 @@
+@@ -26,7 +26,12 @@
#include <vlc_plugin.h>
#include <vlc_inhibit.h>
#include <assert.h>
++#include <signal.h>
+#ifdef _POSIX_SPAWN
+# if (_POSIX_SPAWN >= 0)
#include <spawn.h>
@@ -14,16 +15,70 @@ $NetBSD: patch-ar,v 1.1 2011/01/24 18:54:04 drochner Exp $
#include <sys/wait.h>
static int Open (vlc_object_t *);
-@@ -137,6 +141,8 @@ static void *Thread (void *data)
+@@ -46,7 +51,11 @@ struct vlc_inhibit_sys
+ vlc_thread_t thread;
+ vlc_cond_t update, inactive;
+ vlc_mutex_t lock;
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ posix_spawnattr_t attr;
++# endif
++#endif
+ bool suspend, suspended;
+ };
+
+@@ -66,17 +75,29 @@ static int Open (vlc_object_t *obj)
+ vlc_mutex_init (&p_sys->lock);
+ vlc_cond_init (&p_sys->update);
+ vlc_cond_init (&p_sys->inactive);
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ posix_spawnattr_init (&p_sys->attr);
++# endif
++#endif
+ /* Reset signal handlers to default and clear mask in the child process */
+ {
+ sigset_t set;
+
+ sigemptyset (&set);
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ posix_spawnattr_setsigmask (&p_sys->attr, &set);
++# endif
++#endif
+ sigaddset (&set, SIGPIPE);
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ posix_spawnattr_setsigdefault (&p_sys->attr, &set);
+ posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
+ | POSIX_SPAWN_SETSIGMASK);
++# endif
++#endif
+ }
+ p_sys->suspend = false;
+ p_sys->suspended = false;
+@@ -105,7 +126,11 @@ static void Close (vlc_object_t *obj)
+
+ vlc_cancel (p_sys->thread);
+ vlc_join (p_sys->thread, NULL);
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ posix_spawnattr_destroy (&p_sys->attr);
++# endif
++#endif
+ vlc_cond_destroy (&p_sys->inactive);
+ vlc_cond_destroy (&p_sys->update);
+ vlc_mutex_destroy (&p_sys->lock);
+@@ -151,6 +176,8 @@ static void *Thread (void *data)
pid_t pid;
vlc_mutex_unlock (&p_sys->lock);
+#ifdef _POSIX_SPAWN
+# if (_POSIX_SPAWN >= 0)
- if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ))
+ if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr,
+ argv, environ))
{
- int status;
-@@ -146,6 +152,8 @@ static void *Thread (void *data)
+@@ -161,6 +188,8 @@ static void *Thread (void *data)
while (waitpid (pid, &status, 0) == -1);
}
else/* We don't handle the error, but busy looping would be worse :( */
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
deleted file mode 100644
index dcf6bc175ed..00000000000
--- a/multimedia/vlc/patches/patch-au
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-au,v 1.9 2011/10/07 12:30:17 drochner Exp $
-
-VideoLAN-SA-1107
-
---- src/network/httpd.c.orig 2010-12-23 13:26:53.000000000 +0000
-+++ src/network/httpd.c
-@@ -1755,16 +1755,27 @@ static void httpd_ClientRecv( httpd_clie
- *p2++ = '\0';
- }
- if( !strncasecmp( p, ( cl->query.i_proto
-- == HTTPD_PROTO_HTTP ) ? "http" : "rtsp", 4 )
-- && p[4 + !!strchr( "sS", p[4] )] == ':' )
-+ == HTTPD_PROTO_HTTP ) ? "http" : "rtsp", 5 ) )
- { /* Skip hier-part of URL (if present) */
-- p = strchr( p, ':' ) + 1; /* skip URI scheme */
-+ p += 5;
- if( !strncmp( p, "//", 2 ) ) /* skip authority */
- { /* see RFC3986 ยง3.2 */
- p += 2;
-- while( *p && !strchr( "/?#", *p ) ) p++;
-+ p += strcspn( p, "/?#" );
- }
- }
-+ else
-+ if( !strncasecmp( p, ( cl->query.i_proto
-+ == HTTPD_PROTO_HTTP ) ? "https:" : "rtsps:", 6 ) )
-+ { /* Skip hier-part of URL (if present) */
-+ p += 6;
-+ if( !strncmp( p, "//", 2 ) ) /* skip authority */
-+ { /* see RFC3986 ?3.2 */
-+ p += 2;
-+ p += strcspn( p, "/?#" );
-+ }
-+ }
-+
- cl->query.psz_url = strdup( p );
- if( ( p3 = strchr( cl->query.psz_url, '?' ) ) )
- {
diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure
deleted file mode 100644
index adf3093a75e..00000000000
--- a/multimedia/vlc/patches/patch-configure
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-configure,v 1.6 2011/01/24 18:54:04 drochner Exp $
-
---- configure.orig 2010-11-12 08:01:11.000000000 +0900
-+++ configure 2011-01-04 22:57:48.000000000 +0900
-@@ -32744,7 +32744,7 @@
- echo "$LIBVA_PKG_ERRORS" >&5
-
-
-- if test "${enable_libva}" == "yes"; then :
-+ if test "${enable_libva}" = "yes"; then :
- as_fn_error $? "Could not find required libva." "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found " >&5
-@@ -32755,7 +32755,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-
-- if test "${enable_libva}" == "yes"; then :
-+ if test "${enable_libva}" = "yes"; then :
- as_fn_error $? "Could not find required libva." "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found " >&5
-@@ -32805,7 +32805,7 @@
-
- else
-
-- if test "${enable_libva}" == "yes"; then :
-+ if test "${enable_libva}" = "yes"; then :
- as_fn_error $? "libva is present but libavcodec/vaapi.h is missing" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva is present but libavcodec/vaapi.h is missing " >&5
-@@ -32879,7 +32879,7 @@
-
- else
-
-- if test "${enable_dxva2}" == "yes"; then :
-+ if test "${enable_dxva2}" = "yes"; then :
- as_fn_error $? "dxva2 is present but libavcodec/dxva2.h is missing" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&5
-@@ -32893,7 +32893,7 @@
-
- else
-
-- if test "${enable_dxva2}" == "yes"; then :
-+ if test "${enable_dxva2}" = "yes"; then :
- as_fn_error $? "Could not find required dxva2api.h" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 18:35:14 +0000