diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-01-30 09:29:41 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-01-30 09:29:41 +0200 |
| commit | 3a0e1b81adcd1420a5e847f0c117e542cff34fe3 (patch) | |
| tree | 55a281a15c48ca2bce688d886375b5e598dd8d99 | |
| parent | 6a908b24ca35c697ed6419b1df323a72e8685d79 (diff) | |
| download | aports-3a0e1b81adcd1420a5e847f0c117e542cff34fe3.tar.bz2 aports-3a0e1b81adcd1420a5e847f0c117e542cff34fe3.tar.xz | |
main/vlc: update to 1.1.6 and enable libdvbpsi
| -rw-r--r-- | main/vlc/APKBUILD | 10 | ||||
| -rw-r--r-- | main/vlc/uclibc-inhibit-spawn.patch | 25 |
2 files changed, 17 insertions, 18 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 935706bf2b..18f06afaf9 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=1.1.5 -pkgrel=2 +pkgver=1.1.6 +pkgrel=0 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" url="http://www.videolan.org/vlc/" arch="all" @@ -25,6 +25,7 @@ makedepends=" flac-dev fribidi-dev gtk+-dev + libdvbpsi-dev libgcrypt-dev libice-dev libiconv-dev @@ -94,6 +95,7 @@ build () --enable-vlm \ --enable-xvideo \ --enable-live555 \ + --enable-dvbpsi \ || return 1 # --enable-dvdread \ @@ -146,8 +148,8 @@ xorg() { "$subpkgdir"/usr/share/ } -md5sums="fdc23693351ed57af9f4c85ea885b536 vlc-1.1.5.tar.bz2 +md5sums="c47f3ebc886f2aff8c95b98c564d1759 vlc-1.1.6.tar.bz2 4f74dcde9ce51c15d80c3876b85c05f2 uclibc3.patch d718e22a7de9f38579f276f720b2f36a uclibc-libcompat.patch -361d6ae9d7b846833ed31e8454074158 uclibc-inhibit-spawn.patch +43bea31edd02de2b53075e5e883706db uclibc-inhibit-spawn.patch ddbd40bd72fedc1449be45588aea5d66 vlc.trigger" diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch index 9a6be5bd6a..1fe27fbab2 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,11 +1,9 @@ -diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c -index 01decac..134c5c9 100644 ---- a/modules/misc/inhibit/xdg.c +--- a/modules/misc/inhibit/xdg.c.orig +++ b/modules/misc/inhibit/xdg.c -@@ -25,7 +25,12 @@ - #include <vlc_common.h> +@@ -26,7 +26,12 @@ #include <vlc_plugin.h> #include <vlc_inhibit.h> + #include <assert.h> -#include <spawn.h> +#if !defined(_POSIX_SPAWN) +# define _POSIX_SPAWN -1 @@ -16,19 +14,18 @@ index 01decac..134c5c9 100644 #include <sys/wait.h> static int Open (vlc_object_t *); -@@ -125,8 +130,15 @@ static void *Thread (void *data) - }; +@@ -137,7 +142,15 @@ pid_t pid; - int canc = vlc_savecancel (); -- + + vlc_mutex_unlock (&p_sys->lock); +#if (_POSIX_SPAWN >= 0) if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ)) +#else -+ pid = fork(); -+ if (pid == 0) { -+ execvp("xdg-screensaver", argv); -+ exit(1); -+ } else if (pid > 0) ++ pid = fork(); ++ if (pid == 0) { ++ execvp("xdg-screensaver", argv); ++ exit(1); ++ } else if (pid > 0) +#endif { int status; |