- rel 5

- added bconds for ksm and drm renderers
- doesn't build with stable nouveau api in libdrm 2.4.34

Changed files:
    libdrm-2.4.34.patch -> 1.2
    plymouth.spec -> 1.27

diff --git a/libdrm-2.4.34.patch b/libdrm-2.4.34.patch
deleted file mode 100644 (file)
index 4d6ff9a..0000000
--- a/libdrm-2.4.34.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- plymouth-0.8.4/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c~    2010-08-19 19:01:38.000000000 +0200
-+++ plymouth-0.8.4/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c     2012-05-18 13:07:11.302627528 +0200
-@@ -41,9 +41,8 @@
- #include <unistd.h>
- 
- #include <drm.h>
-+#include <nouveau.h>
- #include <nouveau_drm.h>
--#include <nouveau_drmif.h>
--#include <nouveau_bo.h>
- #include <xf86drm.h>
- #include <xf86drmMode.h>
- 

diff --git a/plymouth.spec b/plymouth.spec
index 08b910150666037c415d13f7560ba4079fb7e3a8..e877b4b3787bb4bcf7f629de526d7ff97746ece8 100644 (file)
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -1,11 +1,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
@@ -19,15 +26,13 @@ Source5:    %{name}-set-default-plugin
 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}
@@ -337,13 +342,16 @@ Odznacza się on małym kółkiem kręcącym się na ciemnym tle.
 %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 \