diff --git a/vlc.spec b/vlc.spec index 1555b92..7a3cbd9 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,18 +1,10 @@ %define dirver %(echo %version | cut -d_ -f1) %define pkgver %(echo %version | tr _ -) - -#%if "%{stage1}" == "1" -#%define with_mozilla 0 -#%else -#%define with_mozilla 1 -#%endif %define with_pulseaudio 1 -%if %with_mozilla -%define mozilla_sdk_dir %(pkg-config --variable=sdkdir libxul) -%endif + Name: vlc Version: 3.0.12 -Release: 1mamba +Release: 2mamba Summary: The VideoLAN client Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -35,32 +27,48 @@ Patch13: vlc-3.0.3-libqt5-5.12.0.patch Patch14: vlc-3.0.11.1-libqt5-5.15.patch License: GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: enca-devel BuildRequires: fluidsynth-devel -BuildRequires: GConf-devel BuildRequires: glibc-devel +BuildRequires: ldconfig +BuildRequires: libGL-devel +BuildRequires: libGLU-devel +BuildRequires: libICE-devel +BuildRequires: libSDL-devel +BuildRequires: libSDL_image-devel +BuildRequires: libSM-devel +BuildRequires: libX11-devel +BuildRequires: libXau-devel +BuildRequires: libXdmcp-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXinerama-devel +BuildRequires: libXpm-devel BuildRequires: liba52dec-devel BuildRequires: libaa-devel +BuildRequires: libacl-devel BuildRequires: libalsa-devel +BuildRequires: libarchive-devel BuildRequires: libass-devel BuildRequires: libatk-devel BuildRequires: libavahi-devel -BuildRequires: libavahi-glib-devel +BuildRequires: libavc1394-devel BuildRequires: libavcodec-ffmpeg-devel BuildRequires: libavformat-ffmpeg-devel BuildRequires: libavutil-ffmpeg-devel BuildRequires: libbluray-devel +BuildRequires: libbrotli-devel +BuildRequires: libbsd-devel BuildRequires: libbzip2-devel BuildRequires: libcaca-devel BuildRequires: libcairo-devel BuildRequires: libcddb-devel -BuildRequires: libcdio-devel -BuildRequires: libcroco-devel +BuildRequires: libchromaprint-devel +%ifarch x86_64 %{ix86} +BuildRequires: libcrystalhd-devel +%endif BuildRequires: libdbus-devel -BuildRequires: libdbus-glib-devel BuildRequires: libdc1394-devel BuildRequires: libdca-devel -BuildRequires: libdirac-devel BuildRequires: libdirectfb-devel BuildRequires: libdrm-devel BuildRequires: libdvbpsi-devel @@ -79,66 +87,67 @@ BuildRequires: libftgl-devel BuildRequires: libgcc BuildRequires: libgcrypt-devel BuildRequires: libgdk-pixbuf-devel -BuildRequires: libGL-devel BuildRequires: libglib-devel -BuildRequires: libGLU-devel -BuildRequires: libgnome-vfs-devel +BuildRequires: libgmp-devel BuildRequires: libgnutls-devel BuildRequires: libgoom2-devel BuildRequires: libgpg-error-devel BuildRequires: libgpm-devel BuildRequires: libgraphite2-devel -BuildRequires: libgtk2-devel +BuildRequires: libgst-plugins-base-devel +BuildRequires: libgstreamer-devel +BuildRequires: libgtk-devel BuildRequires: libharfbuzz-devel -BuildRequires: libICE-devel -BuildRequires: libicu-devel +BuildRequires: libidn-devel BuildRequires: libjack-devel +BuildRequires: libjpeg-devel BuildRequires: libkate-devel -BuildRequires: liblash-devel +BuildRequires: liblua-devel +BuildRequires: liblz4-devel BuildRequires: liblzma-devel +BuildRequires: liblzo-devel BuildRequires: libmad-devel BuildRequires: libmatroska-devel BuildRequires: libmodplug-devel -BuildRequires: libmusepack-devel BuildRequires: libmpeg2-devel +BuildRequires: libmpg123-devel BuildRequires: libmtp-devel +BuildRequires: libmusepack-devel BuildRequires: libncurses-devel BuildRequires: libnettle-devel +BuildRequires: libnfs-devel BuildRequires: libnotify-devel BuildRequires: libogg-devel BuildRequires: libopenssl-devel BuildRequires: libopus-devel BuildRequires: liborc-devel +BuildRequires: libp11-kit-devel BuildRequires: libpango-devel -BuildRequires: libpng15-devel +BuildRequires: libpcre-devel BuildRequires: libpng-devel -BuildRequires: libportaudio-devel BuildRequires: libpostproc-ffmpeg-devel BuildRequires: libprojectM-devel -BuildRequires: libproxy-devel -BuildRequires: libpthread-stubs-devel -%if %with_pulseaudio +BuildRequires: libprotobuf-devel BuildRequires: libpulseaudio-devel -%endif -BuildRequires: libqt4-devel +BuildRequires: libqt5-devel BuildRequires: libraw1394-devel BuildRequires: libreadline-devel BuildRequires: librsvg-devel BuildRequires: libsamplerate-devel BuildRequires: libschroedinger-devel -BuildRequires: libSDL-devel -BuildRequires: libSDL_image-devel -BuildRequires: libselinux-devel +BuildRequires: libsecret-devel +BuildRequires: libshine-devel BuildRequires: libshout-devel BuildRequires: libsidplay2-devel BuildRequires: libslang-devel BuildRequires: libsmbclient-devel -BuildRequires: libSM-devel -BuildRequires: libsndfile-devel +BuildRequires: libsoxr-devel BuildRequires: libspeex-devel +BuildRequires: libssh2-devel BuildRequires: libssp-devel BuildRequires: libstdc++6-devel BuildRequires: libswscale-ffmpeg-devel +BuildRequires: libsystemd-devel BuildRequires: libtag-devel BuildRequires: libtar-devel BuildRequires: libtasn1-devel @@ -146,95 +155,60 @@ BuildRequires: libtheora-devel BuildRequires: libtiger-devel BuildRequires: libts-devel BuildRequires: libtwolame-devel +BuildRequires: libudev-devel +BuildRequires: libunistring-devel BuildRequires: libupnp-devel -BuildRequires: libusbx-devel +BuildRequires: libusb-devel BuildRequires: libuuid-devel BuildRequires: libva-devel -BuildRequires: libvcdimager-devel +BuildRequires: libvncserver-devel BuildRequires: libvorbis-devel BuildRequires: libvorbisidec-devel -BuildRequires: libX11-devel +BuildRequires: libvpx-devel BuildRequires: libx264-devel -BuildRequires: libXau-devel BuildRequires: libxcb-devel BuildRequires: libxcb-keysyms-devel -BuildRequires: libXdmcp-devel -BuildRequires: libXext-devel -BuildRequires: libXfixes-devel -BuildRequires: libXi-devel -BuildRequires: libXinerama-devel BuildRequires: libxml2-devel -BuildRequires: libXpm-devel -BuildRequires: libXrandr-devel -BuildRequires: libXrender-devel -BuildRequires: libXxf86vm-devel BuildRequires: libz-devel +BuildRequires: libzstd-devel BuildRequires: libzvbi-devel -BuildRequires: ORBit2-devel -BuildRequires: p11-kit-devel -BuildRequires: udev-devel -BuildRequires: xosd-devel ## AUTOBUILDREQ-END -BuildRequires: libpulseaudio-devel >= 8.0-1mamba -BuildRequires: liblive-devel -BuildRequires: libaudio-devel -BuildRequires: libaudiofile-devel -BuildRequires: libavc1394-devel -BuildRequires: libe2fs-devel -BuildRequires: libesound-devel -BuildRequires: libglitz-devel -BuildRequires: libid3tag-devel -BuildRequires: libjpeg-devel -BuildRequires: liboil-devel -BuildRequires: libpixman-devel -BuildRequires: libsysfs-devel -BuildRequires: libtiff-devel -BuildRequires: libxvidcore-devel -BuildRequires: libtelepathy-glib-devel -BuildRequires: liblame-devel -BuildRequires: libfaac-devel -BuildRequires: libdc1394-devel -BuildRequires: bash -BuildRequires: libpth-devel -BuildRequires: libwxBase2.8-unicode-devel -BuildRequires: libwxGTK2.8-unicode-devel -BuildRequires: ORBit2-devel -BuildRequires: gcc-c++ -BuildRequires: gettext-devel -BuildRequires: libladcca-devel +#BuildRequires: libaudiofile-devel +#BuildRequires: libe2fs-devel +#BuildRequires: libglitz-devel +#BuildRequires: libid3tag-devel +#BuildRequires: liboil-devel +#BuildRequires: libpixman-devel +#BuildRequires: libsysfs-devel +#BuildRequires: libtiff-devel +#BuildRequires: libxvidcore-devel +#BuildRequires: libtelepathy-glib-devel +#BuildRequires: liblame-devel +#BuildRequires: libfaac-devel +#BuildRequires: libpth-devel +#BuildRequires: libwxBase2.8-unicode-devel +#BuildRequires: libwxGTK2.8-unicode-devel +#BuildRequires: ORBit2-devel +#BuildRequires: libladcca-devel #BuildRequires: libtremor-devel -BuildRequires: libopencv-devel -#%if %with_mozilla -#BuildRequires: libjs-devel -#BuildRequires: libnspr-devel -#BuildRequires: libnss-devel -#BuildRequires: xulrunner-devel -#%endif -BuildRequires: lua -BuildRequires: liblua-devel >= 5.2.4-2mamba -BuildRequires: libssp-devel -BuildRequires: libgmp-devel -BuildRequires: libftgl-devel -BuildRequires: libsidplay2-devel -BuildRequires: libxcb-keysyms-devel -BuildRequires: libebml >= 1.4.0 -BuildRequires: libmatroska >= 1.6.2 -BuildRequires: libdirectfb >= 1.7.7 -BuildRequires: libtar >= 1.2.20 -BuildRequires: libtag-devel >= 1.11 -BuildRequires: libupnp-devel >= 1.14.0 +#BuildRequires: libopencv-devel +BuildRequires: lua52 BuildRequires: libfreerdp-devel -BuildRequires: libshine-devel -BuildRequires: ffmpeg-devel -BuildRequires: fluidsynth-devel >= 1.1.6-4mamba -#Requires: avahi-compat-howl -#Requires: avahi-compat-libdns_sd -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: liblive-devel +BuildRequires: libprojectM-devel >= 3.1.7 +BuildRequires: libspeexdsp-devel +BuildRequires: libsasl2-devel +BuildRequires: protobuf +BuildRequires: libva-static +%ifarch arm aarch64 +BuildRequires: libraspberrypi-devel +%endif Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: libqt5-plugins Requires: vlc-pulseaudio-plugin = %{?epoch:%epoch:}%{version}-%{release} Provides: %{name}-mozilla-plugin Obsoletes: %{name}-mozilla-plugin +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description VideoLAN Client (VLC) is a highly portable multimedia player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. @@ -242,6 +216,8 @@ VideoLAN Client (VLC) is a highly portable multimedia player for various audio a %package -n lib%{name} Group: System/Libraries Summary: Shared libraries for %{name} +Provides: %{name}-pulseaudio-plugin +Obsoletes: %{name}-pulseaudio-plugin <= 3.0.12-1mamba %description -n lib%{name} VideoLAN Client (VLC) is a highly portable multimedia player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. @@ -267,51 +243,20 @@ Requires: postgresql = %{version}-%{release} %description contrib The %{name}-contrib package contains contributed packages that are included in the %{name} distribution. -%package mozilla-plugin -Summary: VLC plugins for Firefox -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: firefox - -%description mozilla-plugin -The VideoLAN client. - -This package contains VLC plugins for firefox. - -%package pulseaudio-plugin -Summary: VLC plugins for PulseAudio -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: pulseaudio - -%description pulseaudio-plugin -The VideoLAN client. -This package contains VLC plugins for PulseAudio. - %debug_package %prep %setup -q -n %{name}-%{dirver} #-D -T #:<< _EOF -#%patch0 -p1 -#%patch1 -p1 -#%patch4 -p1 -#%patch5 -p1 %patch6 -p1 -#%patch7 -p1 -#%patch8 -p1 %patch9 -p1 -#%patch10 -p1 %patch11 -p1 -#%patch12 -p1 -#%patch13 -p1 -#%patch14 -p1 - -%build # FIXME: bootstrap: build with ffmpeg2 is correct, but libs are relinked with ffmpeg at install ./bootstrap +%build +#:<< _EOF #export LIBV4L2_LIBS=-L%{_libdir}/libv4l/ LIBV4L2_CFLAGS=-I%{_includedir} #export PKG_CONFIG_PATH=%{_libdir}/ffmpeg2/pkgconfig %configure \ @@ -364,6 +309,8 @@ This package contains VLC plugins for PulseAudio. # --enable-sdl \ # --enable-vcdx \ +:<< _EOF + %ifarch arm LD_PRELOAD=/usr/lib/librsvg-2.so %make %else @@ -474,6 +421,8 @@ fi #%{_libdir}/vlc/plugins/audio_output/liboss_plugin.so #%{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.la #%{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so +%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.la +%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so %{_libdir}/vlc/plugins/codec %{_libdir}/vlc/plugins/control %{_libdir}/vlc/plugins/demux @@ -530,20 +479,10 @@ fi %{_libdir}/pkgconfig/vlc-plugin.pc %doc ChangeLog README THANKS -%if %with_pulseaudio -%files pulseaudio-plugin -%defattr(-,root,root) -%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.la -%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so -%endif - -#%if %with_mozilla -#%files mozilla-plugin -#%defattr(-,root,root) -##%{_libdir}/mozilla/plugins/libvlcplugin.so -#%endif - %changelog +* Fri Jan 29 2021 Silvan Calarco 3.0.12-2mamba +- rebuilt with libprojectM 3.1.7 + * Fri Jan 22 2021 Silvan Calarco 3.0.12-1mamba - update to 3.0.12