- BR: libmtp-devel

[packages/vlc.git] / vlc.spec

diff --git a/vlc.spec b/vlc.spec
index a71cc49d11a3bbc5a5bc15a427047c4f54520fab..64ec747a648990945a3ffe8db06c42f9beae2f79 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@ Summary:      VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
 Version:       1.0.0
-Release:       1
+Release:       4
 License:       GPL
 Group:         X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -55,7 +55,6 @@ Patch2:               %{name}-live.patch
 Patch3:                %{name}-pic-mmx.patch
 Patch4:                %{name}-real_codecs_path.patch
 Patch5:                %{name}-osdmenu_path.patch
-Patch6:                %{name}-iceweasel.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 %{?with_galaktos:BuildRequires:         OpenGL-GLU-devel}
@@ -101,6 +100,8 @@ BuildRequires:      libmad-devel
 BuildRequires: libmatroska-devel >= 0.7.5
 BuildRequires: libmodplug-devel
 BuildRequires: libmpcdec-devel >= 1.2.1
+BuildRequires: libmpeg2-devel
+BuildRequires: libmtp-devel
 %{?with_notify:BuildRequires:  libnotify-devel}
 BuildRequires: libogg-devel
 %{?with_daap:BuildRequires:    libopendaap-devel}
@@ -120,7 +121,6 @@ BuildRequires:      libxml2-devel
 %{?with_lirc:BuildRequires:    lirc-devel}
 %{?with_live:BuildRequires:    live >= 2008.07.06}
 BuildRequires: lua51-devel
-BuildRequires: mpeg2dec-devel >= 0.3.2
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
 %{?with_portaudio:BuildRequires:       portaudio-devel}
@@ -243,18 +243,19 @@ ALSA audio output plugin for VLC.
 %description alsa -l pl.UTF-8
 Wtyczka wyjścia dźwięku ALSA dla klienta VLC.
 
-%package iceweasel-plugin
-Summary:       VLC - Iceweasel browser plugin
-Summary(pl.UTF-8):     Klient VLC - wtyczka do przeglądarki Iceweasel
+%package -n browser-plugin-%{name}
+Summary:       VLC - Mozilla compatible browser plugin
+Summary(pl.UTF-8):     Klient VLC - wtyczka do przeglądarki Mozilla
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
-Requires:      iceweasel
+Requires:      browser-plugins >= 2.0 
+Requires:      browser-plugins(%{_target_base_arch})
 
-%description iceweasel-plugin
-Iceweasel browser plugin for VLC.
+%description -n browser-plugin-%{name}
+Mozilla compatible browser plugin.
 
-%description iceweasel-plugin -l pl.UTF-8
-Wtyczka do przeglądarki Iceweasel dla klienta VLC.
+%description -n browser-plugin-%{name} -l pl.UTF-8
+Wtyczka do przeglądarki internetowej Mozilla.
 
 %prep
 %setup -q
@@ -266,7 +267,6 @@ Wtyczka do przeglądarki Iceweasel dla klienta VLC.
 #%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -275,7 +275,9 @@ cp -f /usr/share/automake/config.* .
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
-       CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/plugin -I/usr/include/xulrunner/java" \
+       CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/stable" \
+       --enable-shared \
+       --enable-static \
 %ifarch ppc
        --disable-altivec \
 %endif
@@ -371,12 +373,25 @@ 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}
 
+# mozilla compatible browser plugin
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
+cp -a projects/mozilla/.libs/libvlcplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -n browser-plugin-%{name}
+%update_browser_plugins
+
 %post  -p /sbin/ldconfig
+
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+        %update_browser_plugins
+fi
+
 %postun        -p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -470,6 +485,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/audio_output/liboss_plugin.so
 %dir %{_libdir}/vlc/codec
 %attr(755,root,root) %{_libdir}/vlc/codec/liba52_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/codec/libaes3_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/codec/libadpcm_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/codec/libaes3_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/codec/libaraw_plugin.so
@@ -613,7 +629,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/vlc/services_discovery
 %{?with_hal:%attr(755,root,root) %{_libdir}/vlc/services_discovery/libhal_plugin.so}
 %{?with_bonjour:%attr(755,root,root) %{_libdir}/vlc/services_discovery/libbonjour_plugin.so}
-#%{?with_daap:%attr(755,root,root) %{_libdir}/vlc/services_discovery/libdaap_plugin.so}
 %attr(755,root,root) %{_libdir}/vlc/services_discovery/libmtp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/services_discovery/libpodcast_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/services_discovery/libsap_plugin.so
@@ -651,13 +666,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_rgb_mmx_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_rgb_sse2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_ymga_mmx_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_yuy2_mmx_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_yuy2_sse2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_chroma/libi422_yuy2_mmx_plugin.so
+%ifnarch i486 i586
+%attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_rgb_sse2_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/video_chroma/libi420_yuy2_sse2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_chroma/libi422_yuy2_sse2_plugin.so
 %endif
+%endif
 
 %dir %{_libdir}/vlc/video_filter
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libadjust_plugin.so
@@ -702,6 +719,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libsharpen_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libswscale_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libtransform_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/video_filter/libyuvp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libwall_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libwave_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/video_filter/libyuvp_plugin.so
@@ -733,8 +751,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libvlc.so
 %attr(755,root,root) %{_libdir}/libvlccore.so
 
-%files static
-%defattr(644,root,root,755)
+#%files static
+#%defattr(644,root,root,755)
 #%{_libdir}/libvlc.a
 #%{_libdir}/%{name}/*.a
 
@@ -744,8 +762,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/svlc
 %attr(755,root,root) %{_libdir}/vlc/gui/libqt4_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/gui/libskins2_plugin.so
-#%{?with_gnomevfs:%attr(755,root,root) %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so}
-#%%attr(755,root,root) %{_libdir}/vlc/access/libscreen_plugin.so
 %{?with_aalib:%attr(755,root,root) %{_libdir}/vlc/video_output/libaa_plugin.so}
 %{?with_caca:%attr(755,root,root) %{_libdir}/vlc/video_output/libcaca_plugin.so}
 %attr(755,root,root) %{_libdir}/vlc/video_output/libglx_plugin.so
@@ -781,8 +797,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/audio_output/libalsa_plugin.so
 %endif
 
-%if %{with mozilla}
-%files iceweasel-plugin
+%files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/iceweasel/plugins/libvlcplugin.so
-%endif
+%attr(755,root,root) %{_browserpluginsdir}/libvlcplugin.so