Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje
Modified Files:
README configure.in edje-native.oe edje.bb edje.c.in edje.oe
edje.pc.in edje.spec.in edjeXnative.bb
Log Message:
edje no longer needs imlib2.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- README 21 Sep 2005 03:11:31 -0000 1.10
+++ README 11 Nov 2005 06:49:57 -0000 1.11
@@ -48,8 +48,7 @@
sudo make install
cd
-5. You need imlib2 installed. any release from 1.0.0 on will do.
-6. You already have Edje. now build it:
+5. You already have Edje. now build it:
./autogen.sh
make
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- configure.in 25 Oct 2005 03:45:52 -0000 1.52
+++ configure.in 11 Nov 2005 06:49:57 -0000 1.53
@@ -142,14 +142,6 @@
EMBRYO_PREFIX=`$EMBRYO_CONFIG --prefix`
AC_DEFINE_UNQUOTED(EMBRYO_PREFIX, "${EMBRYO_PREFIX}", [Embryo prefix])
-if test "x$have_edje_cc" = "xyes"; then
- AC_PATH_GENERIC(imlib2, 1.0.0,
- [ have_imlib2="yes"],
- [ have_imlib2="no" ],
- )
- AC_DEFINE(HAVE_IMLIB, 1, [Imlib2 is installed])
-fi
-
AC_MSG_CHECKING([for location of Vim data files])
install_vim="yes";
AC_ARG_WITH(vim,
@@ -229,11 +221,3 @@
],[
chmod +x edje-config
])
-
-if test "x$have_edje_cc" = "xyes"; then
- if test "x$have_imlib2" = "xno"; then
- echo
- echo "WARNING: Building edje_cc without Imlib2 support!"
- echo
- fi
-fi
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edje-native.oe,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje-native.oe 9 Nov 2004 09:36:17 -0000 1.1
+++ edje-native.oe 11 Nov 2005 06:49:57 -0000 1.2
@@ -6,7 +6,7 @@
PRIORITY = "optional"
include edje.oe
inherit native
-DEPENDS = "evas-native ecore-native embryo-native eet-native imlib2-native"
+DEPENDS = "evas-native ecore-native embryo-native eet-native"
EXTRA_OECONF = "--enable-fb-only"
@@ -16,7 +16,6 @@
export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native"
export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config-native"
export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config-native"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config-native"
do_stage() {
for i in edje edje_ls edje_cc; do
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edje.bb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje.bb 24 Feb 2005 15:34:41 -0000 1.2
+++ edje.bb 11 Nov 2005 06:49:57 -0000 1.3
@@ -4,7 +4,7 @@
MAINTAINER = "Carsten Haitzler (Rasterman) <[EMAIL PROTECTED]>"
SECTION = "e/libs"
PRIORITY = "optional"
-DEPENDS = "evas ecore embryo eet imlib2"
+DEPENDS = "evas ecore embryo eet"
PV = "0.5.0"
PR = "1"
@@ -22,7 +22,6 @@
export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config"
LEAD_SONAME = "libedje.so"
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edje.c.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje.c.in 21 Sep 2005 03:11:31 -0000 1.7
+++ edje.c.in 11 Nov 2005 06:49:57 -0000 1.8
@@ -80,10 +80,6 @@
- Ecore (library)
- Eet (library)
-To fully build Edje and run the Edje builder (edje_cc) you also need:
-
- - Imlib2 (library)
-
Evas needs to be build with the PNG and EET image loaders enabled at a
minimum. Edje uses X for the test program, so you will need the SOFTWARE_X11
engine built into Evas as well. A suggested configure list is below in the
@@ -95,12 +91,6 @@
Eet has no options so just build and install it.
-Imlib2 has options, but it will probably select the right ones when you build
-and install it. You really want as many image loaders enabled as you can
-manage. It's suggested at a minimum to have the PNG and JPEG loaders, but
-include whatever loaders correspond to the image formats you want supported
-for loading up and including into an Edje compiled file.
-
It is suggested right now that you get the latest CVS versions of the
required libraries. You also need to build them in the right order and make
sure the right options are enabled in the required libraries. Here is a
@@ -147,9 +137,6 @@
sudo make install
cd
-
-5. You need Imlib2 installed. Any release from 1.0.0 and up will do.
-
@endverbatim
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edje.oe,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje.oe 9 Nov 2004 09:36:17 -0000 1.1
+++ edje.oe 11 Nov 2005 06:49:57 -0000 1.2
@@ -4,7 +4,7 @@
MAINTAINER = "Carsten Haitzler (Rasterman) <[EMAIL PROTECTED]>"
SECTION = "e/libs"
PRIORITY = "optional"
-DEPENDS = "evas ecore embryo eet imlib2"
+DEPENDS = "evas ecore embryo eet"
PV = "0.5.0"
PR = "1"
@@ -22,7 +22,6 @@
export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config"
LEAD_SONAME = "libedje.so"
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edje.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje.pc.in 22 Feb 2005 20:36:16 -0000 1.3
+++ edje.pc.in 11 Nov 2005 06:49:57 -0000 1.4
@@ -6,7 +6,7 @@
Name: edje
Description: Enlightened graphical design and layout engine.
-Requires: ecore evas eet imlib2
+Requires: ecore evas eet
Version: @VERSION@
Libs: -L${libdir} -ledje
Cflags: -I${includedir}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edje.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje.spec.in 25 Oct 2005 03:45:52 -0000 1.1
+++ edje.spec.in 11 Nov 2005 06:49:57 -0000 1.2
@@ -13,7 +13,7 @@
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-devel vim-enhanced
BuildRequires: libjpeg-devel zlib-devel eet-devel XFree86-devel
-BuildRequires: embryo-devel imlib2-devel >= 1.2.0 evas-devel ecore-devel
+BuildRequires: embryo-devel evas-devel ecore-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -37,7 +37,7 @@
Group: System Environment/Libraries
Requires: %{name} = %{version}
Requires: libjpeg-devel zlib-devel eet-devel XFree86-devel
-Requires: embryo-devel imlib2-devel >= 1.2.0 evas-devel ecore-devel
+Requires: embryo-devel evas-devel ecore-devel
%description devel
Headers, static libraries, test programs and documentation for Edje
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/edjeXnative.bb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edjeXnative.bb 18 Dec 2004 22:06:26 -0000 1.1
+++ edjeXnative.bb 11 Nov 2005 06:49:57 -0000 1.2
@@ -6,7 +6,7 @@
PRIORITY = "optional"
include edje.oe
inherit native
-DEPENDS = "evas-native ecore-native embryo-native eet-native imlib2-native"
+DEPENDS = "evas-native ecore-native embryo-native eet-native"
EXTRA_OECONF = "--enable-fb-only"
@@ -16,7 +16,6 @@
export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native"
export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config-native"
export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config-native"
-export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config-native"
do_stage() {
for i in edje edje_ls edje_cc; do
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
