diff --git a/arm-neon-asm.patch b/arm-neon-asm.patch new file mode 100644 index 0000000..5eb5311 --- /dev/null +++ b/arm-neon-asm.patch @@ -0,0 +1,44 @@ +Index: vlc-3.0.1/modules/arm_neon/asm.S +=================================================================== +--- /dev/null ++++ vlc-3.0.1/modules/arm_neon/asm.S +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (c) 2018 Janne Grunau ++ * ++ * 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 __APPLE__ ++# define EXTERN_ASM _ ++#else ++# define EXTERN_ASM ++#endif ++ ++#if defined(__APPLE__) || defined(_WIN32) ++# define HAVE_AS_ARCH_DIRECTIVE 0 ++# define HAVE_AS_FPU_DIRECTIVE 0 ++#else ++# define HAVE_AS_ARCH_DIRECTIVE 1 ++# define HAVE_AS_FPU_DIRECTIVE 1 ++#endif ++ ++.macro function name ++ .globl EXTERN_ASM\name ++#ifdef __ELF__ ++ .type EXTERN_ASM\name, %function ++#endif ++EXTERN_ASM\name: ++.endm diff --git a/vlc.changes b/vlc.changes index 08c4e18..66649c7 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Mar 22 09:05:53 UTC 2018 - schwab@suse.de + +- arm-neon-asm.patch: add forgotten file + +------------------------------------------------------------------- +Tue Mar 20 08:33:37 UTC 2018 - dimstar@opensuse.org + +- Add explicit mpg123-devel BuildRequires: on Leap/TW it was + already pulled in by openmpt-devel, but being explicit is better. + +------------------------------------------------------------------- +Mon Mar 19 15:31:44 UTC 2018 - dimstar@opensuse.org + +- Explicitly call autoreconf: vlc-projectM-qt5.patch touches the + build system. +- Apply said patch only for suse_version > 1320: Leap 42.x used the + Qt4 based projectM. + +------------------------------------------------------------------- +Mon Mar 19 11:14:46 UTC 2018 - dimstar@opensuse.org + +- Fix build for Leap 42.x: BuildRequire gcc7-c++ and export + CXX=/usr/bin/g++-7: we need a c++11 compiler. + +------------------------------------------------------------------- +Mon Mar 19 09:01:10 UTC 2018 - dimstar@opensuse.org + +- Conditionalize wayland dependencies to only match suse_version >= + 1500. + ------------------------------------------------------------------- Mon Mar 5 14:19:35 UTC 2018 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 63310c0..062a794 100644 --- a/vlc.spec +++ b/vlc.spec @@ -45,6 +45,8 @@ Source2: %{name}-rpmlintrc Patch0: vlc.a52.patch # PATCH-FIX-UPSTREAM vlc-allow-deprecated-fribidi.patch dimstar@opensuse.org -- Allow usage of deprecated fribidi functions Patch1: vlc-allow-deprecated-fribidi.patch +# PATCH-FIX-UPSTREAM add forgotten file +Patch2: arm-neon-asm.patch # PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant Patch100: vlc-projectM-qt5.patch BuildRequires: Mesa-devel @@ -89,11 +91,12 @@ BuildRequires: libtool BuildRequires: libudev-devel >= 142 BuildRequires: libv4l-devel BuildRequires: libvorbis-devel >= 1.1 -BuildRequires: libvpx-devel +BuildRequires: libvpx-devel >= 1.5.0 BuildRequires: libxml2-devel >= 2.5 BuildRequires: lirc-devel BuildRequires: live555-devel >= 2015.01.27 BuildRequires: lua-devel >= 5.1 +BuildRequires: mpg123-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: posix_cc @@ -127,13 +130,11 @@ BuildRequires: pkgconfig(libpulse) >= 1.0 BuildRequires: pkgconfig(libsecret-1) >= 0.18 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(libva-wayland) BuildRequires: pkgconfig(libva-x11) BuildRequires: pkgconfig(protobuf-lite) >= 2.5.0 BuildRequires: pkgconfig(speexdsp) BuildRequires: pkgconfig(taglib) >= 1.9 BuildRequires: pkgconfig(twolame) -BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(xcb) >= 1.6 BuildRequires: pkgconfig(xcb-composite) BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 @@ -152,6 +153,16 @@ Requires: %{name}-qt = %{version}-%{release} PreReq: %{name}-noX Conflicts: %{conflicts} Obsoletes: %{name}-gnome <= %{version} +%if 0%{?suse_version} < 1500 +BuildRequires: gcc7 +BuildRequires: gcc7-c++ +%else +BuildRequires: gcc-c++ +%endif +%if 0%{?suse_version} >= 1500 +BuildRequires: pkgconfig(libva-wayland) +BuildRequires: pkgconfig(wayland-protocols) +%endif %if %{with gstreamer} BuildRequires: pkgconfig(gstreamer-app-1.0) %endif @@ -273,8 +284,8 @@ installed as a dependency. %package lang # FIXME: consider using %%lang_package macro Summary: Translations for package %{name} -# We do not want to require vlc, which is GUI based, but only vlc-noX Group: System/Localization +# We do not want to require vlc, which is GUI based, but only vlc-noX Requires: %{name}-noX = %{version} Supplements: packageand(bundle-lang-other:%{name}-noX) Provides: %{name}-lang-all = %{version} @@ -304,10 +315,9 @@ This package adds jack support to vlc via plugins. %if 0%{?BUILD_ORIG} %package codecs Summary: Additional codecs for the VLC media player -# We require the unrestricted libavcodec - same ABI version we linked -# FIXME: Use %%requires_eq macro instead Group: Productivity/Multimedia/Video/Players Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) +# We require the unrestricted libavcodec - same ABI version we linked Requires: %{name}-noX = %{version} Supplements: %{name}-noX @@ -317,10 +327,9 @@ codecs that are not available in the stock openSUSE distribution. %package vdpau Summary: Additional vdpau codecs for the VLC media player -# We require the unrestricted libavcodec - same ABI version we linked -# FIXME: Use %%requires_eq macro instead Group: Productivity/Multimedia/Video/Players Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) +# We require the unrestricted libavcodec - same ABI version we linked Requires: %{name}-codecs = %{version} Requires: %{name}-noX = %{version} Supplements: %{name}-noX @@ -350,7 +359,10 @@ default when `vlc` is invoked from an X session. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%if 0%{?suse_version} > 1320 %patch100 -p1 +%endif ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then @@ -368,6 +380,11 @@ sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt/dialogs/help.cpp src/ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c %build +%if 0%{?suse_version} < 1500 +export CC=%{_bindir}/gcc-7 +export CXX=%{_bindir}/g++-7 +%endif +autoreconf -fiv %configure \ --disable-dependency-tracking \ --enable-aa \ @@ -428,6 +445,9 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/ --enable-v4l2 \ --enable-vcd \ --enable-vorbis \ +%if 0%{?suse_version} < 1500 + --disable-wayland \ +%endif --enable-xcb \ %if %{with opengles} --enable-gles2 \ @@ -481,13 +501,10 @@ done %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins %postun -n %{name}-noX -p /sbin/ldconfig - %post -n libvlc%{libvlc} -p /sbin/ldconfig %postun -n libvlc%{libvlc} -p /sbin/ldconfig - %post -n libvlccore%{libvlccore} -p /sbin/ldconfig %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig - %post -n %{name}-qt %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins @@ -526,6 +543,9 @@ done %{_datadir}/applications/vlc.desktop %{_datadir}/icons/hicolor/*/apps/vlc* %{_datadir}/kde4/apps/solid +%if 0%{?suse_version} < 1500 +%dir %{_datadir}/metainfo +%endif %{_datadir}/metainfo/%{name}.appdata.xml # The icon is the one referenced by the .desktop file %{_datadir}/pixmaps/vlc.png @@ -566,7 +586,7 @@ done %{_bindir}/vlc-wrapper %{_datadir}/vlc/ %{_mandir}/man1/cvlc* -%{_mandir}/man1/svlc.1%{ext_man} +%{_mandir}/man1/svlc.1%{?ext_man} %{_mandir}/man1/rvlc* %{_mandir}/man1/vlc* # Own the file.. but it's an auto-generated file, so ghost it. @@ -1009,11 +1029,16 @@ done %{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so +%if 0%{?suse_version} >= 1500 %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so +%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so +%{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so +%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so +%{_libdir}/vlc/plugins/video_output/libxdg_shell_plugin.so +%endif %{_libdir}/vlc/plugins/video_output/libfb_plugin.so %{_libdir}/vlc/plugins/video_output/libflaschen_plugin.so %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so -%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so %{_libdir}/vlc/plugins/video_output/libgl_plugin.so %{_libdir}/vlc/plugins/video_output/libglx_plugin.so @@ -1023,16 +1048,13 @@ done %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif -%{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so -%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so -%{_libdir}/vlc/plugins/video_output/libxdg_shell_plugin.so %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so %{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so %{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so %endif %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so