# 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_with dv # build with dv support (FIXME: doesn't build with libraw1394 >= 2.0.0 (new API))
%bcond_without esound # don't build esound plugin
%bcond_without galaktos # OpenGL visualisation plugin
+%bcond_without ggi # don't build ggi plugin
%bcond_without gnomevfs # gnomevfs plugin
%bcond_without gnutls # gnutls plugin
-%bcond_without ggi # don't build ggi plugin
%bcond_without hal # build with hal support
%bcond_without jack # jack audio module
%bcond_without lirc # build without lirc 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 twolame # twolame 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.3
-Release: 5
+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: d0945c2489551c102a3f0f15e4591555
-Source1: %{name}.desktop
+# Source0-md5: 246a3865ec037f8f5757ef6b973a80fc
Patch0: %{name}-buildflags.patch
Patch1: %{name}-defaultfont.patch
Patch2: %{name}-real_codecs_path.patch
Patch3: %{name}-osdmenu_path.patch
Patch4: %{name}-rtp_segv.patch
Patch5: %{name}-system-minizip.patch
+Patch6: %{name}-libpng.patch
+Patch7: %{name}-xulrunner.patch
URL: http://www.videolan.org/vlc/
%{?with_directfb:BuildRequires: DirectFB-devel}
%{?with_galaktos:BuildRequires: OpenGL-GLU-devel}
BuildRequires: freetype-devel
BuildRequires: fribidi-devel
BuildRequires: gettext-devel
-%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel}
+#%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel}
%{?with_gnutls:BuildRequires: gnutls-devel}
%{?with_hal:BuildRequires: hal-devel >= 0.2.97}
%{?with_jack:BuildRequires: jack-audio-connection-kit-devel}
%if %{with dv}
BuildRequires: libavc1394-devel
-BuildRequires: libraw1394-devel < 2.0.0
+#BuildRequires: libraw1394-devel < 2.0.0
%endif
%{?with_caca:BuildRequires: libcaca-devel}
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel
-BuildRequires: libdts-devel
+#BuildRequires: libdts-devel
BuildRequires: libdvbpsi-devel >= 0.1.6
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
BuildRequires: libebml-devel >= 0.7.6
BuildRequires: libgcrypt-devel
%{?with_ggi:BuildRequires: libggi-devel}
-BuildRequires: libid3tag-devel
+#BuildRequires: libid3tag-devel
BuildRequires: libmad-devel
BuildRequires: libmatroska-devel >= 0.7.5
BuildRequires: libmodplug-devel
BuildRequires: libmtp-devel
%{?with_notify:BuildRequires: libnotify-devel}
BuildRequires: libogg-devel
-%{?with_daap:BuildRequires: libopendaap-devel}
+#%{?with_daap:BuildRequires: libopendaap-devel}
BuildRequires: libpng-devel
-%{?with_dv:BuildRequires: libraw1394-devel}
+#%{?with_dv:BuildRequires: libraw1394-devel}
%{?with_svg:BuildRequires: librsvg-devel >= 2.9.0}
%{?with_shout:BuildRequires: libshout-devel}
BuildRequires: libsmbclient-devel
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}
BuildRequires: xorg-lib-libXpm-devel
%{?with_mozilla:BuildRequires: xorg-lib-libXt-devel}
BuildRequires: xosd-devel
-%{?with_mozilla:BuildRequires: xulrunner-devel}
-BuildRequires: xvid-devel
+%{?with_mozilla:BuildRequires: xulrunner-devel >= 1.9.2}
+#BuildRequires: xvid-devel
BuildRequires: zvbi-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Summary(pl.UTF-8): Klient VLC - wtyczka do przeglÄ…darki Mozilla
Group: X11/Applications/Multimedia
Requires: %{name} = %{version}-%{release}
-Requires: browser-plugins >= 2.0
+Requires: browser-plugins >= 2.0
+Requires: browser-plugins >= 2.0
Requires: browser-plugins(%{_target_base_arch})
%description -n browser-plugin-%{name}
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
cp -f /usr/share/automake/config.* .
%configure \
CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/stable -I/usr/include/liveMedia" \
--enable-shared \
- --enable-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} \
%{!?with_hal:--disable-hal} \
--disable-optimizations # we use own RPM_OPT_FLAGS optimalizations
-%{__make}
+%{__make} \
+ npvlcdir=%{_browserpluginsdir}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_mandir}/man1}
%{__make} install \
+ npvlcdir=%{_browserpluginsdir} \
DESTDIR=$RPM_BUILD_ROOT
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -a doc/vlc.1 $RPM_BUILD_ROOT%{_mandir}/man1
+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}
-# needs fixed?
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ckb,co,my,no,ps,tet}
+# unsupported:
+# ckb (Sorani Kurdish - maybe ku_IQ/ku_IR?)
+# co (Corsican)
+# tet (Tetum)
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ckb,co,tet}
-%if %{with mozilla}
-# mozilla compatible browser plugin
-install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
-install -p projects/mozilla/.libs/libvlcplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
-%endif
+# .ico is win32 only
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/vlc*.ico
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%post -n browser-plugin-%{name}
%update_browser_plugins
-%post -p /sbin/ldconfig
-
%postun -n browser-plugin-%{name}
if [ "$1" = 0 ]; then
- %update_browser_plugins
+ %update_browser_plugins
fi
-%postun -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS MAINTAINERS NEWS README THANKS
%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
%{_mandir}/man1/vlc.1*
-%{_mandir}/man1/vlc-config.1*
%{_mandir}/man1/vlc-wrapper.1*
%files devel
%{_pkgconfigdir}/*.pc
%attr(755,root,root) %{_libdir}/libvlc.so
%attr(755,root,root) %{_libdir}/libvlccore.so
-
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/libvlc.a
-#%{_libdir}/%{name}/*.a
+%{_mandir}/man1/vlc-config.1*
%files X11
%defattr(644,root,root,755)
%{_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