packages: plymouth/plymouth.spec, plymouth/libdrm-2.4.34.patch (REMOVED)=?UTF-8?Q?=20?=-=?UTF-8?Q?=20?=...

[baggins]

Author: baggins                      Date: Fri May 25 12:15:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- added bconds for ksm and drm renderers
- doesn't build with stable nouveau api in libdrm 2.4.34

---- Files affected:
packages/plymouth:
   plymouth.spec (1.26 -> 1.27) , libdrm-2.4.34.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/plymouth/plymouth.spec
diff -u packages/plymouth/plymouth.spec:1.26 packages/plymouth/plymouth.spec:1.27
--- packages/plymouth/plymouth.spec:1.26	Fri May 18 13:08:20 2012
+++ packages/plymouth/plymouth.spec	Fri May 25 14:15:49 2012
@@ -2,11 +2,18 @@
 # TODO
 # - integrate with geninitrd
 # - pldize recent update (r1.18)
+#
+# Conditional build:
+%bcond_without	drm_intel	# disable building with libdrm_intel support
+%bcond_without	drm_radeon	# disable building with libdrm_radeon support
+%bcond_with	drm_nouveau	# enable building with libdrm_nouveau support
+%bcond_without	kms		# disable building with libkms support
+#
 Summary:	Graphical Boot Animation and Logger
 Summary(pl.UTF-8):	Graficzna animacja i logowanie startu systemu
 Name:		plymouth
 Version:	0.8.4
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -20,15 +27,13 @@
 Source6:	%{name}-update-initrd
 Patch0:		check_for_consoles.patch
 Patch1:		text-colors.patch
-Patch2:		libdrm-2.4.34.patch
 URL:		http://www.freedesktop.org/wiki/Software/Plymouth
-#BuildRequires:	autoconf >= 2.50
-#BuildRequires:	automake
 BuildRequires:	cairo-devel
 BuildRequires:	gtk+2-devel >= 2:2.12.0
+%if %{with drm_intel} ||  %{with drm_radeon} ||  %{with drm_nouveau} ||  %{with kms}
 BuildRequires:	libdrm-devel
+%endif
 BuildRequires:	libpng-devel >= 1.2.16
-#BuildRequires:	libtool >= 2:2.0
 BuildRequires:	pango-devel >= 1:1.21.0
 BuildRequires:	pkgconfig
 Requires:	%{name}-graphics-libs = %{version}-%{release}
@@ -338,13 +343,16 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
 
 %build
 %configure \
+	%{__enable_disable drm_intel libdrm_intel} \
+	%{__enable_disable drm_radeon libdrm_radeon} \
+	%{__enable_disable drm_nouveau libdrm_nouveau} \
+	%{__enable_disable kms libkms} \
 	--disable-silent-rules \
 	--disable-static \
 	--disable-tests \
@@ -551,6 +559,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2012/05/25 12:15:49  baggins
+- rel 5
+- added bconds for ksm and drm renderers
+- doesn't build with stable nouveau api in libdrm 2.4.34
+
 Revision 1.26  2012/05/18 11:08:20  baggins
 - try to fix building against libdrm 2.4.34
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/plymouth/plymouth.spec?r1=1.26&r2=1.27