automatic version update by autodist [release 2.2.0-1mamba;Sat Mar 21 2015]

vlc-2.2.0-vorbisidec.patch

@@ -0,0 +1,24 @@
+diff -Nru vlc-2.2.0.orig/modules/Makefile.in vlc-2.2.0/modules/Makefile.in
+--- vlc-2.2.0.orig/modules/Makefile.in	2015-02-26 21:12:56.000000000 +0100
++++ vlc-2.2.0/modules/Makefile.in	2015-03-20 10:07:48.127429784 +0100
+@@ -3999,7 +3999,7 @@
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = -lvorbisidec -logg
+ libvorbis_plugin_la_SOURCES = codec/vorbis.c
+ libvorbis_plugin_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS)
+ libvorbis_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+diff -Nru vlc-2.2.0.orig/modules/codec/Makefile.am vlc-2.2.0/modules/codec/Makefile.am
+--- vlc-2.2.0.orig/modules/codec/Makefile.am	2015-02-26 21:11:26.000000000 +0100
++++ vlc-2.2.0/modules/codec/Makefile.am	2015-03-20 10:07:30.717436618 +0100
+@@ -234,7 +234,7 @@
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = -lvorbisidec -logg
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 

vlc.spec

@@ -10,7 +10,7 @@
 %define        mozilla_sdk_dir %(pkg-config --variable=sdkdir libxul)
 %endif
 Name:          vlc
-Version:       2.1.5
+Version:       2.2.0
 Release:       1mamba
 Summary:       The VideoLAN client
 Group:         Graphical Desktop/Applications/Multimedia
@@ -26,6 +26,7 @@ Patch5:        vlc-2.0.3-lua-5.2.patch
 Patch6:        vlc-2.0.4-fix-undefined-symbol.patch
 Patch7:        vlc-2.0.7-libva-1.2.patch
 Patch8:        vlc-2.0.7-libflac-1.3.0.patch
+Patch9:        vlc-2.2.0-vorbisidec.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: enca-devel
@@ -281,8 +282,9 @@ This package contains VLC plugins for PulseAudio.
 #%patch4 -p1
 #%patch5 -p1
 %patch6 -p1
-%patch7 -p1
+#%patch7 -p1
 #%patch8 -p1
+%patch9 -p1
 
 %build
 #:<< ___EOF
@@ -383,7 +385,23 @@ echo "InitialPreference=8" >> %{buildroot}%{_datadir}/applications/vlc.desktop
 %defattr(-,root,root)
 %{_bindir}/*vlc
 %{_bindir}/vlc-wrapper
+%{_datadir}/pixmaps/vlc.png
+%{_datadir}/applications/vlc.desktop
+%dir %{_datadir}/vlc
+%{_datadir}/vlc/*
+%{_kde4_datadir}/solid/actions/vlc-*.desktop
+%{_datadir}/icons/hicolor/*/apps/vlc*.png
+%{_datadir}/icons/hicolor/*/apps/vlc*.xpm
+%{_mandir}/man1/vlc.1*
+#%{_mandir}/man1/vlc-config.1*
+%{_mandir}/man1/vlc-wrapper.1*
+
+%files -n lib%{name}
+%defattr(-,root,root)
+%{_libdir}/libvlc.so.*
+%{_libdir}/libvlccore.so.*
 %dir %{_libdir}/vlc
+%{_libdir}/vlc/libvlc_vdpau.so.*
 %{_libdir}/vlc/lua
 %dir %{_libdir}/vlc/plugins
 #%{_libdir}/vlc/plugins/3dnow
@@ -417,14 +435,14 @@ echo "InitialPreference=8" >> %{buildroot}%{_datadir}/applications/vlc.desktop
 %{_libdir}/vlc/plugins/lua
 %{_libdir}/vlc/plugins/meta_engine
 %{_libdir}/vlc/plugins/misc
-%{_libdir}/vlc/plugins/mmx
+#%{_libdir}/vlc/plugins/mmx
 #%{_libdir}/vlc/plugins/mmxext
 %{_libdir}/vlc/plugins/mux
 %{_libdir}/vlc/plugins/notify
 %{_libdir}/vlc/plugins/packetizer
 %{_libdir}/vlc/plugins/plugins.dat
 %{_libdir}/vlc/plugins/services_discovery
-%{_libdir}/vlc/plugins/sse2
+#%{_libdir}/vlc/plugins/sse2
 %{_libdir}/vlc/plugins/stream_filter
 %{_libdir}/vlc/plugins/stream_out
 %{_libdir}/vlc/plugins/text_renderer
@@ -432,22 +450,11 @@ echo "InitialPreference=8" >> %{buildroot}%{_datadir}/applications/vlc.desktop
 %{_libdir}/vlc/plugins/video_filter
 %{_libdir}/vlc/plugins/video_output
 %{_libdir}/vlc/plugins/visualization
+%dir %{_libdir}/vlc/plugins/vdpau
+%{_libdir}/vlc/plugins/vdpau/libvdpau_*
+%dir %{_libdir}/vlc/plugins/video_splitter
+%{_libdir}/vlc/plugins/video_splitter/*
 %{_libdir}/vlc/vlc-cache-gen
-%{_datadir}/pixmaps/vlc.png
-%{_datadir}/applications/vlc.desktop
-%dir %{_datadir}/vlc
-%{_datadir}/vlc/*
-%{_kde4_datadir}/solid/actions/vlc-*.desktop
-%{_datadir}/icons/hicolor/*/apps/vlc*.png
-%{_datadir}/icons/hicolor/*/apps/vlc*.xpm
-%{_mandir}/man1/vlc.1*
-#%{_mandir}/man1/vlc-config.1*
-%{_mandir}/man1/vlc-wrapper.1*
-
-%files -n lib%{name}
-%defattr(-,root,root)
-%{_libdir}/libvlc.so.*
-%{_libdir}/libvlccore.so.*
 %doc AUTHORS COPYING
 
 %files -n lib%{name}-devel
@@ -456,6 +463,8 @@ echo "InitialPreference=8" >> %{buildroot}%{_datadir}/applications/vlc.desktop
 %{_libdir}/libvlc.so
 %{_libdir}/libvlccore.la
 %{_libdir}/libvlccore.so
+%{_libdir}/vlc/libvlc_vdpau.la
+%{_libdir}/vlc/libvlc_vdpau.so
 #%{_bindir}/vlc-config
 %dir %{_includedir}/vlc
 %{_includedir}/vlc/*
@@ -464,9 +473,7 @@ echo "InitialPreference=8" >> %{buildroot}%{_datadir}/applications/vlc.desktop
 %{_libdir}/vlc/libcompat.la
 %{_libdir}/pkgconfig/libvlc.pc
 %{_libdir}/pkgconfig/vlc-plugin.pc
-#%doc HACKING
 %doc ChangeLog README THANKS
-#%doc installed-docs/*
 
 %if %with_pulseaudio
 %files pulseaudio-plugin
@@ -482,6 +489,9 @@ echo "InitialPreference=8" >> %{buildroot}%{_datadir}/applications/vlc.desktop
 #%endif
 
 %changelog
+* Sat Mar 21 2015 Automatic Build System <autodist@mambasoft.it> 2.2.0-1mamba
+- automatic version update by autodist
+
 * Tue Jul 08 2014 Automatic Build System <autodist@mambasoft.it> 2.1.5-1mamba
 - automatic version update by autodist