diff options
| -rw-r--r-- | main/vlc/APKBUILD | 10 | ||||
| -rw-r--r-- | main/vlc/uclibc-inhibit-spawn.patch | 55 | ||||
| -rw-r--r-- | main/vlc/uclibc-libcompat.patch | 57 |
3 files changed, 88 insertions, 34 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 07f6a2d46b8..291076bf881 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=1.1.11 -pkgrel=3 +pkgver=1.1.12 +pkgrel=0 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" pkgusers="vlc" pkggroups="vlc" @@ -183,9 +183,9 @@ daemon() { install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc } -md5sums="a64846d6f21ea179ae8e8bfb6f9447fe vlc-1.1.11.tar.bz2 +md5sums="91de1ad308c947e35380f9d747ff5713 vlc-1.1.12.tar.bz2 ba24152286d98f8a367c7fd0cb8949f4 uclibc3.patch -d718e22a7de9f38579f276f720b2f36a uclibc-libcompat.patch -43bea31edd02de2b53075e5e883706db uclibc-inhibit-spawn.patch +402d28075ff672d4f273cf8b9b1b3137 uclibc-libcompat.patch +c40a7df07af3b68a109b4d6bf04155d2 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 1fe27fbab27..75cff1bb6b3 100644 --- a/main/vlc/uclibc-inhibit-spawn.patch +++ b/main/vlc/uclibc-inhibit-spawn.patch @@ -1,6 +1,8 @@ ---- a/modules/misc/inhibit/xdg.c.orig +diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c +index cfb3b2a..16a2ce9 100644 +--- a/modules/misc/inhibit/xdg.c +++ b/modules/misc/inhibit/xdg.c -@@ -26,7 +26,12 @@ +@@ -26,7 +26,11 @@ #include <vlc_plugin.h> #include <vlc_inhibit.h> #include <assert.h> @@ -10,16 +12,59 @@ +#else +# include <spawn.h> +#endif -+ #include <sys/wait.h> static int Open (vlc_object_t *); -@@ -137,7 +142,15 @@ +@@ -46,7 +50,9 @@ struct vlc_inhibit_sys + vlc_thread_t thread; + vlc_cond_t update, inactive; + vlc_mutex_t lock; ++#if (_POSIX_SPAWN >= 0) + posix_spawnattr_t attr; ++#endif + bool suspend, suspended; + }; + +@@ -66,17 +72,21 @@ 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 + /* Reset signal handlers to default and clear mask in the child process */ + { + sigset_t set; + + sigemptyset (&set); +- posix_spawnattr_setsigmask (&p_sys->attr, &set); + sigaddset (&set, SIGPIPE); ++#if (_POSIX_SPAWN >= 0) ++ posix_spawnattr_setsigmask (&p_sys->attr, &set); + posix_spawnattr_setsigdefault (&p_sys->attr, &set); + posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF + | POSIX_SPAWN_SETSIGMASK); ++#endif + } + p_sys->suspend = false; + p_sys->suspended = false; +@@ -105,7 +115,9 @@ static void Close (vlc_object_t *obj) + + vlc_cancel (p_sys->thread); + vlc_join (p_sys->thread, NULL); ++#if (_POSIX_SPAWN >= 0) + posix_spawnattr_destroy (&p_sys->attr); ++#endif + 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) pid_t pid; vlc_mutex_unlock (&p_sys->lock); +#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)) +#else + pid = fork(); + if (pid == 0) { diff --git a/main/vlc/uclibc-libcompat.patch b/main/vlc/uclibc-libcompat.patch index e4008002f49..056b1411d3a 100644 --- a/main/vlc/uclibc-libcompat.patch +++ b/main/vlc/uclibc-libcompat.patch @@ -1,21 +1,27 @@ -commit c605c09bbc29d88619264c55c371c9dcbc839eda -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu Jul 29 19:20:17 2010 +0000 +From b5f5c2cc68f60feea3b8f397f13f13e514d852d4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 28 Oct 2011 09:50:08 +0000 +Subject: [PATCH] build: libcompat fix in case there are no functions to + replace - build: libcompat fix in case there are no functions to replace - - If the libc provides all the funcs in libcompat the libcompat.a will - never be created due to LIBOBJS is empty (normally it contains whatever - AC_REPLACE_FUNCS detects). This happens on uclibc. - - Since Makefile.am have a hardcoded LDADD to ../compat/libcompat.la things - goes bad when there is no libcompat.a at all. We solve this by checking - if LIBOBJS is set by AC_REPLACE_FUNCS and add libcompat via LTLIBCOMPAT. - - For alternative fixes see http://www.gnu.org/software/hello/manual/automake/LIBOBJS.html +If the libc provides all the funcs in libcompat the libcompat.a will +never be created due to LIBOBJS is empty (normally it contains whatever +AC_REPLACE_FUNCS detects). This happens on uclibc. + +Since Makefile.am have a hardcoded LDADD to ../compat/libcompat.la things +goes bad when there is no libcompat.a at all. We solve this by checking +if LIBOBJS is set by AC_REPLACE_FUNCS and add libcompat via LTLIBCOMPAT. + +For alternative fixes see http://www.gnu.org/software/hello/manual/automake/LIBOBJS.html +--- + bin/Makefile.am | 2 +- + configure.ac | 8 ++++++++ + modules/common.am | 2 +- + src/Makefile.am | 4 ++-- + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am -index 92e6879..a941d99 100644 +index 19dfb57..9214016 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -60,5 +60,5 @@ vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc @@ -26,10 +32,10 @@ index 92e6879..a941d99 100644 + $(LTLIBCOMPAT) \ ../src/libvlc.la ../src/libvlccore.la diff --git a/configure.ac b/configure.ac -index 52e4830..b385100 100644 +index f216fa4..3997a85 100644 --- a/configure.ac +++ b/configure.ac -@@ -547,6 +547,14 @@ need_libc=false +@@ -557,6 +557,14 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale]) AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf]) @@ -45,10 +51,10 @@ index 52e4830..b385100 100644 [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) diff --git a/modules/common.am b/modules/common.am -index 5e4d65f..9e2c739 100644 +index ac88493..a117cc4 100644 --- a/modules/common.am +++ b/modules/common.am -@@ -24,7 +24,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \ +@@ -25,7 +25,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \ -no-undefined \ `$(VLC_CONFIG) --ldflags plugin $@` AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \ @@ -58,19 +64,19 @@ index 5e4d65f..9e2c739 100644 include $(srcdir)/Modules.am diff --git a/src/Makefile.am b/src/Makefile.am -index f46a154..6aad884 100644 +index a8ab729..01c5158 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -201,7 +201,7 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ +@@ -204,7 +204,7 @@ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ -export-symbols $(srcdir)/libvlccore.sym \ - -version-info 5:0:0 + -version-info 4:3:0 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \ - $(LTLIBINTL) ../compat/libcompat.la + $(LTLIBINTL) $(LTLIBCOMPAT) libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) -@@ -214,7 +214,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc +@@ -217,7 +217,7 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc libvlc_la_SOURCES = $(SOURCES_libvlc_control) nodist_libvlc_la_SOURCES = revision.c libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \ @@ -78,4 +84,7 @@ index f46a154..6aad884 100644 + libvlccore.la $(LTLIBCOMPAT) libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \ - -version-info 6:0:1 \ + -version-info 7:1:2 \ +-- +1.7.7.1 + |