SHA256
1
0
forked from pool/vlc

Accepting request 253122 from home:Vindex17:branches:multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/253122
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=80
This commit is contained in:
Dominique Leuenberger 2014-09-29 14:57:24 +00:00 committed by Git OBS Bridge
parent 459f92ab64
commit 9f628c76fd
2 changed files with 63 additions and 25 deletions

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Sep 23 19:12:35 UTC 2014 - vindex17@outlook.it
- Fix rpmlint warning about duplicates with fdupes
- Add missing BuildRequires:
+ fluidsynth-devel: SMF files playback
+ freerdp-devel: RDP support
+ libkde4-devel: KDE integration
+ libchromaprint-devel: Chromaprint stream output
+ libmlt6-modules: television broadcasting
+ LibVNCServer-devel: VNC support
+ opencv-devel: real-time computer vision support
+ xcb-util-keysyms-devel: better X integration
- Remome gcc-c++ and libqt4-devel because automatically installed
- Add 'suse_version' conditionals to the new BuildRequires
- Remove 'suse_version' conditionals from live555-devel & lua-devel
-------------------------------------------------------------------
Sat Jul 12 13:26:39 UTC 2014 - dimstar@opensuse.org

View File

@ -37,7 +37,7 @@ Name: vlc
Version: 2.1.5
Release: 0
Url: http://www.videolan.org/
Source: http://download.videolan.org/vlc/%{version}/vlc-%{version}.tar.xz
Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz
Patch3: 0001-no-return-in-non-void.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
@ -46,9 +46,12 @@ BuildRequires: alsa-devel
BuildRequires: avahi-devel
BuildRequires: fdupes
BuildRequires: flac-devel
BuildRequires: fluidsynth-devel
%if 0%{?suse_version} >= 1220
BuildRequires: freerdp-devel
%endif
BuildRequires: freetype2-devel
BuildRequires: fribidi-devel
BuildRequires: gcc-c++
BuildRequires: gdk-pixbuf-devel
BuildRequires: gettext-devel
BuildRequires: git
@ -57,6 +60,7 @@ BuildRequires: gnome-vfs2-devel
BuildRequires: gnutls-devel >= 3.0.20
%endif
BuildRequires: gtk2-devel
BuildRequires: libkde4-devel
BuildRequires: libSDL-devel
BuildRequires: libSDL_image-devel
BuildRequires: libass-devel
@ -65,6 +69,9 @@ BuildRequires: libbluray-devel
BuildRequires: libcaca-devel
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel
%if 0%{?suse_version} >= 1230
BuildRequires: libchromaprint-devel
%endif
BuildRequires: libdc1394-devel
BuildRequires: libdvbpsi-devel < 1.0
BuildRequires: libdvdnav-devel
@ -75,12 +82,12 @@ BuildRequires: libjack-devel >= 1.9.7
BuildRequires: libkate-devel
BuildRequires: libmatroska-devel
BuildRequires: libmodplug-devel
BuildRequires: libmlt6-modules
BuildRequires: libmtp-devel
BuildRequires: libnotify-devel
BuildRequires: libogg-devel
BuildRequires: libopus-devel
BuildRequires: libproxy-devel
BuildRequires: libqt4-devel
BuildRequires: libraw1394-devel
BuildRequires: librsvg-devel
BuildRequires: libsamplerate-devel
@ -94,17 +101,15 @@ BuildRequires: libudev-devel
BuildRequires: libupnp-devel
BuildRequires: libv4l-devel
BuildRequires: libva-devel
%if 0%{?suse_version} >= 1310
BuildRequires: LibVNCServer-devel
%endif
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
BuildRequires: live555-devel
%endif
%if 0%{?suse_version} >= 1220
BuildRequires: lua51-devel
%else
BuildRequires: lua-devel >= 5.1.0
%endif
BuildRequires: lua-devel
BuildRequires: opencv-devel
BuildRequires: pcre-devel
%if 0%{?suse_version} >= 1220
BuildRequires: projectM-devel
@ -115,6 +120,9 @@ BuildRequires: slang-devel
BuildRequires: speex-devel
BuildRequires: update-desktop-files
BuildRequires: vcdimager-devel
%if 0%{?suse_version} >= 1220
BuildRequires: xcb-util-keysyms-devel
%endif
BuildRequires: xosd-devel
BuildRequires: zvbi-devel
BuildRequires: pkgconfig(dirac) >= 0.10.0
@ -124,7 +132,6 @@ BuildRequires: pkgconfig(libgme)
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
BuildRequires: pkgconfig(libswscale)
%endif
# BuildRequires that are not actively used for VLC, but for the build itself to work smoothly
BuildRequires: findutils
BuildRequires: update-desktop-files
@ -250,7 +257,6 @@ for gnome-vfs2.
%setup -q
%patch3 -p1
rm -rf contrib
# fix builddate info
# Remove build time references so build-compare can do its work
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
@ -259,8 +265,7 @@ sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src
sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
%build
pkg-config --exists smbclient &&
smbclient=$(pkg-config --cflags smbclient)
pkg-config --exists smbclient && smbclient=$(pkg-config --cflags smbclient)
%ifarch %{ix86} x86_64
export CFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient"
export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient"
@ -293,12 +298,11 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
--enable-libass \
--enable-libcddb \
--enable-lirc \
--enable-live555 \
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
--enable-swscale \
--enable-live555 \
%else
--disable-swscale \
--disable-live555 \
--disable-swscale \
%endif
%if 0%{?BUILD_ORIG}
--enable-libmpeg2 \
@ -353,13 +357,13 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
make %{?_smp_mflags} V=1
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
mkdir -p %{buildroot}/%{_datadir}/pixmaps
ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
find %{buildroot} -name *.la -delete
rm %{buildroot}%{_libdir}/vlc/libcompat.a
%suse_update_desktop_file vlc AudioPlayer VideoPlayer Player
%fdupes %{buildroot}%{_datadir}/vlc
%fdupes %{buildroot}%{_datadir}
# clean up some lang issues...
for lang in ach cgg ff kmr; do
@ -367,6 +371,12 @@ for lang in ach cgg ff kmr; do
done
%find_lang vlc
%post
%icon_theme_cache_post
%postun
%icon_theme_cache_postun
%post noX
/sbin/ldconfig
%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
@ -412,8 +422,6 @@ done
%defattr(-,root,root)
%doc %{_datadir}/doc/vlc/
%doc NEWS AUTHORS COPYING THANKS README
%{_datadir}/applications/vlc.desktop
%{_datadir}/pixmaps/vlc.png
%{_bindir}/cvlc
%if %{?with_ncurses}
%{_bindir}/nvlc
@ -421,6 +429,8 @@ done
%{_bindir}/rvlc
%{_bindir}/vlc
%{_bindir}/vlc-wrapper
%{_datadir}/applications/vlc.desktop
%{_datadir}/pixmaps/vlc.png
%{_datadir}/vlc/
%{_mandir}/*/vlc*
# Own the file.. but it's an auto-generated file, so ghost it.
@ -552,12 +562,13 @@ done
%{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
%{_libdir}/vlc/plugins/access/libidummy_plugin.so
%{_libdir}/vlc/plugins/access/liblibbluray_plugin.so
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/access/liblive555_plugin.so
%endif
%{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so
%{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
%{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
%if 0%{?suse_version} >= 1220
%{_libdir}/vlc/plugins/access/librdp_plugin.so
%endif
%{_libdir}/vlc/plugins/access/librtp_plugin.so
%{_libdir}/vlc/plugins/access/libsdp_plugin.so
%{_libdir}/vlc/plugins/access/libshm_plugin.so
@ -566,6 +577,9 @@ done
%{_libdir}/vlc/plugins/access/libv4l2_plugin.so
%{_libdir}/vlc/plugins/access/libvcd_plugin.so
%{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%if 0%{?suse_version} >= 1310
%{_libdir}/vlc/plugins/access/liblibvnc_plugin.so
%endif
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%{_libdir}/vlc/plugins/access/libzip_plugin.so
%{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
@ -618,6 +632,7 @@ done
%{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
%{_libdir}/vlc/plugins/codec/libedummy_plugin.so
%{_libdir}/vlc/plugins/codec/libflac_plugin.so
%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
%{_libdir}/vlc/plugins/codec/libg711_plugin.so
%{_libdir}/vlc/plugins/codec/libkate_plugin.so
%{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
@ -644,9 +659,7 @@ done
%{_libdir}/vlc/plugins/control/libdummy_plugin.so
%{_libdir}/vlc/plugins/control/libgestures_plugin.so
%{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
%if 0%{?suse_version} < 1220
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
%{_libdir}/vlc/plugins/control/liblirc_plugin.so
%{_libdir}/vlc/plugins/control/libmotion_plugin.so
%{_libdir}/vlc/plugins/control/libnetsync_plugin.so
@ -697,6 +710,9 @@ done
%{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so
%{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so
%{_libdir}/vlc/plugins/misc/libexport_plugin.so
%if 0%{?suse_version} >= 1230
%{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so
%endif
%if 0%{?suse_version} >= 1220
%{_libdir}/vlc/plugins/misc/libgnutls_plugin.so
%endif
@ -751,6 +767,9 @@ done
%{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
%if 0%{?suse_version} >= 1230
%{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so
%endif
%{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_description_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_display_plugin.so
@ -809,6 +828,8 @@ done
%{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
%{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so