[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9a1db8ec4ee4ede35348104ab72459011d6cee33

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9a1db8ec4ee4ede35348104ab72459011d6cee33

[git]

[-- Attachment #1: Type: text/plain, Size: 2136 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  9a1db8ec4ee4ede35348104ab72459011d6cee33 (commit)
      from  7a22a51934afb86ba03d2e7ee017cb692234ab0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9a1db8ec4ee4ede35348104ab72459011d6cee33
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Apr 27 14:00:03 2012 +0200

    plymouth: Disable requirement of libdrm_intel on non x86-arches.

-----------------------------------------------------------------------

Summary of changes:
 plymouth/plymouth.nm |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 7d77e6f..c46ceb7 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -5,7 +5,7 @@
 
 name       = plymouth
 version    = 0.8.4
-release    = 1
+release    = 2
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -29,13 +29,24 @@ build
 		cairo-devel
 		glib2-devel
 		pkgconfig(libdrm)
-		pkgconfig(libdrm_intel)
 		pkgconfig(libdrm_radeon)
 		pkgconfig(libdrm_nouveau)
 		libpng-devel
 		pango-devel
 	end
 
+	enable_libdrm_intel = 0
+
+	if "%{DISTRO_MACHINE}" == "x86_64"
+		enable_libdrm_intel = 1
+		requires += pkgconfig(libdrm_intel)
+	end
+
+	if "%{DISTRO_MACHINE}" == "i686"
+		enable_libdrm_intel = 1
+		requires += pkgconfig(libdrm_intel)
+	end
+
 	CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
 
 	configure_options += \
@@ -52,6 +63,10 @@ build
 		--without-rhgb-compat-link \
 		--without-log-viewer
 
+	if "%{enable_libdrm_intel}" == "0"
+		configure_options += --disable-libdrm_intel
+	end
+
 	prepare_cmds
 		autoreconf -vfi
 	end


hooks/post-receive
--
IPFire 3.x development tree