- updated to 1.7.1 (note: new sonames and plugins dir)

diff --git a/DirectFB.spec b/DirectFB.spec
index c929a50cea412b547d622b39ec46f9408f2125b0..313c539d4fc22c7dc873edb0e5b324e36de7d6a5 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -1,5 +1,4 @@
 # TODO: --enable-pvr2d when ready [requires PowerVR SDK?]
-# - enable xine_vdpau (needs <xine/video_out_vdpau.h>)
 #
 # Conditional build:
 %bcond_with    multi           # build Multi-application core (requires working /dev/fusion*)
@@ -7,7 +6,7 @@
 %bcond_without static_libs     # don't build static libraries
 %bcond_with    sh772x          # SH7722/SH7723 (SH-Mobile) graphics driver
 %bcond_with    avifile         # AviFile video provider [not updated for DirectFB 1.7.0]
-%bcond_without ffmpeg          # FFmpeg music and video providers
+%bcond_without ffmpeg          # FFmpeg image, music and video providers
 %bcond_with    flash           # FLASH video provider [not updated for DirectFB 1.7.0]
 %bcond_without gstreamer       # GStreamer video provider
 %bcond_without mpg             # libmpeg3 MPEG video provider
@@ -25,13 +24,13 @@
 Summary:       DirectFB - Hardware graphics acceleration
 Summary(pl.UTF-8):     DirectFB - Wspomaganie grafiki
 Name:          DirectFB
-Version:       1.7.0
-Release:       4
+Version:       1.7.1
+Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://www.directfb.org/downloads/Core/DirectFB-1.7/%{name}-%{version}.tar.gz
-# Source0-md5: 258d3a5fda5d9af16c5cbdca671638e5
+# Source0-md5: 0ef44c16a414312fd38d6764e2cb9893
 Source1:       http://www.directfb.org/downloads/Extras/DFBTutorials-0.5.0.tar.gz
 # Source1-md5: 13e443a64bddd68835b574045d9025e9
 Patch0:                %{name}-am.patch
@@ -110,7 +109,7 @@ Obsoletes:  DirectFB-input-ucb1x00
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                dfbdir  %{_libdir}/directfb-1.7-0
+%define                dfbdir  %{_libdir}/directfb-1.7-1
 
 %define                specflags       -fno-strict-aliasing
 
@@ -378,6 +377,19 @@ WM97xx touchscreen input driver for DirectFB.
 %description input-wm97xx -l pl.UTF-8
 Sterownik wejściowy do touchscreenów WM97xx dla DirectFB.
 
+%package image-ffmpeg
+Summary:       FFmpeg image provider for DirectFB
+Summary(pl.UTF-8):     DirectFB - wtyczka dostarczająca grafikę FFmpeg
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description image-ffmpeg
+DirectFB image provider using FFmpeg codecs.
+
+%description image-ffmpeg -l pl.UTF-8
+Ten pakiet zawiera wtyczkę dla DirectFB dostarczajacą grafikę przy
+użyciu kodeków FFmpeg.
+
 %package image-imlib2
 Summary:       Imlib2 image provider for DirectFB
 Summary(pl.UTF-8):     DirectFB - wtyczka dostarczająca grafikę Imlib2
@@ -1029,19 +1041,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/voodooplay_client
 %attr(755,root,root) %{_bindir}/voodooplay_server
 %attr(755,root,root) %{_libdir}/libdirect-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdirect-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdirect-1.7.so.1
 %attr(755,root,root) %{_libdir}/libdirectfb-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.7.so.1
 %attr(755,root,root) %{_libdir}/libfusion-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusion-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libfusion-1.7.so.1
 %if %{with one}
 %attr(755,root,root) %{_libdir}/libone-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libone-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libone-1.7.so.1
 %endif
 %attr(755,root,root) %{_libdir}/libuniquewm-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.7.so.1
 %attr(755,root,root) %{_libdir}/libvoodoo-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.7.so.1
 %dir %{dfbdir}
 %dir %{dfbdir}/gfxdrivers
 %attr(755,root,root) %{dfbdir}/gfxdrivers/libdirectfb_ati128.so
@@ -1248,6 +1260,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_wm97xx_ts.so
 
+%if %{with ffmpeg}
+%files image-ffmpeg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_ffmpeg.so
+%endif
+
 %files image-imlib2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_imlib2.so
@@ -1343,7 +1361,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dfbswitch
 # library itself
 %attr(755,root,root) %{_libdir}/lib++dfb-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib++dfb-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/lib++dfb-1.7.so.1
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -1360,7 +1378,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/spooky
 %attr(755,root,root) %{_libdir}/libdivine-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdivine-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdivine-1.7.so.1
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_divine.so
 %dir %{dfbdir}/interfaces/IDiVine
 %attr(755,root,root) %{dfbdir}/interfaces/IDiVine/libidivine_dispatcher.so
@@ -1382,7 +1400,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fddump
 %attr(755,root,root) %{_bindir}/fdmaster
 %attr(755,root,root) %{_libdir}/libfusiondale-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusiondale-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libfusiondale-1.7.so.1
 %dir %{dfbdir}/interfaces/IComa
 %attr(755,root,root) %{dfbdir}/interfaces/IComa/libicoma_*.so
 %dir %{dfbdir}/interfaces/IComaComponent
@@ -1411,7 +1429,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fsproxy
 %attr(755,root,root) %{_bindir}/fsvolume
 %attr(755,root,root) %{_libdir}/libfusionsound-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.7.so.1
 %dir %{dfbdir}/interfaces/IFusionSound
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionSound/libifusionsound.so
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionSound/libifusionsound_dispatcher.so
@@ -1475,7 +1493,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/swmdump
 %attr(755,root,root) %{_libdir}/libsawman-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsawman-1.7.so.0
+%attr(755,root,root) %ghost %{_libdir}/libsawman-1.7.so.1
 %attr(755,root,root) %{dfbdir}/wm/libdirectfbwm_sawman.so
 
 %files -n SaWMan-devel