packages: DirectFB/DirectFB.spec, DirectFB/DirectFB-external-one.patch (NEW...

[qboosh]

Author: qboosh                       Date: Sun Jun 24 04:50:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added external-one patch to allow build without included one
- package one files (on bcond)

---- Files affected:
packages/DirectFB:
   DirectFB.spec (1.106 -> 1.107) , DirectFB-external-one.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/DirectFB/DirectFB.spec
diff -u packages/DirectFB/DirectFB.spec:1.106 packages/DirectFB/DirectFB.spec:1.107
--- packages/DirectFB/DirectFB.spec:1.106	Tue Jun 19 18:35:44 2012
+++ packages/DirectFB/DirectFB.spec	Sun Jun 24 06:49:54 2012
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
-# TODO: --enable-one when ready (there are some missing files currently)
-# --enable-pvr2d likewise [requires PowerVR SDK?]
+# TODO: --enable-pvr2d when ready [requires PowerVR SDK?]
 #
 # Conditional build:
 %bcond_with	multi		# build Multi-application core (requires working /dev/fusion*)
 %bcond_with	sh772x		# SH7722/SH7723 (SH-Mobile) graphics driver
 %bcond_without	static_libs	# don't build static libraries
+%bcond_without	one		# Linux One IPC library
 #
 %ifarch sh4
 %define		with_sh772x	1
@@ -29,6 +29,7 @@
 Patch4:		%{name}-llh-ppc.patch
 Patch5:		%{name}-zlib.patch
 Patch6:		%{name}-update.patch
+Patch7:		%{name}-external-one.patch
 URL:		http://www.directfb.org/
 BuildRequires:	Mesa-libEGL-devel
 BuildRequires:	Mesa-libGLES-devel
@@ -52,6 +53,7 @@
 BuildRequires:	libvncserver-devel
 %{?with_multi:BuildRequires:	linux-fusion-devel >= 8.7}
 %{?with_multi:BuildRequires:	linux-fusion-devel < 9}
+%{?with_one:BuildRequires:	linux-one-devel >= %{version}}
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 BuildRequires:	sysfsutils-devel >= 1.3.0-3
@@ -93,6 +95,7 @@
 Summary(pl.UTF-8):	DirectFB - pliki nagłówkowe
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+%{?with_one:Requires:	linux-one-devel >= %{version}}
 Requires:	zlib-devel >= 1.1.3
 
 %description devel
@@ -415,6 +418,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in
@@ -434,6 +438,7 @@
 	--disable-silent-rules \
 	--enable-fast-install \
 	%{?with_multi:--enable-multi} \
+	%{?with_one:--enable-one} \
 	--enable-sdl \
 	--enable-shared \
 	--enable-static \
@@ -502,6 +507,10 @@
 %attr(755,root,root) %ghost %{_libdir}/libdirectfb-1.6.so.0
 %attr(755,root,root) %{_libdir}/libfusion-1.6.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfusion-1.6.so.0
+%if %{with one}
+%attr(755,root,root) %{_libdir}/libone-1.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libone-1.6.so.0
+%endif
 %attr(755,root,root) %{_libdir}/libuniquewm-1.6.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libuniquewm-1.6.so.0
 %attr(755,root,root) %{_libdir}/libvoodoo-1.6.so.*.*.*
@@ -601,11 +610,13 @@
 %attr(755,root,root) %{_libdir}/libdirect.so
 %attr(755,root,root) %{_libdir}/libdirectfb.so
 %attr(755,root,root) %{_libdir}/libfusion.so
+%{?with_one:%attr(755,root,root) %{_libdir}/libone.so}
 %attr(755,root,root) %{_libdir}/libuniquewm.so
 %attr(755,root,root) %{_libdir}/libvoodoo.so
 %{_libdir}/libdirect.la
 %{_libdir}/libdirectfb.la
 %{_libdir}/libfusion.la
+%{?with_one:%{_libdir}/libone.la}
 %{_libdir}/libuniquewm.la
 %{_libdir}/libvoodoo.la
 %{_includedir}/directfb
@@ -614,6 +625,7 @@
 %{_pkgconfigdir}/directfb-internal.pc
 %{_pkgconfigdir}/directfb.pc
 %{_pkgconfigdir}/fusion.pc
+%{?with_one:%{_pkgconfigdir}/one.pc}
 %{_pkgconfigdir}/voodoo.pc
 %{_mandir}/man1/directfb-csource.1*
 
@@ -623,6 +635,7 @@
 %{_libdir}/libdirect.a
 %{_libdir}/libdirectfb.a
 %{_libdir}/libfusion.a
+%{?with_one:%{_libdir}/libone.a}
 %{_libdir}/libuniquewm.a
 %{_libdir}/libvoodoo.a
 %{dfbdir}/gfxdrivers/*.[alo]*
@@ -731,6 +744,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2012/06/24 04:49:54  qboosh
+- added external-one patch to allow build without included one
+- package one files (on bcond)
+
 Revision 1.106  2012/06/19 16:35:44  qboosh
 - updated comment
 

================================================================
Index: packages/DirectFB/DirectFB-external-one.patch
diff -u /dev/null packages/DirectFB/DirectFB-external-one.patch:1.1
--- /dev/null	Sun Jun 24 06:50:00 2012
+++ packages/DirectFB/DirectFB-external-one.patch	Sun Jun 24 06:49:54 2012
@@ -0,0 +1,9 @@
+--- DirectFB-1.6.0/lib/One/Makefile.am.orig	2012-06-14 18:00:08.000000000 +0200
++++ DirectFB-1.6.0/lib/One/Makefile.am	2012-06-23 22:09:55.949173666 +0200
+@@ -1,6 +1,5 @@
+ ## Makefile.am for DirectFB/lib/One
+ 
+-SUBDIRS = linux-one
+ 
+ INCLUDES = \
+ 	-I$(top_builddir)/include	\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/DirectFB/DirectFB.spec?r1=1.106&r2=1.107