vlc: update to 3.0.3.

This commit is contained in:
Johannes BrechtmanN 2018-06-17 15:18:48 +02:00 committed by maxice8
parent 07e3df2d5a
commit 40bdd8ef01
2 changed files with 13 additions and 94 deletions

View File

@ -1,79 +0,0 @@
https://git.videolan.org/?p=vlc.git;a=blob;f=modules/audio_filter/channel_mixer/simple_neon.h;h=2fe607566c38d8eba5c3308aff408cabc8422623;hb=147717df85c312ac559181fc0943839a3a3bf19c
file is missing in 3.0.2 tarball
--- /dev/null
+++ modules/audio_filter/channel_mixer/simple_neon.h
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * simple_neon.h : simple channel mixer plug-in using NEON assembly
+ *****************************************************************************
+ * Copyright (C) 2002, 2004, 2006-2009, 2012, 2015 VLC authors and VideoLAN
+ * $Id$
+ *
+ * Authors: Gildas Bazin <gbazin@videolan.org>
+ * David Geldreich <david.geldreich@free.fr>
+ * Sébastien Toque
+ * Thomas Guillem <thomas@gllm.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc_cpu.h>
+
+/* Only conversion to Mono, Stereo and 4.0 right now */
+/* Only from 7/7.1/5/5.1/3/3.1/2.0
+ * XXX 5.X rear and middle are handled the same way */
+
+#define NEON_WRAPPER(in, out) \
+ void convert_##in##_to_##out##_neon_asm(float *dst, const float *src, int num, bool lfeChannel); \
+ static inline void DoWork_##in##_to_##out##_neon( filter_t *p_filter, block_t *p_in_buf, block_t *p_out_buf ) \
+ { \
+ const float *p_src = (const float *)p_in_buf->p_buffer; \
+ float *p_dest = (float *)p_out_buf->p_buffer; \
+ convert_##in##_to_##out##_neon_asm( p_dest, p_src, p_in_buf->i_nb_samples, \
+ p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ); \
+ } \
+ static inline void (*GET_WORK_##in##_to_##out##_neon())(filter_t*, block_t*, block_t*) \
+ { \
+ return vlc_CPU_ARM_NEON() ? DoWork_##in##_to_##out##_neon : DoWork_##in##_to_##out; \
+ }
+
+NEON_WRAPPER(7_x,2_0)
+NEON_WRAPPER(5_x,2_0)
+NEON_WRAPPER(4_0,2_0)
+NEON_WRAPPER(3_x,2_0)
+NEON_WRAPPER(7_x,1_0)
+NEON_WRAPPER(5_x,1_0)
+NEON_WRAPPER(7_x,4_0)
+NEON_WRAPPER(5_x,4_0)
+
+/* TODO: the following conversions are not handled in NEON */
+
+#define C_WRAPPER(in, out) \
+ static inline void (*GET_WORK_##in##_to_##out##_neon())(filter_t*, block_t*, block_t*) \
+ { \
+ return DoWork_##in##_to_##out; \
+ }
+
+C_WRAPPER(4_0,1_0)
+C_WRAPPER(3_x,1_0)
+C_WRAPPER(2_x,1_0)
+C_WRAPPER(6_1,2_0)
+C_WRAPPER(7_x,5_x)
+C_WRAPPER(6_1,5_x)

View File

@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.2
revision=3
version=3.0.3
revision=1
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--disable-live555 --disable-fluidsynth --enable-dvdread
@ -14,24 +14,22 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://www.videolan.org/vlc/"
license="GPL-2.0-only, LGPL-2.1-only"
distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
checksum=efe8c889b69bffba9662140bdcf434d9d36edc5dbb0e300fcce4553c354ea198
checksum=9ba8b04bdb13f7860a2041768ac83b47b397a36549c71c530b94028a3cfd5b51
lib32disabled=yes
# XXX Add missing deps: gme, telepathy, live555, libtar (for skins2).
hostmakedepends="automake libtool pkg-config flex bison libgcrypt-devel $(vopt_if lua lua52)"
makedepends="xorgproto eudev-libudev-devel libpng-devel libupnp1.8-devel
ncurses-devel libvorbis-devel x264-devel ffmpeg-devel sndio-devel
xcb-util-devel xcb-util-keysyms-devel libsamplerate-devel
libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel
libmpeg2-devel libflac-devel fribidi-devel freetype-devel libproxy-devel
avahi-libs-devel libmad-devel liba52-devel libdca-devel libass-devel
libdvbpsi-devel libgcrypt-devel dbus-glib-devel libmodplug-devel
gnutls-devel taglib-devel libmatroska-devel libmpcdec-devel
libcdio-devel libdvdnav-devel libsysfs-devel libmtp-devel
sqlite-devel libtheora-devel speex-devel pulseaudio-devel libxml2-devel
opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf
wayland-protocols
makedepends="
avahi-libs-devel dbus-glib-devel faad2-devel ffmpeg-devel freefont-ttf
gnutls-devel jack-devel liba52-devel libass-devel libbluray-devel
libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel
libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel
libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel
libSM-devel libsysfs-devel libtheora-devel libupnp1.8-devel
libXinerama-devel libXpm-devel libXvMC-devel opus-devel pulseaudio-devel
sndio-devel speex-devel taglib-devel wayland-protocols x264-devel
xcb-util-devel xcb-util-keysyms-devel
$(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel)
$(vopt_if qt qt5-x11extras-devel) $(vopt_if qt qt5-svg-devel)
$(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel)