diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 14:47:44 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 14:47:55 +0200 |
| commit | 73a54576d1203ac707c7634e25a3730c2ef2f9a6 (patch) | |
| tree | 7ec901fcbb86919430b0f67d22ad49c3fe355576 | |
| parent | 180c6d87f35bf6d16f77293d5d7a283f066cf8cd (diff) | |
| download | aports-73a54576d1203ac707c7634e25a3730c2ef2f9a6.tar.bz2 aports-73a54576d1203ac707c7634e25a3730c2ef2f9a6.tar.xz | |
main/vlc: declare err variable in xdg.c
| -rw-r--r-- | main/vlc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/vlc/uclibc-inhibit-spawn.patch | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index f03dde3d33..bc21a50aa8 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 -d7b3b1306722a46fedb5130a75d07381 uclibc-inhibit-spawn.patch" +aa338f067d054887c3834a70686fb3f2 uclibc-inhibit-spawn.patch" sha256sums="d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 vlc-2.1.0.tar.xz 0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger -01fd912343c60430bc86e1365921507e7cbbf02a5af4ce9f4626ec2017799eff uclibc-inhibit-spawn.patch" +c56d36afe86733715bdf48d9236dd6f807744a0f80ae01391f24d51ab02abfde uclibc-inhibit-spawn.patch" sha512sums="abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124 vlc-2.1.0.tar.xz a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger -8c125fe928794d351249474755250fefbb67e5ff35255d852ca5cb430dbd48fa9ee6c248cb8615e1fd18df67564b8abdb5196d079d803a1469780e0b7ee27253 uclibc-inhibit-spawn.patch" +7f285dd070d4998f0af3dd4a4965a7a181fed5e1e52271a5b30d1b72c3d3cd4a9771a7ef6ff9f094ada95b31c3400a34bdf8f29905d30c1ac3b765621d81e6d4 uclibc-inhibit-spawn.patch" diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index f1da2a1526..5a8033addc 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 14:08:51.209759907 +0200 ++++ b/modules/misc/inhibit/xdg.c 2013-09-26 14:45:13.069727587 +0200 @@ -28,7 +28,11 @@ #include <assert.h> #include <errno.h> @@ -24,18 +24,20 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c }; extern char **environ; -@@ -60,8 +66,10 @@ static void Timer (void *data) +@@ -60,8 +66,12 @@ static void Timer (void *data) }; pid_t pid; +#if (_POSIX_SPAWN >= 0) int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr, argv, environ); ++#else ++ int err; +#endif if (err == 0) { int status; -@@ -91,6 +99,7 @@ static int Open (vlc_object_t *obj) +@@ -91,6 +101,7 @@ static int Open (vlc_object_t *obj) if (p_sys == NULL) return VLC_ENOMEM; @@ -43,7 +45,7 @@ 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 */ { -@@ -103,11 +112,14 @@ static int Open (vlc_object_t *obj) +@@ -103,11 +114,14 @@ static int Open (vlc_object_t *obj) posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); } @@ -58,7 +60,7 @@ diff -rupN a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c free (p_sys); return VLC_ENOMEM; } -@@ -122,6 +134,8 @@ static void Close (vlc_object_t *obj) +@@ -122,6 +136,8 @@ static void Close (vlc_object_t *obj) vlc_inhibit_sys_t *p_sys = ih->p_sys; vlc_timer_destroy (p_sys->timer); |