diff options
| author | Chris Larson <clarson@kergoth.com> | 2003-11-30 02:26:22 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-11-30 02:26:22 +0000 |
| commit | e9e83232583886db8881345c51ada729966138bf (patch) | |
| tree | 1cd5a8c53a5e283663a1873246f0aff23a38019a | |
| parent | ffd74681cdcbb7ed936745cb77a031af7cded8d9 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into direwolf.ppp.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages
2003/11/29 20:25:42-06:00 ti.com!kergoth
Depends fixes in evas, x11-cvs, and epeg.
BKrev: 3fc9554e5H-aGbQ7R0BkgrHNSqX2Ag
| -rw-r--r-- | epeg/epeg.oe | 4 | ||||
| -rw-r--r-- | libogg/libogg_1.0.oe | 21 | ||||
| -rw-r--r-- | nonworking/evas/evas_1.0.0-pre5.oe | 23 | ||||
| -rw-r--r-- | x11/x11-cvs.oe | 11 |
4 files changed, 56 insertions, 3 deletions
diff --git a/epeg/epeg.oe b/epeg/epeg.oe index 60a94101df..547129afea 100644 --- a/epeg/epeg.oe +++ b/epeg/epeg.oe @@ -1,7 +1,7 @@ PV = ${DATE} -DEPENDS = virtual/libc libjpeg -RDEPENDS = libc6 jpeg +DEPENDS = virtual/libc jpeg +RDEPENDS = libc6 libjpeg SRC_URI = cvs://anonymous:@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/epeg S = ${WORKDIR}/epeg diff --git a/libogg/libogg_1.0.oe b/libogg/libogg_1.0.oe index e69de29bb2..08b276df84 100644 --- a/libogg/libogg_1.0.oe +++ b/libogg/libogg_1.0.oe @@ -0,0 +1,21 @@ +SECTION=libs +RDEPENDS=libc6 +DEPENDS=virtual/libc + +SRC_URI = http://www.vorbis.com/files/1.0/unix/libogg-${PV}.tar.gz + +inherit autotools libtool + +do_stage () { + install -m 0644 src/.libs/libogg.a ${STAGING_LIBDIR}/ + install -m 0644 src/.libs/libogg.lai ${STAGING_LIBDIR}/libogg.la + install -m 0644 src/.libs/libogg.so.0.4.0 ${STAGING_LIBDIR}/ + ln -sf libogg.so.0.4.0 ${STAGING_LIBDIR}/libogg.so.0 + ln -sf libogg.so.0.4.0 ${STAGING_LIBDIR}/libogg.so + + install -d ${STAGING_DIR}/target/include/ogg + (cd include/ogg; cp config_types.h ogg.h os_types.h ${STAGING_DIR}/target/include/ogg/) + + install -d ${STAGING_DIR}/share/aclocal + install -m 0644 ogg.m4 ${STAGING_DIR}/share/aclocal/ogg.m4 +} diff --git a/nonworking/evas/evas_1.0.0-pre5.oe b/nonworking/evas/evas_1.0.0-pre5.oe index e69de29bb2..0c7f51374e 100644 --- a/nonworking/evas/evas_1.0.0-pre5.oe +++ b/nonworking/evas/evas_1.0.0-pre5.oe @@ -0,0 +1,23 @@ +DEPENDS = virtual/libc libpng jpeg freetype +RDEPENDS = libc6 jpeg libpng freetype + +SRC_URI = ${SOURCEFORGE_MIRROR}/enlightenment/evas-1.0.0_pre5.tar.gz \ + file://${FILESDIR}/configure.patch;patch=1 +S = ${WORKDIR}/evas-1.0.0_pre5 + +inherit autotools libtool + +EXTRA_OECONF = '--enable-fb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-scale-smooth \ + --enable-scale-sample \ + --enable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-270' + +do_configure_prepend () { + cp ${FILESDIR}/pkg.m4 acinclude.m4 +} diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe index 9e14230f99..8d7fa3c007 100644 --- a/x11/x11-cvs.oe +++ b/x11/x11-cvs.oe @@ -2,13 +2,22 @@ SECTION="libs" PRIORITY="optional" MAINTAINER="Greg Gilbert <greg@treke.net>" RDEPENDS="libc6" -DEPENDS=virtual/libc xproto-cvs xextentions-cvs xau-cvs xtrans-cvs xdmcp-cvs +DEPENDS=virtual/libc xproto-cvs xextensions-cvs xau-cvs xtrans-cvs xdmcp-cvs SRC_URI = cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 S=${WORKDIR}/X11 inherit autotools pkgconfig libtool +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys + ) + oe_runmake +} + do_stage() { install -c -m 644 X11/XKBlib.h ${STAGING_DIR}/target/include/X11/XKBlib.h |