# TODO
-# - use fonts-TTF-freefont as R
+# - use fonts-TTF-freefont as R (vlc-X11 package) (see also vlc-defaultfont.patch)
+# ./modules/misc/freetype.c:#define DEFAULT_FONT "/usr/share/vlc/skins2/fonts/FreeSans.ttf"
+# ./modules/gui/skins2/parser/builder.cpp: string path = (*it) + sep + "fonts" + sep + "FreeSans.ttf";
# - %{_prefix}/lib cleanup for x86_64
+# - configs to /etc (../http/.hosts)
#
# Conditional build:
%bcond_without aalib # build without aalib support
%bcond_without mozilla # build mozilla plugin
%bcond_without notify # libnotify notification plugin
%bcond_without portaudio # portaudio library support
+%bcond_with rtmp # RTMP output plugin
%bcond_without shout # shout plugin
%bcond_without speex # don't build speex plugin
+%bcond_without static_libs # don't build static libraries
%bcond_without svg # svg plugin
%bcond_without svgalib # build with svgalib video_output
%bcond_without twolame # twolame plugin
%bcond_without udev # udev services discovery
%bcond_without upnp # upnp plugin
%bcond_without x264 # build without x264 support
-#
+
Summary: VLC - a multimedia player and stream server
Summary(pl.UTF-8): VLC - odtwarzacz multimedialny oraz serwer strumieni
Name: vlc
-Version: 1.0.5
-Release: 3
+Version: 1.0.6
+Release: 2
License: GPL
Group: X11/Applications/Multimedia
# use the bz2 src, its a 4mb difference
Source0: http://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: d3d99e489ba1ae996af7e1065c0ef313
+# Source0-md5: 246a3865ec037f8f5757ef6b973a80fc
Patch0: %{name}-buildflags.patch
Patch1: %{name}-defaultfont.patch
Patch2: %{name}-real_codecs_path.patch
BuildRequires: libtheora-devel
BuildRequires: libtool
%{?with_upnp:BuildRequires: libupnp-devel}
-BuildRequires: libvorbis-devel
BuildRequires: libv4l-devel
+BuildRequires: libvorbis-devel
%{?with_x264:BuildRequires: libx264-devel}
BuildRequires: libxml2-devel
%{?with_lirc:BuildRequires: lirc-devel}
Group: X11/Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: browser-plugins >= 2.0
+Requires: browser-plugins >= 2.0
Requires: browser-plugins(%{_target_base_arch})
%description -n browser-plugin-%{name}
%configure \
CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/stable -I/usr/include/liveMedia" \
--enable-shared \
- --disable-static \
+ %{!?with_static_libs:--disable-static} \
%ifarch ppc
--disable-altivec \
%endif
--enable-smb \
--enable-snapshot \
--enable-sout \
- --enable-static \
--enable-switcher \
%{!?with_speex:--disable-speex} \
%{?with_svg:--enable-svg} \
npvlcdir=%{_browserpluginsdir} \
DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/vlc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
%if "%{_lib}" != "lib"
install -d $RPM_BUILD_ROOT%{_prefix}/lib
%endif
# rm -f *.{a,la}
-find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' | xargs rm -f
mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{pt_PT,pt}
# unsupported:
# tet (Tetum)
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ckb,co,tet}
+# .ico is win32 only
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/vlc*.ico
+
%find_lang %{name}
%clean
%attr(755,root,root) %{_bindir}/vlc
%attr(4754,root,video) %{_bindir}/vlc-wrapper
%attr(755,root,root) %{_libdir}/libvlc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvlc.so.[0-9]
+%attr(755,root,root) %ghost %{_libdir}/libvlc.so.2
%attr(755,root,root) %{_libdir}/libvlccore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvlccore.so.[0-9]
+%attr(755,root,root) %ghost %{_libdir}/libvlccore.so.2
%if "%{_lib}" != "lib"
%{_prefix}/lib/vlc
%attr(755,root,root) %{_libdir}/vlc/access/libaccess_mtp_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access/libaccess_oss_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access/libaccess_realrtsp_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/access/libaccess_rtmp_plugin.so
+%{?with_rtmp:%attr(755,root,root) %{_libdir}/vlc/access/libaccess_rtmp_plugin.so}
%attr(755,root,root) %{_libdir}/vlc/access/libaccess_smb_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access/libaccess_tcp_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access/libaccess_udp_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_dummy_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_file_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_http_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_rtmp_plugin.so
+%{?with_rtmp:%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_rtmp_plugin.so}
%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_shout_plugin.so
%attr(755,root,root) %{_libdir}/vlc/access_output/libaccess_output_udp_plugin.so
%dir %{_libdir}/vlc/audio_filter
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/http
%{_datadir}/%{name}/lua
-%if %{with mozilla}
-%{_datadir}/%{name}/mozilla
-%endif
%{_datadir}/%{name}/osdmenu
%dir %{_datadir}/%{name}/utils
%attr(755,root,root) %{_datadir}/%{name}/utils/*.sh
%{_datadir}/%{name}/skins2
%{_datadir}/%{name}/vlc*.xpm
%{_datadir}/%{name}/vlc*.png
-%{_datadir}/%{name}/vlc*.ico
%{_desktopdir}/*.desktop
%if %{with ggi}
%files -n browser-plugin-%{name}
%defattr(644,root,root,755)
%attr(755,root,root) %{_browserpluginsdir}/libvlcplugin.so
+%{_datadir}/%{name}/mozilla
%endif