diff options
| -rw-r--r-- | packages/efl1/evas.inc | 1 | ||||
| -rw-r--r-- | packages/libpng/libpng-native_1.2.19.bb | 14 | ||||
| -rw-r--r-- | packages/libpng/libpng_1.2.19.bb | 50 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-terminal2_1.0.0.bb | 6 |
4 files changed, 67 insertions, 4 deletions
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 6fb6d7f60e..28c883d895 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -11,7 +11,6 @@ inherit efl_library export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" -SRC_URI += "file://fix-configure.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" diff --git a/packages/libpng/libpng-native_1.2.19.bb b/packages/libpng/libpng-native_1.2.19.bb new file mode 100644 index 0000000000..231b956678 --- /dev/null +++ b/packages/libpng/libpng-native_1.2.19.bb @@ -0,0 +1,14 @@ +require libpng_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" +DEPENDS = "zlib-native" + +INHIBIT_NATIVE_STAGE_INSTALL = "1" + +do_stage_append() { + cp libpng.pc libpng12.pc + install -m 644 png.h ${STAGING_INCDIR}/png.h + install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ + ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so +} diff --git a/packages/libpng/libpng_1.2.19.bb b/packages/libpng/libpng_1.2.19.bb new file mode 100644 index 0000000000..c6c296cae4 --- /dev/null +++ b/packages/libpng/libpng_1.2.19.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +LICENSE = "libpng" +SECTION = "libs" +DEPENDS = "zlib" +PRIORITY = "required" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" +S = "${WORKDIR}/libpng-${PV}" + +inherit autotools binconfig pkgconfig + +do_stage() { + cp libpng.pc libpng12.pc + install -m 644 png.h ${STAGING_INCDIR}/png.h + install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng ${STAGING_LIBDIR}/ + oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ + ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir} + install -d ${D}${libdir} + install -d ${D}${includedir} + unset LDFLAGS + oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \ + 'DB=${D}${bindir}' 'DI=${D}${includedir}' \ + 'DL=${D}${libdir}' 'DM=${D}${mandir}' \ + install +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libpng12', d) + bb.build.exec_func('package_do_package', d) +} + +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" + +FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg" +FILES_${PN}12 = "${libdir}/libpng12.so.*" +FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" + diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index f1a9575bdb..cff759edd6 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r3" +PR = "r4" RCONFLICTS = "openmoko-terminal" RREPLACES = "openmoko-terminal" @@ -30,7 +30,7 @@ pkg_postinst_${PN}() { Mrxvt.xft: 1 Mrxvt.xftFont: Bitstream Vera Sans Mono Mrxvt.xftSize: 5 -Mrxvt.xftAntialias: 0 +Mrxvt.xftAntialias: 1 # Don't load a multi-char font. This will reduce the line space if your multi # char font has different dimensions than the regular font. You might need to @@ -39,7 +39,7 @@ Mrxvt.xftNomFont: 1 # Font to use for tab bar / menus. This need not be mono-spaced ;). Mrxvt.xftPFont: Bitstream Vera Sans -Mrxvt.xftPSize: 8 +Mrxvt.xftPSize: 6 EOF } |