diff options
| -rw-r--r-- | main/vlc/APKBUILD | 17 | ||||
| -rw-r--r-- | main/vlc/uclibc-inhibit-spawn.patch | 19 |
2 files changed, 18 insertions, 18 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 9c3615882..c09d036b5 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=1.1.12 -pkgrel=1 +pkgver=1.1.13 +pkgrel=0 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" pkgusers="vlc" pkggroups="vlc" @@ -11,16 +11,17 @@ arch="all" license="GPL-2" triggers="$pkgname.trigger=/usr/lib/vlc/plugins" subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon" -#depends="libnotify a52dec fluidsynth zvbi libdvbpsi lirc-utils libdca hal -# libproxy sdl_image libdvdnav>=4.1.3 lua libxv libv4l libcddb smbclient -# libmatroska taglib sysfsutils libmpcdec ffmpeg>=0.5 libshout libmad -# qt fribidi libmpeg2 libmodplug avahi ttf-dejavu" +#depends="fluidsynth zvbi lirc-utils libdca +# libproxy libdvdnav>=4.1.3 libcddb smbclient +# libmatroska libmpcdec +# qt libmodplug ttf-dejavu" depends="ttf-dejavu" makedepends=" a52dec-dev alsa-lib-dev automake autoconf + avahi-dev libtool dbus-dev faad2-dev @@ -183,9 +184,9 @@ daemon() { install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc } -md5sums="91de1ad308c947e35380f9d747ff5713 vlc-1.1.12.tar.bz2 +md5sums="9678fb7a04808b6e0de63746d35e4bb1 vlc-1.1.13.tar.bz2 ba24152286d98f8a367c7fd0cb8949f4 uclibc3.patch 402d28075ff672d4f273cf8b9b1b3137 uclibc-libcompat.patch -c40a7df07af3b68a109b4d6bf04155d2 uclibc-inhibit-spawn.patch +28349b8239fdd6987fbe0ca2c758517f uclibc-inhibit-spawn.patch ddbd40bd72fedc1449be45588aea5d66 vlc.trigger e1ef2dec8e25f7ea6ba40e646c63e061 vlc-1.1.7-disable-cache-gen.patch" diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index 75cff1bb6..c34ebe0f7 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,11 +1,11 @@ diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c -index cfb3b2a..16a2ce9 100644 +index 3f297c6..e16a21e 100644 --- a/modules/misc/inhibit/xdg.c +++ b/modules/misc/inhibit/xdg.c -@@ -26,7 +26,11 @@ - #include <vlc_plugin.h> +@@ -27,7 +27,11 @@ #include <vlc_inhibit.h> #include <assert.h> + #include <signal.h> -#include <spawn.h> +#if !defined(_POSIX_SPAWN) +# define _POSIX_SPAWN -1 @@ -15,7 +15,7 @@ index cfb3b2a..16a2ce9 100644 #include <sys/wait.h> static int Open (vlc_object_t *); -@@ -46,7 +50,9 @@ struct vlc_inhibit_sys +@@ -47,7 +51,9 @@ struct vlc_inhibit_sys vlc_thread_t thread; vlc_cond_t update, inactive; vlc_mutex_t lock; @@ -25,13 +25,11 @@ index cfb3b2a..16a2ce9 100644 bool suspend, suspended; }; -@@ -66,17 +72,21 @@ static int Open (vlc_object_t *obj) +@@ -67,17 +73,19 @@ 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); -+#if (_POSIX_SPAWN >= 0) - posix_spawnattr_init (&p_sys->attr); -+#endif +- posix_spawnattr_init (&p_sys->attr); /* Reset signal handlers to default and clear mask in the child process */ { sigset_t set; @@ -40,6 +38,7 @@ index cfb3b2a..16a2ce9 100644 - posix_spawnattr_setsigmask (&p_sys->attr, &set); sigaddset (&set, SIGPIPE); +#if (_POSIX_SPAWN >= 0) ++ posix_spawnattr_init (&p_sys->attr); + posix_spawnattr_setsigmask (&p_sys->attr, &set); posix_spawnattr_setsigdefault (&p_sys->attr, &set); posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF @@ -48,7 +47,7 @@ index cfb3b2a..16a2ce9 100644 } p_sys->suspend = false; p_sys->suspended = false; -@@ -105,7 +115,9 @@ static void Close (vlc_object_t *obj) +@@ -106,7 +114,9 @@ static void Close (vlc_object_t *obj) vlc_cancel (p_sys->thread); vlc_join (p_sys->thread, NULL); @@ -58,7 +57,7 @@ index cfb3b2a..16a2ce9 100644 vlc_cond_destroy (&p_sys->inactive); vlc_cond_destroy (&p_sys->update); vlc_mutex_destroy (&p_sys->lock); -@@ -152,8 +164,16 @@ static void *Thread (void *data) +@@ -153,8 +163,16 @@ static void *Thread (void *data) pid_t pid; vlc_mutex_unlock (&p_sys->lock); |