From 11a3b0882aa9585938b6cbdeea1bdf1551b6422e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 9 May 2015 12:49:38 +0200 Subject: [PATCH] vlc: enable ffmpeg plugins: added smb build option. - smb options is enabled for glibc, off for musl (samba is currently broken). - use --enable-merge-ffmpeg to make plugins use ffmpeg instead. - misc tweaks for musl. --- common/options.description | 1 + srcpkgs/vlc/template | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/common/options.description b/common/options.description index b1a2978724..a53356b959 100644 --- a/common/options.description +++ b/common/options.description @@ -54,6 +54,7 @@ desc_option_rpi="Enable support for Raspberry Pi (GPU acceleration)" desc_option_sasl="Enable support for SASL" desc_option_sdl="Enable support for SDL (1.x)" desc_option_sdl2="Enable support for SDL (2.x)" +desc_option_smb="Enable support for SMB protocol" desc_option_sndio="Enable support for the sndio sound server" desc_option_ssl="Enable support for SSL" desc_option_startup_notification="Enable support for desktop notification" diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 5798dc8617..84b96cc6b2 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,13 +1,13 @@ # Template file for 'vlc' pkgname=vlc version=2.2.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-lua --disable-live555 --disable-fluidsynth - --enable-dvdread --enable-flac --disable-gnomevfs + --enable-dvdread --enable-flac --enable-merge-ffmpeg --disable-gnomevfs $(vopt_enable notify) $(vopt_enable opengl glx) $(vopt_enable qt) - $(vopt_enable svg) $(vopt_enable v4l v4l2)" + $(vopt_enable svg) $(vopt_enable v4l v4l2) $(vopt_enable smb smbclient)" short_desc="A cross-platform multimedia player" maintainer="Juan RP " homepage="http://www.videolan.org/vlc/" @@ -25,27 +25,37 @@ makedepends="videoproto libudev-devel libpng-devel libupnp-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 samba-devel libmodplug-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 $(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel) - $(vopt_if qt qt-devel) $(vopt_if svg librsvg-devel) $(vopt_if v4l v4l-utils-devel)" + $(vopt_if qt qt-devel) $(vopt_if svg librsvg-devel) + $(vopt_if v4l v4l-utils-devel) $(vopt_if smb samba-devel)" depends="freefont-ttf hicolor-icon-theme desktop-file-utils" # Package build options -build_options="notify opengl qt svg v4l2" +build_options="notify opengl qt smb svg v4l2" +build_options_default="v4l2" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) + i686-musl|x86_64-musl) + # XXX samba broken with musl # Enable opengl by default on x86. - build_options_default="opengl" + build_options_default+=" opengl" configure_args+=" --enable-vdpau --enable-libva" makedepends+=" libvdpau-devel libva-devel MesaLib-devel" ;; - armv[67]l*) + i686|x86_64) + # Enable opengl and samba by default on x86. + build_options_default+=" opengl smb" + configure_args+=" --enable-vdpau --enable-libva" + makedepends+=" libvdpau-devel libva-devel MesaLib-devel" + ;; + armv[67]l) # XXX only for rpi + build_options_default+=" smb" configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil" makedepends+=" rpi-firmware" CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"