X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=DirectFB.spec;h=74e2bf9e124d0ab38c71627dd7ac7890a023942c;hb=HEAD;hp=61bc3a3fcbf697eb1e5fa8788b46b1af7b649975;hpb=547d18be4536f944ac3e5b4c1eb7187fc49e61ba;p=packages%2FDirectFB.git

diff --git a/DirectFB.spec b/DirectFB.spec
index 61bc3a3..74e2bf9 100644
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_with	multi		# build Multi-application core (requires working /dev/fusion*)
-%bcond_without	one		# Linux One IPC library
+%bcond_with	one		# Linux One IPC library
 %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]
@@ -14,24 +14,28 @@
 %bcond_with	swfdec		# swfdec FLASH video provider [not ready for swfdec >= 0.6]
 %bcond_without	xine		# Xine video provider
 %bcond_without	xine_vdpau	# Xine/VDPAU video provider
+%bcond_with	drmkms		# DRM/KMS support
 #
 %ifarch sh4
 %define		with_sh772x	1
 %endif
 %if %{without xine}
-%undefine	xine_vdpau
+%undefine	with_xine_vdpau
 %endif
 Summary:	DirectFB - Hardware graphics acceleration
 Summary(pl.UTF-8):	DirectFB - Wspomaganie grafiki
 Name:		DirectFB
-Version:	1.7.6
-Release:	3
+Version:	1.7.7
+Release:	6
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.directfb.org/downloads/Core/DirectFB-1.7/%{name}-%{version}.tar.gz
-# Source0-md5:	8a7bb06b3f58599b230b4cf314004512
-Source1:	http://www.directfb.org/downloads/Extras/DFBTutorials-0.5.0.tar.gz
+# 1.7.7 not available after restoring project website
+#Source0:	http://www.directfb.net/downloads/Core/DirectFB-1.7/%{name}-%{version}.tar.gz
+# 1.7.7 code available at https://github.com/deniskropp/DirectFB or https://github.com/lancebaiyouview/DirectFB; release tarball saved e.g. at:
+Source0:	http://sources.buildroot.net/%{name}-%{version}.tar.gz
+# Source0-md5:	152cf1863b1a3a28aa1370e9053440bf
+Source1:	http://www.directfb.net/downloads/Extras/DFBTutorials-0.5.0.tar.gz
 # Source1-md5:	13e443a64bddd68835b574045d9025e9
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-pmake.patch
@@ -45,10 +49,17 @@ Patch8:		%{name}-missing.patch
 Patch9:		%{name}-ffmpeg.patch
 Patch10:	%{name}-libmpeg3.patch
 Patch11:	%{name}-format.patch
-URL:		http://www.directfb.org/
-BuildRequires:	Mesa-libEGL-devel
-BuildRequires:	Mesa-libGLES-devel
+Patch12:	x32-asm.patch
+Patch13:	ffmpeg3.patch
+Patch14:	%{name}-tslib.patch
+Patch15:	%{name}-libtimidity.patch
+Patch16:	ffmpeg4.patch
+Patch17:	vnc-pc.patch
+Patch18:	imlib2-pc.patch
+URL:		http://www.directfb.net/
+BuildRequires:	EGL-devel
 BuildRequires:	Mesa-libgbm-devel
+BuildRequires:	OpenGLESv2-devel
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel
@@ -60,7 +71,7 @@ BuildRequires:	automake
 BuildRequires:	freetype-devel >= 2.0.2
 %{?with_flash:BuildRequires:	gplflash-devel >= 0.4.10-5}
 %{?with_gstreamer:BuildRequires:	gstreamer-plugins-base-devel >= 1.0}
-BuildRequires:	imlib2-devel
+BuildRequires:	imlib2-devel >= 1.1.0
 BuildRequires:	jasper-devel
 BuildRequires:	libcddb-devel >= 1.0.0
 BuildRequires:	libdrm-devel
@@ -72,16 +83,20 @@ BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libsvg-cairo-devel >= 0.1.6
 BuildRequires:	libtiff-devel >= 4
-BuildRequires:	libtimidity-devel >= 0.1.0
+BuildRequires:	libtimidity-devel >= 0.2.0
 BuildRequires:	libtool
 BuildRequires:	libvdpau-devel >= 0.3
-BuildRequires:	libvncserver-devel
+BuildRequires:	libvncserver-devel >= 0.9.8
 BuildRequires:	libvorbis-devel >= 1:1.0.0
 BuildRequires:	libwebp-devel >= 0.2.1
 %{?with_multi:BuildRequires:	linux-fusion-devel >= 9.0.1}
 %{?with_one:BuildRequires:	linux-one-devel >= 9.0.1}
 %{?with_quicktime:BuildRequires:	openquicktime-devel}
 BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig(egl)
+BuildRequires:	pkgconfig(gl)
+BuildRequires:	pkgconfig(glesv2)
+BuildRequires:	rpmbuild(macros) >= 1.527
 BuildRequires:	sed >= 4.0
 %{?with_swfdec:BuildRequires:	swfdec-devel >= 0.5.0}
 %{?with_swfdec:BuildRequires:	swfdec-devel < 0.6.0}
@@ -89,7 +104,6 @@ BuildRequires:	sysfsutils-devel >= 1.3.0-3
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	tslib-devel >= 1.0
 %{?with_xine:BuildRequires:	xine-lib-devel >= 2:1.2.3}
-%{?with_xine_vdpau:BuildRequires:	/usr/include/xine/video_out_vdpau.h}
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-proto-xproto-devel
@@ -111,7 +125,7 @@ Obsoletes:	DirectFB-input-ucb1x00
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		dfbdir	%{_libdir}/directfb-1.7-6
+%define		dfbdir	%{_libdir}/directfb-1.7-7
 
 %define		specflags	-fno-strict-aliasing
 
@@ -597,7 +611,7 @@ Summary:	XINE video provider for DirectFB
 Summary(pl.UTF-8):	DirectFB - wtyczka dostarczająca obraz XINE
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-%requires_eq	xine-lib
+%{?with_xine:%requires_eq	xine-lib}
 
 %description video-xine
 This package contains video provider for DirectFB which uses XINE
@@ -613,7 +627,7 @@ Summary:	DirectFB video output plugin for XINE
 Summary(pl.UTF-8):	Wtyczka wyjścia obrazu DirectFB dla XINE
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-%requires_eq	xine-lib
+%{?with_xine:%requires_eq	xine-lib}
 
 %description -n xine-output-video-dfb
 DirectFB video output plugin for XINE.
@@ -857,6 +871,7 @@ Summary(pl.UTF-8):	Moduł FusionSound dostarczający muzykę MIDI przez libtimid
 Group:		Libraries
 URL:		http://www.directfb.org/index.php?path=Platform/FusionSound
 Requires:	FusionSound = %{epoch}:%{version}-%{release}
+Requires:	libtimidity >= 0.2.0
 
 %description -n FusionSound-musicprovider-timidity
 MIDI libtimidity music provider module for FusionSound.
@@ -937,6 +952,13 @@ Statyczna biblioteka sawman.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in
@@ -957,6 +979,7 @@ Statyczna biblioteka sawman.
 	--disable-silent-rules \
 	%{?with_avifile:--enable-avifile} \
 	--enable-divine \
+	%{__enable_disable drmkms} \
 	--enable-fast-install \
 	%{?with_ffmpeg:--enable-ffmpeg} \
 	%{?with_flash:--enable-flash} \
@@ -982,7 +1005,7 @@ Statyczna biblioteka sawman.
 	%{?with_xine_vdpau:--enable-xine-vdpau} \
 	--enable-x11 \
 	--enable-zlib \
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 %ifnarch i386 i486
 	--enable-mmx \
 %endif
@@ -1043,19 +1066,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.6
+%attr(755,root,root) %ghost %{_libdir}/libdirect-1.7.so.7
 %attr(755,root,root) %{_libdir}/libdirectfb-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.7.so.6
+%attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.7.so.7
 %attr(755,root,root) %{_libdir}/libfusion-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusion-1.7.so.6
+%attr(755,root,root) %ghost %{_libdir}/libfusion-1.7.so.7
 %if %{with one}
 %attr(755,root,root) %{_libdir}/libone-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libone-1.7.so.6
+%attr(755,root,root) %ghost %{_libdir}/libone-1.7.so.7
 %endif
 %attr(755,root,root) %{_libdir}/libuniquewm-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.7.so.6
+%attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.7.so.7
 %attr(755,root,root) %{_libdir}/libvoodoo-1.7.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.7.so.6
+%attr(755,root,root) %ghost %{_libdir}/libvoodoo-1.7.so.7
 %dir %{dfbdir}
 %dir %{dfbdir}/gfxdrivers
 %attr(755,root,root) %{dfbdir}/gfxdrivers/libdirectfb_ati128.so
@@ -1161,7 +1184,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_one:%{_libdir}/libone.la}
 %{_libdir}/libuniquewm.la
 %{_libdir}/libvoodoo.la
-%{_includedir}/One
+%{?with_one:%{_includedir}/One}
 %{_includedir}/directfb
 %{_includedir}/directfb-internal
 %{_pkgconfigdir}/direct.pc
@@ -1194,9 +1217,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/html/*.{html,png}
 %{_examplesdir}/%{name}-%{version}
 
+%if %{with drmkms}
 %files core-drmkms
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dfbdir}/systems/libdirectfb_drmkms_system.so
+%endif
 
 %files core-mesa
 %defattr(644,root,root,755)
@@ -1363,7 +1388,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.6
+%attr(755,root,root) %ghost %{_libdir}/lib++dfb-1.7.so.7
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -1380,7 +1405,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.6
+%attr(755,root,root) %ghost %{_libdir}/libdivine-1.7.so.7
 %attr(755,root,root) %{dfbdir}/inputdrivers/libdirectfb_divine.so
 %dir %{dfbdir}/interfaces/IDiVine
 %attr(755,root,root) %{dfbdir}/interfaces/IDiVine/libidivine_dispatcher.so
@@ -1402,15 +1427,17 @@ 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.6
+%attr(755,root,root) %ghost %{_libdir}/libfusiondale-1.7.so.7
 %dir %{dfbdir}/interfaces/IComa
 %attr(755,root,root) %{dfbdir}/interfaces/IComa/libicoma_*.so
 %dir %{dfbdir}/interfaces/IComaComponent
 %attr(755,root,root) %{dfbdir}/interfaces/IComaComponent/libicomacomponent_*.so
 %dir %{dfbdir}/interfaces/IFusionDale
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionDale/libifusiondale_*.so
+%if %{with one}
 %dir %{dfbdir}/interfaces/IFusionDaleMessenger
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionDaleMessenger/libifusiondalemessenger_one.so
+%endif
 
 %files -n FusionDale-devel
 %defattr(644,root,root,755)
@@ -1431,7 +1458,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.6
+%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.7.so.7
 %dir %{dfbdir}/interfaces/IFusionSound
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionSound/libifusionsound.so
 %attr(755,root,root) %{dfbdir}/interfaces/IFusionSound/libifusionsound_dispatcher.so
@@ -1495,7 +1522,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.6
+%attr(755,root,root) %ghost %{_libdir}/libsawman-1.7.so.7
 %attr(755,root,root) %{dfbdir}/wm/libdirectfbwm_sawman.so
 
 %files -n SaWMan-devel