From ac2189551d8f54baafe3e5526bd38433f8f9cf8a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 8 Aug 2005 13:48:31 +0000 Subject: MASSIVE EFL (Enlightenment Foundation Libraries) Update: - edb - eet - embryo - ecore - evas - edje - ewl - imlib - adjust preferred-e-packages as well Next step: Add Entrance and E17 --- packages/imlib2/imlib2-fb_1.2.0.007.bb | 8 ------- packages/imlib2/imlib2-fb_1.2.1.004.bb | 4 ++++ packages/imlib2/imlib2-native_1.2.0.007.bb | 11 --------- packages/imlib2/imlib2-native_1.2.1.004.bb | 6 +++++ packages/imlib2/imlib2-x11_1.2.0.007.bb | 9 ------- packages/imlib2/imlib2-x11_1.2.1.004.bb | 8 +++++++ packages/imlib2/imlib2.inc | 38 ++++++++++++++++++++++++------ 7 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 packages/imlib2/imlib2-fb_1.2.0.007.bb create mode 100644 packages/imlib2/imlib2-fb_1.2.1.004.bb delete mode 100644 packages/imlib2/imlib2-native_1.2.0.007.bb create mode 100644 packages/imlib2/imlib2-native_1.2.1.004.bb delete mode 100644 packages/imlib2/imlib2-x11_1.2.0.007.bb create mode 100644 packages/imlib2/imlib2-x11_1.2.1.004.bb (limited to 'packages/imlib2') diff --git a/packages/imlib2/imlib2-fb_1.2.0.007.bb b/packages/imlib2/imlib2-fb_1.2.0.007.bb deleted file mode 100644 index a49e96c0d4..0000000000 --- a/packages/imlib2/imlib2-fb_1.2.0.007.bb +++ /dev/null @@ -1,8 +0,0 @@ -SECTION = "libs" -LICENSE = "BSD" -include imlib2.inc -inherit native -DEPENDS = "freetype" - -EXTRA_OECONF = "--without-x \ - --disable-mmx" diff --git a/packages/imlib2/imlib2-fb_1.2.1.004.bb b/packages/imlib2/imlib2-fb_1.2.1.004.bb new file mode 100644 index 0000000000..bddb085fdd --- /dev/null +++ b/packages/imlib2/imlib2-fb_1.2.1.004.bb @@ -0,0 +1,4 @@ +include imlib2.inc + +EXTRA_OECONF = "--without-x \ + --disable-mmx" diff --git a/packages/imlib2/imlib2-native_1.2.0.007.bb b/packages/imlib2/imlib2-native_1.2.0.007.bb deleted file mode 100644 index 17c54ae5a2..0000000000 --- a/packages/imlib2/imlib2-native_1.2.0.007.bb +++ /dev/null @@ -1,11 +0,0 @@ -include imlib2.inc -inherit native -DEPENDS = "freetype-native libpng-native jpeg-native" - -EXTRA_OECONF = "--disable-mmx \ - --without-x" - -do_stage () { - oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/ -} diff --git a/packages/imlib2/imlib2-native_1.2.1.004.bb b/packages/imlib2/imlib2-native_1.2.1.004.bb new file mode 100644 index 0000000000..e3a46c4aba --- /dev/null +++ b/packages/imlib2/imlib2-native_1.2.1.004.bb @@ -0,0 +1,6 @@ +include imlib2.inc +inherit native +DEPENDS = "freetype-native libpng-native jpeg-native" + +EXTRA_OECONF = "--disable-mmx \ + --without-x" diff --git a/packages/imlib2/imlib2-x11_1.2.0.007.bb b/packages/imlib2/imlib2-x11_1.2.0.007.bb deleted file mode 100644 index 53d38bff34..0000000000 --- a/packages/imlib2/imlib2-x11_1.2.0.007.bb +++ /dev/null @@ -1,9 +0,0 @@ -include imlib2.inc -DEPENDS += "x11 xext" - -EXTRA_OECONF = "--disable-mmx \ - --with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR}" -DEPENDS += "" - diff --git a/packages/imlib2/imlib2-x11_1.2.1.004.bb b/packages/imlib2/imlib2-x11_1.2.1.004.bb new file mode 100644 index 0000000000..4cec9a979f --- /dev/null +++ b/packages/imlib2/imlib2-x11_1.2.1.004.bb @@ -0,0 +1,8 @@ +include imlib2.inc +DEPENDS += "x11 xext" + +EXTRA_OECONF = "--disable-mmx \ + --with-x \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR}" + diff --git a/packages/imlib2/imlib2.inc b/packages/imlib2/imlib2.inc index fce10c2eb3..cf73ba446f 100644 --- a/packages/imlib2/imlib2.inc +++ b/packages/imlib2/imlib2.inc @@ -5,11 +5,7 @@ SECTION = "e/libs" PRIORITY = "optional" PROVIDES = "virtual/imlib2" DEPENDS = "freetype libpng jpeg" - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack +MAINTAINER = "Michael 'Mickey' Lauer " SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz" S = "${WORKDIR}/imlib2-${PV}" @@ -19,9 +15,37 @@ inherit autotools pkgconfig binconfig do_stage () { oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/ install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/ + + install -d ${STAGING_LIBDIR}/imlib2/loaders + for i in src/modules/loaders/.libs/*.so + do + install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders + done + + install -d ${STAGING_LIBDIR}/imlib2/filters + for i in src/modules/filters/.libs/*.so + do + install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters + done +} + +do_install_append() { + install -d ${D}${libdir}/imlib2/loaders + for i in src/modules/loaders/.libs/*.so + do + install -m 0755 $i ${D}${libdir}/imlib2/loaders + done + + install -d ${D}${libdir}/imlib2/filters + for i in src/modules/filters/.libs/*.so + do + install -m 0755 $i ${D}${libdir}/imlib2/filters + done } -PACKAGES += "${PN}-bin" +PACKAGES =+ "imlib2-bin imlib2-loaders imlib2-filters" FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2" FILES_${PN}-dev += "${bindir}/imlib2-config" -FILES_${PN}-bin = "${bindir}" +FILES_imlib2-bin = "${bindir}" +FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" +FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" -- cgit v1.2.3