diff options
Diffstat (limited to 'community/vlc')
| -rw-r--r-- | community/vlc/0001-configure-test-for-getaddrinfo_a-and-libanl.patch | 63 | ||||
| -rw-r--r-- | community/vlc/APKBUILD | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | community/vlc/vlc.initd | 0 |
3 files changed, 5 insertions, 74 deletions
diff --git a/community/vlc/0001-configure-test-for-getaddrinfo_a-and-libanl.patch b/community/vlc/0001-configure-test-for-getaddrinfo_a-and-libanl.patch deleted file mode 100644 index 0a4c267a8a0..00000000000 --- a/community/vlc/0001-configure-test-for-getaddrinfo_a-and-libanl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 1165e150d5867c3bbcae559c0d09076000b8cf9d Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 20 Dec 2017 12:00:57 +0000 -Subject: [PATCH] configure: test for getaddrinfo_a and libanl - -Test for the existence of the GNU extension getaddrinf_a and libanl -instead of assuming that every Linux has it. Fall back to posix variant -if they are missing. - -This fixes build with musl libc which does not implement this GNU -extension. - -Fixes #19320 - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - configure.ac | 5 +++++ - src/Makefile.am | 5 ++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index acbee6c0b1..d3d9e20105 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -330,6 +330,7 @@ AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1") - AM_CONDITIONAL(HAVE_TVOS, test "${HAVE_TVOS}" = "1") - - AM_CONDITIONAL(HAVE_NACL, test "${SYS}" = "nacl") -+AM_CONDITIONAL(HAVE_LIBANL, test "${HAVE_LIBANL}" = "1") - - AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") - AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") dnl Only used for the packaging -@@ -759,6 +760,10 @@ dnl __STDC_NO_THREADS__ can't be trusted on some platforms. - dnl check for its availability explicitely - AC_CHECK_HEADERS([threads.h]) - -+AC_CHECK_LIB([anl],[getaddrinfo_a],[ -+ AC_DEFINE(HAVE_LIBANL, 1, [Define to 1 if you have the anl library]) -+]) -+ - dnl Check for dynamic plugins - LIBDL="" - have_dynamic_objects="no" -diff --git a/src/Makefile.am b/src/Makefile.am -index 096dfc2a24..b77ddf4132 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -429,8 +429,11 @@ if HAVE_LINUX - libvlccore_la_SOURCES += \ - linux/cpu.c \ - linux/dirs.c \ -- linux/getaddrinfo.c \ - linux/thread.c -+endif -+if HAVE_LIBANL -+libvlccore_la_SOURCES += \ -+ linux/getaddrinfo.c - libvlccore_la_LIBADD += -lanl - else - libvlccore_la_SOURCES += \ --- -2.15.0 - diff --git a/community/vlc/APKBUILD b/community/vlc/APKBUILD index 6ba43d2e264..e827564091e 100644 --- a/community/vlc/APKBUILD +++ b/community/vlc/APKBUILD @@ -2,10 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc -pkgver=3.0.0_rc2 -_pkgver=${pkgver/_/-} -_ver=${_pkgver%[a-z]} -pkgrel=2 +pkgver=3.0.1 +pkgrel=0 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -113,16 +111,14 @@ makedepends=" xdg-utils samba-dev " -source="http://download.videolan.org/pub/videolan/testing/vlc-$_ver/vlc-$_ver.tar.xz - 0001-configure-test-for-getaddrinfo_a-and-libanl.patch +source="http://get.videolan.org/vlc/$pkgver/$pkgname-$pkgver.tar.xz omxil-rpi-codecs.patch check-headless.patch - fix-test-endian.patch disable-sub-autodetect-fuzzy-1-test.patch test-s390x.patch vlc-libs.trigger" -builddir="$srcdir"/$pkgname-$_ver +builddir="$srcdir/$pkgname-$pkgver" prepare() { default_prepare @@ -331,11 +327,9 @@ plugins_video_filter() { _mv_plugins video_filter; } plugins_video_output() { _mv_plugins video_output; } plugins_visualization() { _mv_plugins visualization; } -sha512sums="20b28f73938fbb1c946d72c56b1b5a53a747a866057f0b0085749e21e6b6be86f24a6d8681051e4bba5e40728595fd766816f0c22fc56fe444bcd3d25b972003 vlc-3.0.0-rc2.tar.xz -64a46f6f0256d499492742a7662453a8491b2676c9a09fd6f898ce57e6cdeb7f8932d739ede1fc938ed7be4f5f8a3295a3be71f49c412a50f9a5c2d388cad81b 0001-configure-test-for-getaddrinfo_a-and-libanl.patch +sha512sums="f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c vlc-3.0.1.tar.xz e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch -cca077d33ed077fc6cebdd47ed7f47c86db4ebdf1521d951336a52435921dc38efb4c91f87125393dfd69b145fa276f65035a7f522776f393059641be4d68f20 fix-test-endian.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406 vlc-libs.trigger" diff --git a/community/vlc/vlc.initd b/community/vlc/vlc.initd index 541a071805c..541a071805c 100755..100644 --- a/community/vlc/vlc.initd +++ b/community/vlc/vlc.initd |