Hi

Unfortunately the addition off expedite_check_engine.m4 in expedite
broke the detection of the framebuffer engine in expedite. The course of
this is an inconsistent naming of the file "evas-framebuffer.pc.in"
which should be named "evas-fb.pc.in" to be consistent with the other
engine names.

The attached patch renames this file an changes Configure.in and
Makefile.am in ecore and evas accordingly.

A quick grep in the cvs repository indicates that expedite is the only
project that actually uses evas-framebuffer.pc, so the breakage of
applying this patch should be minimal.

Regards
Lars Munch

diff -urN e17-orig/libs/ecore/configure.in e17/libs/ecore/configure.in
--- e17-orig/libs/ecore/configure.in	2008-03-28 15:38:35.000000000 +0100
+++ e17/libs/ecore/configure.in	2008-04-07 17:32:33.000000000 +0200
@@ -606,7 +606,7 @@
   AC_MSG_RESULT($want_ecore_evas_fb)
   
   if test "x$want_ecore_evas_fb" = "xyes"; then
-    PKG_CHECK_MODULES(EVAS_FRAMEBUFFER, evas-framebuffer,
+    PKG_CHECK_MODULES(EVAS_FB, evas-fb,
       [
         AC_DEFINE(BUILD_ECORE_EVAS_FB, 1, [Support for Linux FB in Ecore_Evas])
         have_ecore_evas_fb="yes"
diff -urN e17-orig/libs/evas/configure.in e17/libs/evas/configure.in
--- e17-orig/libs/evas/configure.in	2008-03-14 17:49:47.000000000 +0100
+++ e17/libs/evas/configure.in	2008-04-07 17:31:04.000000000 +0200
@@ -1560,7 +1560,7 @@
 Makefile
 evas-cairo-x11.pc
 evas-directfb.pc
-evas-framebuffer.pc
+evas-fb.pc
 evas-glitz-x11.pc
 evas-opengl-glew.pc
 evas-opengl-x11.pc
diff -urN e17-orig/libs/evas/evas-fb.pc.in e17/libs/evas/evas-fb.pc.in
--- e17-orig/libs/evas/evas-fb.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ e17/libs/evas/evas-fb.pc.in	2008-04-07 17:27:53.000000000 +0200
@@ -0,0 +1,3 @@
+Name: evas-fb
+Description: Evas framebuffer engine
+Version: @VERSION@
diff -urN e17-orig/libs/evas/evas-framebuffer.pc.in e17/libs/evas/evas-framebuffer.pc.in
--- e17-orig/libs/evas/evas-framebuffer.pc.in	2007-03-31 18:07:43.000000000 +0200
+++ e17/libs/evas/evas-framebuffer.pc.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Name: evas-framebuffer
-Description: Evas framebuffer engine
-Version: @VERSION@
diff -urN e17-orig/libs/evas/Makefile.am e17/libs/evas/Makefile.am
--- e17-orig/libs/evas/Makefile.am	2008-02-18 08:20:50.000000000 +0100
+++ e17/libs/evas/Makefile.am	2008-04-07 17:30:25.000000000 +0200
@@ -10,7 +10,7 @@
 		       README \
 		       evas-cairo-x11.pc \
 		       evas-directfb.pc \
-		       evas-framebuffer.pc \
+		       evas-fb.pc \
 		       evas-glitz-x11.pc \
 		       evas-opengl-x11.pc \
 		       evas-opengl-glew.pc \
@@ -36,7 +36,7 @@
 	     evas.pc.in \
 	     evas-cairo-x11.pc \
 	     evas-directfb.pc \
-	     evas-framebuffer.pc \
+	     evas-fb.pc \
 	     evas-glitz-x11.pc \
 	     evas-opengl-x11.pc \
 	     evas-opengl-glew.pc \
@@ -72,7 +72,7 @@
 endif
 
 if BUILD_ENGINE_FB
-pframebuffer = evas-framebuffer.pc
+pfb = evas-fb.pc
 endif
 
 if BUILD_ENGINE_GLITZ_X11
@@ -125,7 +125,7 @@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-	evas.pc $(psoftwarex11) $(psoftwarexcb) $(pdirectfb) $(pframebuffer) \
+	evas.pc $(psoftwarex11) $(psoftwarexcb) $(pdirectfb) $(pfb) \
 	$(psoftwarebuffer) $(psoftwareqtopia) $(popenglx11) $(pcairox11) \
 	$(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) $(psoftwaresdl) \
 	$(psoftware16x11) $(pdirect3d) $(psoftwared16draw) $(popenglglew)
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to