aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <b@bpiotrowski.pl>2013-09-26 14:10:26 +0200
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2013-09-26 14:10:40 +0200
commit180c6d87f35bf6d16f77293d5d7a283f066cf8cd (patch)
tree3d5a5739fee839bd7f8cbed31958f64e35dc9d45 /main
parent6e6c8a53bccc83eee29da01b305739ef5ccfa41a (diff)
downloadaports-180c6d87f35bf6d16f77293d5d7a283f066cf8cd.tar.bz2
aports-180c6d87f35bf6d16f77293d5d7a283f066cf8cd.tar.xz
main/vlc: yet another rebase of uclibc-inhibit-spawn.patch
Diffstat (limited to 'main')
-rw-r--r--main/vlc/APKBUILD6
-rw-r--r--main/vlc/uclibc-inhibit-spawn.patch22
2 files changed, 19 insertions, 9 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 13cd5cf71c..f03dde3d33 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -222,10 +222,10 @@ daemon() {
md5sums="8c77bda671821f5b9ede96b6816e2ade vlc-2.1.0.tar.xz
350b30698eb784def7d19446eb1d6c81 vlc.trigger
-0c3aef5d1e0884b808c621267c07c61c uclibc-inhibit-spawn.patch"
+d7b3b1306722a46fedb5130a75d07381 uclibc-inhibit-spawn.patch"
sha256sums="d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 vlc-2.1.0.tar.xz
0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger
-284db26a640d1f53d343582449f9589521ca14f018f9b2ecb3d0de9ae13908a0 uclibc-inhibit-spawn.patch"
+01fd912343c60430bc86e1365921507e7cbbf02a5af4ce9f4626ec2017799eff uclibc-inhibit-spawn.patch"
sha512sums="abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124 vlc-2.1.0.tar.xz
a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger
-1435e339d2b831ed8e88fcacf7d672fc61229b8d4478e1d2ef6a51c865e35ed82c18f304acbad16762476f8821e5547f484f210400e10fff36c9f97aa9d557e0 uclibc-inhibit-spawn.patch"
+8c125fe928794d351249474755250fefbb67e5ff35255d852ca5cb430dbd48fa9ee6c248cb8615e1fd18df67564b8abdb5196d079d803a1469780e0b7ee27253 uclibc-inhibit-spawn.patch"
diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch
index 9c7e72ed66..f1da2a1526 100644
--- a/main/vlc/uclibc-inhibit-spawn.patch
+++ b/main/vlc/uclibc-inhibit-spawn.patch
@@ -1,6 +1,6 @@
diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
--- a/modules/misc/inhibit/xdg.c 2013-06-24 20:00:38.000000000 +0200
-+++ b/modules/misc/inhibit/xdg.c 2013-09-26 13:57:19.839770148 +0200
++++ b/modules/misc/inhibit/xdg.c 2013-09-26 14:08:51.209759907 +0200
@@ -28,7 +28,11 @@
#include <assert.h>
#include <errno.h>
@@ -24,7 +24,18 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
};
extern char **environ;
-@@ -91,6 +97,7 @@ static int Open (vlc_object_t *obj)
+@@ -60,8 +66,10 @@ static void Timer (void *data)
+ };
+ pid_t pid;
+
++#if (_POSIX_SPAWN >= 0)
+ int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr,
+ argv, environ);
++#endif
+ if (err == 0)
+ {
+ int status;
+@@ -91,6 +99,7 @@ static int Open (vlc_object_t *obj)
if (p_sys == NULL)
return VLC_ENOMEM;
@@ -32,12 +43,11 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
posix_spawnattr_init (&p_sys->attr);
/* Reset signal handlers to default and clear mask in the child process */
{
-@@ -102,12 +109,15 @@ static int Open (vlc_object_t *obj)
- posix_spawnattr_setsigdefault (&p_sys->attr, &set);
+@@ -103,11 +112,14 @@ static int Open (vlc_object_t *obj)
posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
| POSIX_SPAWN_SETSIGMASK);
-+#endif
}
++#endif
ih->p_sys = p_sys;
if (vlc_timer_create (&p_sys->timer, Timer, ih))
@@ -48,7 +58,7 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
free (p_sys);
return VLC_ENOMEM;
}
-@@ -122,6 +132,8 @@ static void Close (vlc_object_t *obj)
+@@ -122,6 +134,8 @@ static void Close (vlc_object_t *obj)
vlc_inhibit_sys_t *p_sys = ih->p_sys;
vlc_timer_destroy (p_sys->timer);