diff options
159 files changed, 991 insertions, 144 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index c0976ce646..927e3432b7 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -179,8 +179,4 @@ autotools_stage_all() { rm -rf ${STAGE_TEMP} } -autotools_do_stage() { - autotools_stage_all -} - -EXPORT_FUNCTIONS do_configure do_install do_stage +EXPORT_FUNCTIONS do_configure do_install diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 0c743ef64f..c013252e0a 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -77,6 +77,7 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/joe/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ +${PKGDIR}/packages/klibc/*.bb \ ${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 8aec056d24..540d9621ef 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -71,6 +71,7 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/joe/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ +${PKGDIR}/packages/klibc/*.bb \ ${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ diff --git a/packages/audiofile/audiofile_0.2.6.bb b/packages/audiofile/audiofile_0.2.6.bb index b86680bc15..c83b4c2c27 100644 --- a/packages/audiofile/audiofile_0.2.6.bb +++ b/packages/audiofile/audiofile_0.2.6.bb @@ -15,3 +15,7 @@ RPROVIDES_${PN} += "audiofile" SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz" inherit autotools pkgconfig binconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb index 7b51227cde..96b5829c43 100644 --- a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb +++ b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb @@ -1,5 +1,5 @@ SECTION = "devel" -PR = "r1" +PR = "r3" include binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index bb66ca6741..994c2d4db8 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r3" +PR = "r5" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ @@ -19,18 +19,7 @@ SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1" SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1" SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1" -#to be removed: -# this patch does not seem to do anything any longer -#SRC_URI += "file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1" - S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" include binutils.inc - -#to be removed: -# This was not doing anything because it used the ${B} directory and there -# was no configure.ac or configure.in in there. -#do_configure_prepend() { -# for dir in bfd gas ld; do ( cd $dir; autoreconf ); done -#} diff --git a/packages/bluez/bluez-libs_2.21.bb b/packages/bluez/bluez-libs_2.21.bb index d740bd80a9..e5ef923d03 100644 --- a/packages/bluez/bluez-libs_2.21.bb +++ b/packages/bluez/bluez-libs_2.21.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" @@ -12,11 +12,5 @@ inherit autotools pkgconfig HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done + autotools_stage_all } diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb index e786d01fb7..aa97a9f4de 100644 --- a/packages/cairo/cairo_1.0.0.bb +++ b/packages/cairo/cairo_1.0.0.bb @@ -9,3 +9,7 @@ PR = "r1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb index 9e65e89cab..5db0dd127d 100644 --- a/packages/cairo/cairo_1.0.2.bb +++ b/packages/cairo/cairo_1.0.2.bb @@ -8,3 +8,7 @@ PR = "r0" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" inherit autotools pkgconfig + +do_stage () { +autotools_stage_all +} diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb index 10d4d0715c..f04af713f2 100644 --- a/packages/cairo/libsvg-cairo_20050601.bb +++ b/packages/cairo/libsvg-cairo_20050601.bb @@ -12,3 +12,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-c S = "${WORKDIR}/libsvg-cairo" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb index a106005284..47c255c07c 100644 --- a/packages/cairo/libsvg-cairo_cvs.bb +++ b/packages/cairo/libsvg-cairo_cvs.bb @@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}" SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@debian.org>" DEPENDS = "libsvg cairo" DESCRIPTION = "SVG rendering library" DEFAULT_PREFERENCE = "-1" @@ -9,3 +10,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-c S = "${WORKDIR}/libsvg-cairo" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb index 02f9b0772f..8cdb7a96c2 100644 --- a/packages/cairo/libsvg_cvs.bb +++ b/packages/cairo/libsvg_cvs.bb @@ -12,3 +12,7 @@ PR = "r2" EXTRA_OECONF = "--with-expat" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb index 90c44c912f..ba6dc65f88 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DEPENDS = "openssl virtual/db" DESCRIPTION = "Generic client/server library for SASL authentication." LICENSE = "BSD" -PR = "r7" +PR = "r8" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \ file://berkdb.m4.patch;patch=1" @@ -33,16 +33,7 @@ do_compile_prepend () { } do_stage () { - oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR} - install -d ${STAGING_LIBDIR}/sasl2 - install -d ${STAGING_INCDIR}/sasl - install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/md5.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/md5global.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/sasl.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/saslplug.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/saslutil.h ${STAGING_INCDIR}/sasl/ - install -m 0644 ${S}/include/prop.h ${STAGING_INCDIR}/sasl/ + autotools_stage_all } pkg_postinst () { diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb index d06552f24b..c15349f6fd 100644 --- a/packages/dbh/dbh_1.0-18.bb +++ b/packages/dbh/dbh_1.0-18.bb @@ -12,3 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \ S="${WORKDIR}/dbh_${PV}" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/eel/eel_2.12.2.bb b/packages/eel/eel_2.12.2.bb index 04e7feb7f4..e10fde14e8 100644 --- a/packages/eel/eel_2.12.2.bb +++ b/packages/eel/eel_2.12.2.bb @@ -9,3 +9,8 @@ SRC_URI += "file://configure.patch;patch=1" DEPENDS = "gnome-vfs gnome-menus libgnomeui gail" EXTRA_OECONF = "--disable-gtk-doc" + + +do_stage() { +autotools_stage_all +} diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb index a311fb9c6d..b8b3a7e5f2 100644 --- a/packages/esound/esound-gpe_20020817.bb +++ b/packages/esound/esound-gpe_20020817.bb @@ -19,6 +19,13 @@ EXTRA_OECONF = "--disable-alsa" SOV = "0.2.28" +do_stage () { + install -m 0644 esd.h ${STAGING_INCDIR}/esd.h + oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR} + install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la + install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal +} + PACKAGES =+ "esddsp esd esd-utils" FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb index 4aff96beb1..4782bcf6f6 100644 --- a/packages/expat/expat_1.95.6.bb +++ b/packages/expat/expat_1.95.6.bb @@ -8,6 +8,10 @@ S = "${WORKDIR}/expat-${PV}" inherit autotools export LTCC = "${CC}" +do_stage () { + autotools_stage_all +} + do_install () { oe_runmake prefix="${D}${prefix}" \ bindir="${D}${bindir}" \ diff --git a/packages/file/file_4.13.bb b/packages/file/file_4.13.bb index 34f6d74397..eac5c8a18f 100644 --- a/packages/file/file_4.13.bb +++ b/packages/file/file_4.13.bb @@ -13,3 +13,7 @@ inherit autotools do_configure_prepend() { sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am } + +do_stage() { +autotools_stage_all +} diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb index 54c11d7312..0396208ce4 100644 --- a/packages/flac/flac_1.1.0.bb +++ b/packages/flac/flac_1.1.0.bb @@ -32,3 +32,7 @@ do_configure () { install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ autotools_do_configure } + +do_stage () { + autotools_stage_all +} diff --git a/packages/gdbm/gdbm-native_1.8.3.bb b/packages/gdbm/gdbm-native_1.8.3.bb index ec7a0f2430..627a44fc2e 100644 --- a/packages/gdbm/gdbm-native_1.8.3.bb +++ b/packages/gdbm/gdbm-native_1.8.3.bb @@ -10,3 +10,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ S = "${WORKDIR}/gdbm-${PV}" inherit autotools native + +do_stage () { + autotools_stage_all +} diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index cdc7e59608..ca956520a7 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -9,3 +9,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://makefile.patch;patch=1" inherit autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb index 2b7fad3dcc..8bc1c7cd1a 100644 --- a/packages/geda/libgeda_20050820.bb +++ b/packages/geda/libgeda_20050820.bb @@ -8,3 +8,7 @@ DEPENDS = "zlib gtk+ guile libpng" SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz" inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb index 6615fc39c5..ad7cb487a3 100644 --- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb +++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb @@ -8,7 +8,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "gtk-doc-native" -PR = "r0" +PR = "r2" EXTRA_OECONF = "--disable-debug" @@ -26,22 +26,11 @@ do_configure_prepend () { } do_stage () { + autotools_stage_all install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/ install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/ install -m 0755 glib-gettextize ${STAGING_BINDIR}/ - oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} - autotools_stage_includes - install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 - install -d ${STAGING_DATADIR}/glib-2.0/gettext/po - install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/ - install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/ } do_install () { diff --git a/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb index d377a0aeae..fc1d14b0a3 100644 --- a/packages/glib-2.0/glib-2.0_2.8.2.bb +++ b/packages/glib-2.0/glib-2.0_2.8.2.bb @@ -10,7 +10,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS += "glib-2.0-native gtk-doc" DEPENDS += "virtual/libiconv virtual/libintl" PACKAGES =+ "glib-2.0-utils " -PR = "r0" +PR = "r2" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" @@ -35,14 +35,6 @@ do_configure_prepend () { } do_stage () { - oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} - autotools_stage_includes - install -d ${STAGING_INCDIR}/glib-2.0/glib + autotools_stage_all install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 } diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 2b94c4bbde..5ee5583fc8 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -80,6 +80,14 @@ def get_glibc_fpu_setting(bb, d): do_munge() { # Integrate ports into tree mv ${WORKDIR}/ports ${S} + + # http://www.handhelds.org/hypermail/oe/51/5135.html + # Some files were moved around between directories on + # 2005-12-21, which means that any attempt to check out + # from CVS using a datestamp older than that will be doomed. + # + # This is a workaround for that problem. + rm -rf ${S}/bits } addtask munge before do_patch after do_unpack diff --git a/packages/gmp/gmp_4.1.4.bb b/packages/gmp/gmp_4.1.4.bb index 9ae2df92d5..d80e728dc4 100644 --- a/packages/gmp/gmp_4.1.4.bb +++ b/packages/gmp/gmp_4.1.4.bb @@ -13,3 +13,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ inherit autotools acpaths = "" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index 320c5c22ab..9957921327 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -11,3 +11,7 @@ EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" do_configure_prepend () { cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} } + +do_stage () { +autotools_stage_all +} diff --git a/packages/gnome/gnome-menus_2.10.2.bb b/packages/gnome/gnome-menus_2.10.2.bb index 6f515d44fd..9d7bc675f2 100644 --- a/packages/gnome/gnome-menus_2.10.2.bb +++ b/packages/gnome/gnome-menus_2.10.2.bb @@ -5,4 +5,8 @@ MAINTAINER = "Koen Kooi <koen@handhelds.org>" inherit gnome pkgconfig +do_stage() { +autotools_stage_all +} + FILES_${PN} += "${datadir}" diff --git a/packages/gnome/gnome-menus_2.12.0.bb b/packages/gnome/gnome-menus_2.12.0.bb index 832ce340eb..87f5a0d2b9 100644 --- a/packages/gnome/gnome-menus_2.12.0.bb +++ b/packages/gnome/gnome-menus_2.12.0.bb @@ -5,6 +5,10 @@ MAINTAINER = "Koen Kooi <koen@handhelds.org>" inherit gnome pkgconfig +do_stage() { +autotools_stage_all +} + PACKAGES += "${PN}-python" FILES_${PN} += "${datadir}/desktop-directories/" FILES_${PN}-python = "${libdir}/python*" diff --git a/packages/gnome/gnome-panel_2.10.1.bb b/packages/gnome/gnome-panel_2.10.1.bb index 835d5ea6f8..09e4259fc8 100644 --- a/packages/gnome/gnome-panel_2.10.1.bb +++ b/packages/gnome/gnome-panel_2.10.1.bb @@ -3,3 +3,7 @@ MAINTAINER = "Koen Kooi <koen@handhelds.org>" DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus" inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/gnome/libgnome_2.12.0.1.bb b/packages/gnome/libgnome_2.12.0.1.bb index 6ed18bccc4..f11aeacd37 100644 --- a/packages/gnome/libgnome_2.12.0.1.bb +++ b/packages/gnome/libgnome_2.12.0.1.bb @@ -8,3 +8,7 @@ inherit gnome DEPENDS = "gconf-native gnome-vfs libbonobo" EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { +autotools_stage_all +} diff --git a/packages/gnome/libgnomeui_2.12.0.bb b/packages/gnome/libgnomeui_2.12.0.bb index 939f36e1b7..2465de03ca 100644 --- a/packages/gnome/libgnomeui_2.12.0.bb +++ b/packages/gnome/libgnomeui_2.12.0.bb @@ -16,3 +16,7 @@ EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h } + +do_stage() { +autotools_stage_all +} diff --git a/packages/gnome/libwnck_2.10.2.bb b/packages/gnome/libwnck_2.10.2.bb index 88d1f8b293..b07bc09b86 100644 --- a/packages/gnome/libwnck_2.10.2.bb +++ b/packages/gnome/libwnck_2.10.2.bb @@ -3,3 +3,7 @@ DESCRIPTION = "Window navigation construction toolkit" HOMEPAGE = "" inherit gnome + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libwnck_2.12.1.bb b/packages/gnome/libwnck_2.12.1.bb index 88d1f8b293..b07bc09b86 100644 --- a/packages/gnome/libwnck_2.12.1.bb +++ b/packages/gnome/libwnck_2.12.1.bb @@ -3,3 +3,7 @@ DESCRIPTION = "Window navigation construction toolkit" HOMEPAGE = "" inherit gnome + +do_stage() { + autotools_stage_all +} diff --git a/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty b/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty diff --git a/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch b/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch new file mode 100644 index 0000000000..05fbdde501 --- /dev/null +++ b/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch @@ -0,0 +1,66 @@ +--- gpe-autostarter-0.11/autostarter.c.orig 2005-08-29 19:39:10 +0200 ++++ gpe-autostarter-0.11/autostarter.c 2005-08-29 19:42:01 +0200 +@@ -50,7 +50,11 @@ + if (type != DBUS_TYPE_STRING) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + ++#ifndef DBUS_INTERFACE_LOCAL + subsys = dbus_message_iter_get_string (&iter); ++#else ++ dbus_message_iter_get_basic (&iter, &subsys); ++#endif + + if (!strcmp (subsys, "net")) + return handle_net_message (message, &iter); +@@ -72,7 +72,11 @@ + return autostarter_handle_dbus_request (connection, message); + + if (dbus_message_is_signal (message, ++#ifndef DBUS_INTERFACE_LOCAL + DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, ++#else ++ DBUS_INTERFACE_LOCAL, ++#endif + "Disconnected")) + exit (0); + +--- gpe-autostarter-0.11/bluetooth.c.orig 2005-08-29 19:36:33 +0200 ++++ gpe-autostarter-0.11/bluetooth.c 2005-08-29 19:41:43 +0200 +@@ -40,7 +40,11 @@ + if (type != DBUS_TYPE_STRING) + return; + ++#ifndef DBUS_INTERFACE_LOCAL + action = dbus_message_iter_get_string (iter); ++#else ++ dbus_message_iter_get_basic (iter, &action); ++#endif + + if (! strcmp (action, "register") || ! strcmp (action, "add")) + { +--- gpe-autostarter-0.11/net.c.orig 2005-08-29 19:36:29 +0200 ++++ gpe-autostarter-0.11/net.c 2005-08-29 19:41:29 +0200 +@@ -97,7 +97,11 @@ + if (type != DBUS_TYPE_STRING) + return; + ++#ifndef DBUS_INTERFACE_LOCAL + action = dbus_message_iter_get_string (iter); ++#else ++ dbus_message_iter_get_basic (iter, &action); ++#endif + + if (! dbus_message_iter_next (iter)) + return; +@@ -106,7 +106,11 @@ + if (type != DBUS_TYPE_STRING) + return; + ++#ifndef DBUS_INTERFACE_LOCAL + interface = dbus_message_iter_get_string (iter); ++#else ++ dbus_message_iter_get_basic (iter, &interface); ++#endif + + if (! strcmp (action, "register") || ! strcmp (action, "add")) + { diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb index 555134889b..e670c168d3 100644 --- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb +++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb @@ -4,3 +4,5 @@ RDEPENDS = "hotplug-dbus" LICENSE = "GPL" inherit gpe + +SRC_URI += " file://dbus-new-api.patch;patch=1" diff --git a/packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty b/packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty diff --git a/packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch b/packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch new file mode 100644 index 0000000000..723ba64194 --- /dev/null +++ b/packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch @@ -0,0 +1,76 @@ +--- gpe-beam-0.2.7/dbus.c.orig 2005-08-29 21:05:28 +0200 ++++ gpe-beam-0.2.7/dbus.c 2005-08-29 21:07:11 +0200 +@@ -40,7 +40,11 @@ + return obex_client_handle_dbus_request (connection, message); + + if (dbus_message_is_signal (message, ++#ifndef DBUS_INTERFACE_LOCAL + DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, ++#else ++ DBUS_INTERFACE_LOCAL, ++#endif + "Disconnected")) + exit (0); + +@@ -70,10 +70,18 @@ + + dbus_connection_register_object_path (connection, object_path, &dbus_obex_vtable, NULL); + ++#ifndef DBUS_INTERFACE_LOCAL + dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error); ++#else ++ dbus_bus_request_name (connection, SERVICE_NAME, 0, &error); ++#endif + if (dbus_error_is_set (&error)) + { ++#ifndef DBUS_INTERFACE_LOCAL + gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message); ++#else ++ gpe_error_box_fmt (_("Failed to request name: %s"), error.message); ++#endif + dbus_error_free (&error); + } + } +--- gpe-beam-0.2.7/obexclient-dbus.c.orig 2005-08-29 21:05:33 +0200 ++++ gpe-beam-0.2.7/obexclient-dbus.c 2005-08-29 21:10:00 +0200 +@@ -73,7 +73,11 @@ + if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING) + goto wrong_args; + ++#ifndef DBUS_INTERFACE_LOCAL + filename = dbus_message_iter_get_string (&iter); ++#else ++ dbus_message_iter_get_basic (&iter, &filename); ++#endif + + if (!dbus_message_iter_next (&iter)) + goto wrong_args; +@@ -81,16 +81,28 @@ + if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING) + goto wrong_args; + ++#ifndef DBUS_INTERFACE_LOCAL + mime_type = dbus_message_iter_get_string (&iter); ++#else ++ dbus_message_iter_get_basic (&iter, &mime_type); ++#endif + + if (!dbus_message_iter_next (&iter)) + goto wrong_args; + + if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY ++#ifndef DBUS_INTERFACE_LOCAL + || dbus_message_iter_get_array_type (&iter) != DBUS_TYPE_BYTE) ++#else ++ || dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_BYTE) ++#endif + goto wrong_args; + ++#ifndef DBUS_INTERFACE_LOCAL + dbus_message_iter_get_byte_array (&iter, &data, &len); ++#else ++ dbus_message_iter_get_fixed_array (&iter, &data, &len); ++#endif + + reply = dbus_message_new_method_return (message); + if (!reply) diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb index d55cd6db60..b8e69d6b11 100644 --- a/packages/gpe-beam/gpe-beam_0.2.8.bb +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -10,3 +10,4 @@ PRIORITY = "optional" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" LICENSE = "GPL" +SRC_URI += "file://dbus-new-api.patch;patch=1" diff --git a/packages/gpe-contacts/gpe-contacts_0.43.bb b/packages/gpe-contacts/gpe-contacts_0.43.bb new file mode 100644 index 0000000000..b5afbb3a3c --- /dev/null +++ b/packages/gpe-contacts/gpe-contacts_0.43.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +inherit gpe autotools + +PR = "r0" + +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE contacts manager" +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + + +FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" + diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb index 2502e4befe..5baee4ada0 100644 --- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -16,8 +16,9 @@ S = "${WORKDIR}/libgtkhtml2-${PV}" EXTRA_OECONF = "--disable-gtk-doc" -do_stage_prepend() { +do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true + autotools_stage_all } do_compile() { diff --git a/packages/ice/ice_6.3.3.bb b/packages/ice/ice_6.3.3.bb index f0317ac476..2f0f9a2cce 100644 --- a/packages/ice/ice_6.3.3.bb +++ b/packages/ice/ice_6.3.3.bb @@ -11,3 +11,7 @@ SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \ S = "${WORKDIR}/libICE-${PV}" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb index e254de9c43..7f0504694a 100644 --- a/packages/ice/ice_cvs.bb +++ b/packages/ice/ice_cvs.bb @@ -11,3 +11,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE" S = "${WORKDIR}/ICE" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb index 1898c6656e..9285c61819 100644 --- a/packages/ipkg/ipkg_0.99.152.bb +++ b/packages/ipkg/ipkg_0.99.152.bb @@ -1 +1,2 @@ include ipkg.inc +PR = "r2" diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb index 99249a8d55..02de5e7f92 100644 --- a/packages/ipkg/ipkg_0.99.153.bb +++ b/packages/ipkg/ipkg_0.99.153.bb @@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1" include ipkg.inc -PR = "r1" +PR = "r3" SRC_URI += "file://fix-bug1393.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb index 7be7009262..9285c61819 100644 --- a/packages/ipkg/ipkg_0.99.154.bb +++ b/packages/ipkg/ipkg_0.99.154.bb @@ -1,3 +1,2 @@ include ipkg.inc - -SRC_URI += "file://libbb_tar_gnu_extensions.patch;patch=1" +PR = "r2" diff --git a/packages/jpeg/jpeg-6b/install.patch b/packages/jpeg/jpeg-6b/install.patch new file mode 100644 index 0000000000..742594a11f --- /dev/null +++ b/packages/jpeg/jpeg-6b/install.patch @@ -0,0 +1,28 @@ +--- jpeg-6b/makefile.cfg.orig 2005-12-29 12:51:05.584736333 -0800 ++++ jpeg-6b/makefile.cfg 2005-12-29 12:55:05.075806556 -0800 +@@ -192,11 +192,13 @@ wrjpgcom: wrjpgcom.$(O) + # Installation rules: + + install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ ++ $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg + $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg + $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran + $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom + $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom ++ $(INSTALL) -d $(DESTDIR)$(mandir) + $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext) + $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext) +@@ -204,9 +206,11 @@ install: cjpeg djpeg jpegtran rdjpgcom w + $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext) + + install-lib: libjpeg.$(A) install-headers ++ $(INSTALL) -d $(DESTDIR)$(libdir) + $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A) + + install-headers: jconfig.h ++ $(INSTALL) -d $(DESTDIR)$(includedir) + $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h + $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h + $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h diff --git a/packages/jpeg/jpeg-native_6b.bb b/packages/jpeg/jpeg-native_6b.bb index b617f1b6c0..420cc9fd4b 100644 --- a/packages/jpeg/jpeg-native_6b.bb +++ b/packages/jpeg/jpeg-native_6b.bb @@ -5,10 +5,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}" DEPENDS = "" do_stage() { - install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h - install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h - install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h - install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h - install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h - oe_libinstall -so libjpeg ${STAGING_LIBDIR} + autotools_stage_all } diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index 49e0382b6e..277cdfa48c 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" @@ -9,7 +10,8 @@ LICENSE ="jpeg" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://debian.patch;patch=1 \ file://ldflags.patch;patch=1 \ - file://paths.patch;patch=1" + file://paths.patch;patch=1 \ + file://install.patch;patch=1" S = "${WORKDIR}/jpeg-${PV}" inherit autotools @@ -20,16 +22,5 @@ EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"' CFLAGS_append = " -D_REENTRANT" do_stage() { - install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h - install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h - install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h - install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h - install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h - oe_libinstall -so libjpeg ${STAGING_LIBDIR} -} - -do_install() { - install -d ${D}${bindir} ${D}${includedir} \ - ${D}${mandir}/man1 ${D}${libdir} - oe_runmake 'DESTDIR=${D}' install + autotools_stage_all } diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb index 62275f14fb..a293a44270 100644 --- a/packages/libao/libao_0.8.6.bb +++ b/packages/libao/libao_0.8.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "A cross platform audio library" HOMEPAGE = "http://www.xiph.org/ao/" SECTION = "libs" PRIORITY = "optional" -PR = "r0" +PR = "r1" SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" @@ -14,13 +14,7 @@ EXTRA_OECONF = "--disable-esd --disable-esdtest \ --disable-arts --disable-nas" do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } FILES_${PN} += "${libdir}/ao/plugins-2/*.so" diff --git a/packages/libeina/libeina_0.96.5.bb b/packages/libeina/libeina_0.96.5.bb index c8a88e1448..821cd3323a 100644 --- a/packages/libeina/libeina_0.96.5.bb +++ b/packages/libeina/libeina_0.96.5.bb @@ -8,3 +8,8 @@ DEPENDS = "file glib-2.0 gstreamer" SRC_URI = "http://bolgo.cent.uji.es/files/libeina/${P}.tar.gz" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + diff --git a/packages/libeina/libeina_0.96.7.bb b/packages/libeina/libeina_0.96.7.bb index 501f12d6f7..ac25e760dc 100644 --- a/packages/libeina/libeina_0.96.7.bb +++ b/packages/libeina/libeina_0.96.7.bb @@ -12,3 +12,8 @@ SRC_URI = "http://bolgo.cent.uji.es/files/libeina/${P}.tar.gz \ EXTRA_OECONF = "--disable-magic" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb index e8d0565041..c40edc4c95 100644 --- a/packages/libexif/libexif_0.6.9.bb +++ b/packages/libexif/libexif_0.6.9.bb @@ -8,3 +8,7 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/libgpelaunch/libgpelaunch_0.12.bb b/packages/libgpelaunch/libgpelaunch_0.12.bb index 52488bb9f4..d42414d0d0 100644 --- a/packages/libgpelaunch/libgpelaunch_0.12.bb +++ b/packages/libgpelaunch/libgpelaunch_0.12.bb @@ -1,8 +1,17 @@ LICENSE = "LGPL" DESCRIPTION = "GPE program launcher library" SECTION = "libs" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "gtk+ libgpewidget startup-notification" inherit autotools pkgconfig SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb index a910161f26..be56d0cbad 100644 --- a/packages/libgpeplugin/libgpeplugin_cvs.bb +++ b/packages/libgpeplugin/libgpeplugin_cvs.bb @@ -16,3 +16,7 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" S = "${WORKDIR}/${PN}" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/libgpewidget/libgpewidget_0.105.bb b/packages/libgpewidget/libgpewidget_0.105.bb index 143664a13f..f7d45ff0e8 100644 --- a/packages/libgpewidget/libgpewidget_0.105.bb +++ b/packages/libgpewidget/libgpewidget_0.105.bb @@ -10,3 +10,8 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" inherit pkgconfig autotools EXTRA_OECONF = "--enable-cairo" + +do_stage () { + autotools_stage_all +} + diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb index c89867e64e..f3d377a46c 100644 --- a/packages/libgpewidget/libgpewidget_cvs.bb +++ b/packages/libgpewidget/libgpewidget_cvs.bb @@ -17,3 +17,7 @@ inherit autotools pkgconfig SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" EXTRA_OECONF = "--enable-cairo" + +do_stage () { + autotools_stage_all +} diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb index b814f9a469..ad57ba8cf1 100644 --- a/packages/libgphoto2/libgphoto2_2.1.6.bb +++ b/packages/libgphoto2/libgphoto2_2.1.6.bb @@ -2,7 +2,7 @@ SECTION = "libs" DEPENDS = "jpeg libusb libexif" RPEDENDS = "libusb" DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r4" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" diff --git a/packages/libgsf/libgsf_1.13.2.bb b/packages/libgsf/libgsf_1.13.2.bb index 52f99a0bc3..caeb4e4dc9 100644 --- a/packages/libgsf/libgsf_1.13.2.bb +++ b/packages/libgsf/libgsf_1.13.2.bb @@ -10,3 +10,8 @@ FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" inherit autotools pkgconfig gnome + + +do_stage() { +autotools_stage_all +} diff --git a/packages/libgsf/libgsf_1.13.3.bb b/packages/libgsf/libgsf_1.13.3.bb index 4cb6799d6b..ec0754e115 100644 --- a/packages/libgsf/libgsf_1.13.3.bb +++ b/packages/libgsf/libgsf_1.13.3.bb @@ -10,3 +10,8 @@ FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" inherit autotools pkgconfig gnome + + +do_stage() { +autotools_stage_all +} diff --git a/packages/libid3tag/libid3tag_0.15.0b.bb b/packages/libid3tag/libid3tag_0.15.0b.bb index 9856e2d1bd..71bca86569 100644 --- a/packages/libid3tag/libid3tag_0.15.0b.bb +++ b/packages/libid3tag/libid3tag_0.15.0b.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" @@ -17,6 +18,5 @@ inherit autotools pkgconfig EXTRA_OECONF = "-enable-speed" do_stage() { - oe_libinstall -so libid3tag ${STAGING_LIBDIR} - install -m 0644 id3tag.h ${STAGING_INCDIR} + autotools_stage_all } diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 02e67e8cac..5a6f5800d6 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -9,5 +9,15 @@ S = "${WORKDIR}/libIDL-${PV}" inherit autotools pkgconfig +do_stage() { + oe_runmake install \ + prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + infodir=${STAGING_INFODIR} +} + FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dev += " ${bindir}" diff --git a/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb index 2754f0aef3..fa1a17f232 100644 --- a/packages/libmad/libmad_0.15.0b.bb +++ b/packages/libmad/libmad_0.15.0b.bb @@ -1,3 +1,4 @@ +PR = "r1" DESCRIPTION = "MPEG Audio Decoder Library" SECTION = "libs" PRIORITY = "optional" @@ -23,6 +24,5 @@ do_configure_prepend () { } do_stage() { - oe_libinstall -so libmad ${STAGING_LIBDIR} - install -m 0644 mad.h ${STAGING_INCDIR} + autotools_stage_all } diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb index f26c99c982..21fb6c7d8f 100644 --- a/packages/libmimedir/libmimedir_0.3.1.bb +++ b/packages/libmimedir/libmimedir_0.3.1.bb @@ -13,6 +13,11 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gtk-doc" +do_stage() { +autotools_stage_all +} + + PACKAGES += libmimedir-utils FILES_libmimedir-utils = "${bindir}" FILES_${PN} = "${libdir}" diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index 6d01802db4..bbdfd4f24a 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -15,6 +15,10 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gtk-doc" +do_stage() { + autotools_stage_all +} + PACKAGES += libmimedir-utils FILES_libmimedir-utils = "${bindir}" FILES_${PN} = "${libdir}" diff --git a/packages/libogg/libogg_1.1.bb b/packages/libogg/libogg_1.1.bb index 556d2e2a8f..8ca54593d9 100644 --- a/packages/libogg/libogg_1.1.bb +++ b/packages/libogg/libogg_1.1.bb @@ -9,3 +9,7 @@ SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz \ file://m4.patch;patch=1" inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/liboil/.mtn2git_empty b/packages/liboil/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/liboil/.mtn2git_empty diff --git a/packages/liboil/liboil_0.3.6.bb b/packages/liboil/liboil_0.3.6.bb new file mode 100644 index 0000000000..85bf606abe --- /dev/null +++ b/packages/liboil/liboil_0.3.6.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." +HOMEPAGE = "http://liboil.freedesktop.org/" +LICENSE = "various" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" + +SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz" + +inherit autotools + +do_stage() { +autotools_stage_all +} + + diff --git a/packages/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb index c779109a81..7ccec5fa07 100644 --- a/packages/librsvg/librsvg_2.11.1.bb +++ b/packages/librsvg/librsvg_2.11.1.bb @@ -12,3 +12,7 @@ FILES_${PN} = "${libdir}/*.so.*" FILES_rsvg = "${bindir}/rsvg ${bindir}/rsvg-view ${datadir}/pixmaps/svg-viewer.svg" FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so" FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy_0.1.4.bb index 38a7abc18c..526e1bd6ed 100644 --- a/packages/libsexy/libsexy_0.1.4.bb +++ b/packages/libsexy/libsexy_0.1.4.bb @@ -9,3 +9,9 @@ DEPENDS = "gtk+ enchant libxml2" SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + + diff --git a/packages/libsm/libsm_6.0.3.bb b/packages/libsm/libsm_6.0.3.bb index 5fbd8ff497..6a85eaf6cc 100644 --- a/packages/libsm/libsm_6.0.3.bb +++ b/packages/libsm/libsm_6.0.3.bb @@ -11,3 +11,7 @@ SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \ S = "${WORKDIR}/libSM-${PV}" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb index 5f4bb0c91e..056e33046a 100644 --- a/packages/libsm/libsm_cvs.bb +++ b/packages/libsm/libsm_cvs.bb @@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "x11 ice" DESCRIPTION = "Session management library" PR = "r1" @@ -10,3 +11,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM" S = "${WORKDIR}/SM" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/libvorbis/libvorbis_1.0.1.bb b/packages/libvorbis/libvorbis_1.0.1.bb index 3a3ab73eeb..30124a982b 100644 --- a/packages/libvorbis/libvorbis_1.0.1.bb +++ b/packages/libvorbis/libvorbis_1.0.1.bb @@ -1,3 +1,4 @@ +PR = "r1" SECTION = "libs" DEPENDS = "libogg" DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \ @@ -17,14 +18,5 @@ EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \ --with-ogg-includes=${STAGING_INCDIR}" do_stage () { - oe_libinstall -a -so -C lib libvorbis ${STAGING_LIBDIR} - oe_libinstall -a -so -C lib libvorbisfile ${STAGING_LIBDIR} - oe_libinstall -a -so -C lib libvorbisenc ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/vorbis - install -m 0644 include/vorbis/vorbisenc.h \ - include/vorbis/vorbisfile.h \ - include/vorbis/codec.h ${STAGING_INCDIR}/vorbis/ - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 vorbis.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } diff --git a/packages/libxcursor/libxcursor_1.1.2.bb b/packages/libxcursor/libxcursor_1.1.2.bb index 6c8fb5883c..d948ff50d1 100644 --- a/packages/libxcursor/libxcursor_1.1.2.bb +++ b/packages/libxcursor/libxcursor_1.1.2.bb @@ -12,3 +12,12 @@ S = "${WORKDIR}/libXcursor-${PV}" FILES_${PN} += "${libdir}/libXcursor.so" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb index 642e2d96f3..96b0da66f6 100644 --- a/packages/libxcursor/libxcursor_cvs.bb +++ b/packages/libxcursor/libxcursor_cvs.bb @@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DESCRIPTION = "X Cursor library" DEPENDS = "libxfixes" PR = "r2" @@ -11,3 +12,12 @@ S = "${WORKDIR}/Xcursor" FILES_${PN} += "${libdir}/libXcursor.so" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/libxfixes/libxfixes_2.0.1.bb b/packages/libxfixes/libxfixes_2.0.1.bb index ad217330b1..b6560b8e8b 100644 --- a/packages/libxfixes/libxfixes_2.0.1.bb +++ b/packages/libxfixes/libxfixes_2.0.1.bb @@ -9,3 +9,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ S = "${WORKDIR}/libXfixes-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxfixes/libxfixes_cvs.bb b/packages/libxfixes/libxfixes_cvs.bb index 8d1ba2421b..4899229eb9 100644 --- a/packages/libxfixes/libxfixes_cvs.bb +++ b/packages/libxfixes/libxfixes_cvs.bb @@ -8,3 +8,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfixes" S = "${WORKDIR}/Xfixes" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxft/libxft_2.1.6.bb b/packages/libxft/libxft_2.1.6.bb index ec6a0ffd46..d7cb351d63 100644 --- a/packages/libxft/libxft_2.1.6.bb +++ b/packages/libxft/libxft_2.1.6.bb @@ -16,6 +16,15 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ inherit autotools pkgconfig +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} + python do_package() { if bb.data.getVar('DEBIAN_NAMES', d, 1): bb.data.setVar('PKG_${PN}', 'libxft2', d) diff --git a/packages/libxft/libxft_cvs.bb b/packages/libxft/libxft_cvs.bb index f798b9d0c5..d25b04e483 100644 --- a/packages/libxft/libxft_cvs.bb +++ b/packages/libxft/libxft_cvs.bb @@ -15,6 +15,15 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ inherit autotools pkgconfig +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} + python do_package() { if bb.data.getVar('DEBIAN_NAMES', d, 1): bb.data.setVar('PKG_${PN}', 'libxft2', d) diff --git a/packages/libxi/libxi_6.0.1.bb b/packages/libxi/libxi_6.0.1.bb index 80ad5d00b7..b84aef8193 100644 --- a/packages/libxi/libxi_6.0.1.bb +++ b/packages/libxi/libxi_6.0.1.bb @@ -9,3 +9,12 @@ SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ S = "${WORKDIR}/libXi-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} + diff --git a/packages/libxi/libxi_cvs.bb b/packages/libxi/libxi_cvs.bb index bb340653b9..08cee7406a 100644 --- a/packages/libxi/libxi_cvs.bb +++ b/packages/libxi/libxi_cvs.bb @@ -10,3 +10,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi \ S = "${WORKDIR}/Xi" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/libxkbfile/libxkbfile_cvs.bb index a0c6b9b9d8..6d26e88c74 100644 --- a/packages/libxkbfile/libxkbfile_cvs.bb +++ b/packages/libxkbfile/libxkbfile_cvs.bb @@ -2,6 +2,7 @@ LICENSE = "GPL" PV = "0.0cvs${CVSDATE}" SECTION = "libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "x11" DESCRIPTION = "X11 keyboard library" @@ -9,3 +10,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xkbfile" S = "${WORKDIR}/xkbfile" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxp/libxp_cvs.bb b/packages/libxp/libxp_cvs.bb index 5ea6f645ea..3205010a71 100644 --- a/packages/libxp/libxp_cvs.bb +++ b/packages/libxp/libxp_cvs.bb @@ -12,3 +12,11 @@ S = "${WORKDIR}/Xp" inherit autotools pkgconfig CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxrandr/libxrandr_1.0.2.bb b/packages/libxrandr/libxrandr_1.0.2.bb index d3c21dba56..8d646539cb 100644 --- a/packages/libxrandr/libxrandr_1.0.2.bb +++ b/packages/libxrandr/libxrandr_1.0.2.bb @@ -9,3 +9,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \ S = "${WORKDIR}/libXrandr-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxrandr/libxrandr_cvs.bb b/packages/libxrandr/libxrandr_cvs.bb index 3bf4132f20..4e8c96df97 100644 --- a/packages/libxrandr/libxrandr_cvs.bb +++ b/packages/libxrandr/libxrandr_cvs.bb @@ -9,3 +9,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrandr" S = "${WORKDIR}/Xrandr" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/libxrender/libxrender_0.8.4.bb b/packages/libxrender/libxrender_0.8.4.bb index 9fd37382cd..9257d5ef72 100644 --- a/packages/libxrender/libxrender_0.8.4.bb +++ b/packages/libxrender/libxrender_0.8.4.bb @@ -9,3 +9,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ S = "${WORKDIR}/libXrender-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/libxrender/libxrender_cvs.bb index 647d4bafbe..c04163a058 100644 --- a/packages/libxrender/libxrender_cvs.bb +++ b/packages/libxrender/libxrender_cvs.bb @@ -9,3 +9,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrender" S = "${WORKDIR}/Xrender" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb index 36147480a2..07e1ce32ed 100644 --- a/packages/libxss/libxss_cvs.bb +++ b/packages/libxss/libxss_cvs.bb @@ -13,3 +13,12 @@ S = "${WORKDIR}/Xss" inherit autotools pkgconfig #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/libxv/libxv_2.2.2+cvs20040918.bb b/packages/libxv/libxv_2.2.2+cvs20040918.bb index b20e499e9d..c0861cd8f9 100644 --- a/packages/libxv/libxv_2.2.2+cvs20040918.bb +++ b/packages/libxv/libxv_2.2.2+cvs20040918.bb @@ -7,3 +7,12 @@ SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=Xv;date=20040918;m S = "${WORKDIR}/Xv" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/libxv/libxv_2.2.2.bb b/packages/libxv/libxv_2.2.2.bb index 87b6eed679..63cb34033a 100644 --- a/packages/libxv/libxv_2.2.2.bb +++ b/packages/libxv/libxv_2.2.2.bb @@ -7,3 +7,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" S = "${WORKDIR}/libXv-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/libxxf86vm/libxxf86vm_cvs.bb index 2a9299a597..044446b745 100644 --- a/packages/libxxf86vm/libxxf86vm_cvs.bb +++ b/packages/libxxf86vm/libxxf86vm_cvs.bb @@ -9,3 +9,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xxf86vm" S = "${WORKDIR}/Xxf86vm" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 9b3c5822bf..dca6a8c254 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -16,6 +16,9 @@ S = "${WORKDIR}/kernel26" inherit kernel +FILES_kernel-image_ipaq-pxa270 = "" +ALLOW_EMPTY_ipaq_pxa270 = 1 + K_MAJOR = "2" K_MINOR = "6" K_MICRO = "13" diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb index 9b22878706..6bb7f40d46 100644 --- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb +++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r0" +PR = "r1" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -23,11 +23,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \ ${RPSRC}/spitz_ohci-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \ + ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \ + ${RPSRC}/pxa2xx_release-r0.patch;patch=1 \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \ - ${RPSRC}/led_core-r9.patch;patch=1 \ - ${RPSRC}/led_triggers-r7.patch;patch=1 \ + ${RPSRC}/led_core-r10.patch;patch=1 \ + ${RPSRC}/led_triggers-r8.patch;patch=1 \ ${RPSRC}/led_trig_timer-r3.patch;patch=1 \ ${RPSRC}/led_trig_sharpsl_pm-r2.patch;patch=1 \ ${RPSRC}/led_zaurus-r7.patch;patch=1 \ @@ -60,7 +62,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ - ${RPSRC}/usb_add_epalloc-r0.patch;patch=1 \ + ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ + ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ ${RPSRC}/alsa/alsa-soc-0.9.patch;patch=1 \ ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \ ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \ diff --git a/packages/loudmouth/loudmouth_1.0.1.bb b/packages/loudmouth/loudmouth_1.0.1.bb index 5a9be8a4bc..32cf9156fc 100644 --- a/packages/loudmouth/loudmouth_1.0.1.bb +++ b/packages/loudmouth/loudmouth_1.0.1.bb @@ -6,3 +6,7 @@ DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programm SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz" inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/lzo/lzo_1.08.bb b/packages/lzo/lzo_1.08.bb index 613340308e..7986650e78 100644 --- a/packages/lzo/lzo_1.08.bb +++ b/packages/lzo/lzo_1.08.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" LICENSE = "GPLv2" SECTION = "libs" PRIORITY = "optional" -PR = "r12" +PR = "r13" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz" @@ -19,18 +19,5 @@ EXTRA_OECONF = "--enable-shared" #} do_stage() { - install -m 0644 include/lzo1.h ${STAGING_INCDIR}/lzo1.h - install -m 0644 include/lzo16bit.h ${STAGING_INCDIR}/lzo16bit.h - install -m 0644 include/lzo1a.h ${STAGING_INCDIR}/lzo1a.h - install -m 0644 include/lzo1b.h ${STAGING_INCDIR}/lzo1b.h - install -m 0644 include/lzo1c.h ${STAGING_INCDIR}/lzo1c.h - install -m 0644 include/lzo1f.h ${STAGING_INCDIR}/lzo1f.h - install -m 0644 include/lzo1x.h ${STAGING_INCDIR}/lzo1x.h - install -m 0644 include/lzo1y.h ${STAGING_INCDIR}/lzo1y.h - install -m 0644 include/lzo1z.h ${STAGING_INCDIR}/lzo1z.h - install -m 0644 include/lzo2a.h ${STAGING_INCDIR}/lzo2a.h - install -m 0644 include/lzoconf.h ${STAGING_INCDIR}/lzoconf.h - install -m 0644 include/lzoutil.h ${STAGING_INCDIR}/lzoutil.h - - oe_libinstall -a -so -C src liblzo ${STAGING_LIBDIR} + autotools_stage_all } diff --git a/packages/mdadm/mdadm.inc b/packages/mdadm/mdadm.inc index 977095c7ac..25a4a5ed1d 100644 --- a/packages/mdadm/mdadm.inc +++ b/packages/mdadm/mdadm.inc @@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2" inherit autotools +INHIBIT_AUTO_STAGE = "1" do_install() { export STRIP="" diff --git a/packages/mdadm/mdadm_1.12.0.bb b/packages/mdadm/mdadm_1.12.0.bb index 454c5d330f..f41b36fba9 100644 --- a/packages/mdadm/mdadm_1.12.0.bb +++ b/packages/mdadm/mdadm_1.12.0.bb @@ -1,4 +1,4 @@ include mdadm.inc -PR = "r1" +PR = "r2" SRC_URI += " file://build_flags.patch;patch=1 " diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 2cc8f5878b..c7410d2f0c 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -70,6 +70,7 @@ SLUGOS_PACKAGES = "\ iptables \ joe \ jpeg \ + klibc \ lcdproc \ less \ libao \ diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb index 3162fb50b3..a4818c286a 100644 --- a/packages/nail/nail_11.21.bb +++ b/packages/nail/nail_11.21.bb @@ -3,7 +3,7 @@ SECTION = "console/network" PRIORITY = "optional" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" DEPENDS = "openssl" -PR = "r1" +PR = "r2" LICENSE = "GPL" SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \ @@ -15,6 +15,8 @@ inherit autotools # EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes" +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${bindir} ${D}${mandir} ${D}${sysconfdir} install -m 0755 ${S}nail ${D}${bindir}/nail diff --git a/packages/nautilus/nautilus_2.12.2.bb b/packages/nautilus/nautilus_2.12.2.bb index c287dc7bd5..6828c78c79 100644 --- a/packages/nautilus/nautilus_2.12.2.bb +++ b/packages/nautilus/nautilus_2.12.2.bb @@ -13,3 +13,7 @@ PACKAGES += "libnautilus" FILES_${PN} = "/usr/bin/* /usr/libexec/* /usr/lib/bonobo/* /usr/share/* /etc/*" FILES_libnautilus = "/usr/lib/*.so*" + +do_stage() { +autotools_stage_all +} diff --git a/packages/ncftp/ncftp_3.1.9.bb b/packages/ncftp/ncftp_3.1.9.bb index 99673d8a97..d62b0ffeae 100644 --- a/packages/ncftp/ncftp_3.1.9.bb +++ b/packages/ncftp/ncftp_3.1.9.bb @@ -1,3 +1,4 @@ +PR = "r1" DESCRIPTION = "A sophisticated console ftp client" SECTION = "console/network" PRIORITY = "optional" @@ -11,6 +12,8 @@ do_configure_prepend () { install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4 } +INHIBIT_AUTO_STAGE = "1" + do_install () { install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index a95badd85f..0e2fefc51b 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "console/networking" MAINTAINER = "dyoung <dyoung@thestuffguy.com>" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ @@ -35,6 +35,8 @@ do_compile() { oe_runmake 'BUILD=1' } +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb index c3b1562e8d..fd38d372f6 100644 --- a/packages/openobex/openobex_1.0.1.bb +++ b/packages/openobex/openobex_1.0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The Openobex project aims to make an \ open source implementation of the Object Exchange \ (OBEX) protocol." SECTION = "libs" -PR = "r2" +PR = "r3" # put openobex-config into -dev package FILES_${PN} = "${libdir}/lib*.so.*" @@ -15,10 +15,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ inherit autotools binconfig do_stage () { - oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR} - ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so - install -d ${STAGING_INCDIR}/openobex - install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/ - install -d ${STAGING_DIR}/aclocal - install -m 0644 m4macros/openobex.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } diff --git a/packages/opensync/libopensync_0.18.bb b/packages/opensync/libopensync_0.18.bb index 002586caac..1b3f338e51 100644 --- a/packages/opensync/libopensync_0.18.bb +++ b/packages/opensync/libopensync_0.18.bb @@ -12,3 +12,8 @@ EXTRA_OECONF = "--disable-python" LEAD_SONAME = "libopensync.so" FILES_${PN} += " ${libdir}/opensync/formats/*.so" + +do_stage() { +autotools_stage_all +} + diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb index 4ad233c116..6977cbc5f1 100644 --- a/packages/pango/pango_1.10.2.bb +++ b/packages/pango/pango_1.10.2.bb @@ -23,6 +23,10 @@ FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*" LIBV = "1.4.0" +do_stage () { +autotools_stage_all +} + postinst_prologue() { if [ "x$D" != "x" ]; then exit 1 diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index cc1c60504b..3724f46f09 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -26,5 +26,9 @@ do_compile () { oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}" } +do_stage () { + autotools_stage_all +} + FILES_${PN} = "${libdir}/lib*.so*" FILES_${PN}-dev += "${bindir}" diff --git a/packages/poppler/poppler_0.4.3.bb b/packages/poppler/poppler_0.4.3.bb index 43148ca11e..ebe06c4015 100644 --- a/packages/poppler/poppler_0.4.3.bb +++ b/packages/poppler/poppler_0.4.3.bb @@ -8,3 +8,10 @@ SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" inherit pkgconfig autotools + + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb index 41af18ed58..e599c023dc 100644 --- a/packages/popt/popt_1.7.bb +++ b/packages/popt/popt_1.7.bb @@ -2,7 +2,7 @@ SECTION = "libs" DESCRIPTION = "The popt library exists essentially \ for parsing command line options." LICENSE = "MIT" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ file://m4.patch;patch=1 \ @@ -11,6 +11,5 @@ SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ inherit autotools do_stage () { - oe_libinstall -a -so libpopt ${STAGING_LIBDIR} - install -m 0644 popt.h ${STAGING_INCDIR}/ + autotools_stage_all } diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb index d82b673864..89c8dc4317 100644 --- a/packages/puppy/puppy_1.11.bb +++ b/packages/puppy/puppy_1.11.bb @@ -4,13 +4,15 @@ PRIORITY = "optional" MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" HOMEPAGE = "http://sf.net/projects/puppy/" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11" S = "${WORKDIR}/puppy" inherit autotools +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${bindir} install -m 0755 ${S}/puppy ${D}${bindir}/puppy diff --git a/packages/qof/qof_0.6.0.bb b/packages/qof/qof_0.6.0.bb index 9aed451f16..e43a7e4adf 100644 --- a/packages/qof/qof_0.6.0.bb +++ b/packages/qof/qof_0.6.0.bb @@ -11,3 +11,10 @@ FILES_${PN} += "/usr/share/xml" PARALLEL_MAKE="" inherit autotools pkgconfig + + +do_stage() { +autotools_stage_all +} + + diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb index a083b3d8fb..d0ff2a8d7c 100644 --- a/packages/readline/readline_4.3.bb +++ b/packages/readline/readline_4.3.bb @@ -22,6 +22,10 @@ do_configure () { autotools_do_configure } +do_stage() { + autotools_stage_all +} + do_install () { autotools_do_install # Make install doesn't properly install these diff --git a/packages/setpwc/setpwc_0.9.bb b/packages/setpwc/setpwc_0.9.bb index 595e2ab764..67904daf95 100644 --- a/packages/setpwc/setpwc_0.9.bb +++ b/packages/setpwc/setpwc_0.9.bb @@ -4,13 +4,15 @@ PRIORITY = "optional" MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" HOMEPAGE = "http://www.vanheusden.com/setpwc/" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://www.vanheusden.com/setpwc/setpwc-${PV}.tgz \ file://Makefile.patch;patch=1" inherit autotools +INHIBIT_AUTO_STAGE = "1" + do_install() { install -d ${D}${bindir} install -m 0755 ${S}/setpwc ${D}${bindir}/setpwc diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index acfa068cac..0f208da2df 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -3,7 +3,7 @@ MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ldflags.patch;patch=1 \ @@ -20,6 +20,8 @@ do_compile () { oe_runmake 'LDFLAGS=${LDFLAGS}' } +INHIBIT_AUTO_STAGE = "1" + do_install () { oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \ 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \ diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb index 10daab6714..664d313355 100644 --- a/packages/startup-notification/startup-notification_0.8.bb +++ b/packages/startup-notification/startup-notification_0.8.bb @@ -8,3 +8,7 @@ DEPENDS = "x11" inherit autotools pkgconfig SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.8.tar.gz" + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/sword/sword_1.5.8.bb b/packages/sword/sword_1.5.8.bb index df096e5425..8bb469295f 100644 --- a/packages/sword/sword_1.5.8.bb +++ b/packages/sword/sword_1.5.8.bb @@ -13,3 +13,7 @@ SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}. inherit autotools pkgconfig EXTRA_OECONF = "--without-clucene --with-curl" + +do_stage() { +autotools_stage_all +} diff --git a/packages/sysfsutils/sysfsutils_1.3.0.bb b/packages/sysfsutils/sysfsutils_1.3.0.bb index 82af8d353d..11e4ca7e9a 100644 --- a/packages/sysfsutils/sysfsutils_1.3.0.bb +++ b/packages/sysfsutils/sysfsutils_1.3.0.bb @@ -1,3 +1,4 @@ +PR = "r2" SECTION = "base" DESCRIPTION = "System Utilities Based on Sysfs" HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" diff --git a/packages/tilibs/libticables_3.9.2.bb b/packages/tilibs/libticables_3.9.2.bb index babe68b02b..ba8497ec60 100644 --- a/packages/tilibs/libticables_3.9.2.bb +++ b/packages/tilibs/libticables_3.9.2.bb @@ -5,3 +5,7 @@ HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html" SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/tilibs/libticalcs_4.5.9.bb b/packages/tilibs/libticalcs_4.5.9.bb index 2907af70f7..f106d0f364 100644 --- a/packages/tilibs/libticalcs_4.5.9.bb +++ b/packages/tilibs/libticalcs_4.5.9.bb @@ -7,3 +7,8 @@ DPENDS = "libticables libtifiles" SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + diff --git a/packages/tilibs/libtifiles_0.6.5.bb b/packages/tilibs/libtifiles_0.6.5.bb index babe68b02b..aa44094a61 100644 --- a/packages/tilibs/libtifiles_0.6.5.bb +++ b/packages/tilibs/libtifiles_0.6.5.bb @@ -5,3 +5,8 @@ HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html" SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz" inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index db8a1d13e5..c6c30a33de 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -26,6 +26,10 @@ EXTRA_OECONF = "--enable-shared" EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " +do_stage () { +autotools_stage_all +} + do_install_prepend () { install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf } @@ -34,7 +38,7 @@ do_install_append() { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ case ${MACHINE} in - h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270) + h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) install -d ${D}${datadir}/tslib for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ diff --git a/packages/vte/vte_0.11.15.bb b/packages/vte/vte_0.11.15.bb index 37f5e40f9d..5565f8c9c0 100644 --- a/packages/vte/vte_0.11.15.bb +++ b/packages/vte/vte_0.11.15.bb @@ -2,3 +2,8 @@ LICENSE = "LGPL" MAINTAINER = "Koen Kooi <koen@handhelds.org>" inherit gnome + + +do_stage() { +autotools_stage_all +} diff --git a/packages/wakelan/wakelan_1.1.bb b/packages/wakelan/wakelan_1.1.bb index 98b19c9e39..34b14c8a28 100644 --- a/packages/wakelan/wakelan_1.1.bb +++ b/packages/wakelan/wakelan_1.1.bb @@ -1,13 +1,15 @@ LICENSE = "GPL" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DESCRIPTION = "Wakelan sends a magic packet to wake up remote PC's" -PR = "r1" +PR = "r2" FILES = "${bindir}/wakelan" SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/misc/${PN}-${PV}.tar.gz" inherit autotools +INHIBIT_AUTO_STAGE = "1" + do_install () { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/${PN}-${PV}/wakelan ${D}${bindir}/wakelan diff --git a/packages/xau/xau_0.1.1.bb b/packages/xau/xau_0.1.1.bb index aa0a4b2c65..aa2c0ec858 100644 --- a/packages/xau/xau_0.1.1.bb +++ b/packages/xau/xau_0.1.1.bb @@ -11,3 +11,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ S = "${WORKDIR}/libXau-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xau/xau_cvs.bb b/packages/xau/xau_cvs.bb index e8686860bd..ca44359076 100644 --- a/packages/xau/xau_cvs.bb +++ b/packages/xau/xau_cvs.bb @@ -11,3 +11,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau" S = "${WORKDIR}/Xau" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/xaw/xaw_7.0.2.bb b/packages/xaw/xaw_7.0.2.bb index ee01f53a27..3515e0fac6 100644 --- a/packages/xaw/xaw_7.0.2.bb +++ b/packages/xaw/xaw_7.0.2.bb @@ -14,3 +14,7 @@ inherit autotools pkgconfig # FIXME: libXaw needs a full x11, not diet BROKEN = "1" + +do_stage () { + oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/xaw/xaw_cvs.bb b/packages/xaw/xaw_cvs.bb index 442e5e429d..4410372b26 100644 --- a/packages/xaw/xaw_cvs.bb +++ b/packages/xaw/xaw_cvs.bb @@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "xproto x11 xt xmu xpm" DESCRIPTION = "X Athena Widgets library" @@ -12,3 +13,7 @@ inherit autotools pkgconfig # FIXME: libXaw needs a full x11, not diet BROKEN = "1" + +do_stage () { + oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb index 7bcca2a8be..5436bf26b7 100644 --- a/packages/xcalibrate/xcalibrate_cvs.bb +++ b/packages/xcalibrate/xcalibrate_cvs.bb @@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@freedesktop.org>" DEPENDS = "x11 xcalibrateext xext" DESCRIPTION = "XCalibrate client-side library" @@ -9,3 +10,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrate S = "${WORKDIR}/XCalibrate" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xcalibrateext/xcalibrateext_cvs.bb b/packages/xcalibrateext/xcalibrateext_cvs.bb index 2f0feba2de..33cda47f39 100644 --- a/packages/xcalibrateext/xcalibrateext_cvs.bb +++ b/packages/xcalibrateext/xcalibrateext_cvs.bb @@ -1,9 +1,18 @@ PV = "0.0cvs${CVSDATE}" SECTION = "x11/libs" LICENSE = "BSD-X" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DESCRIPTION = "XCalibrate extension headers" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt" S = "${WORKDIR}/XCalibrateExt" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xcomposite/xcomposite_1.0.1.bb b/packages/xcomposite/xcomposite_1.0.1.bb index 3821b126fe..1e8d96ce2e 100644 --- a/packages/xcomposite/xcomposite_1.0.1.bb +++ b/packages/xcomposite/xcomposite_1.0.1.bb @@ -9,3 +9,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \ S = "${WORKDIR}/libXcomposite-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xcomposite/xcomposite_cvs.bb index ab72873234..8782dcb42c 100644 --- a/packages/xcomposite/xcomposite_cvs.bb +++ b/packages/xcomposite/xcomposite_cvs.bb @@ -8,3 +8,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite S = "${WORKDIR}/Xcomposite" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xdamage/xdamage_1.0.1.bb b/packages/xdamage/xdamage_1.0.1.bb index e1784e72f3..c8a41893e4 100644 --- a/packages/xdamage/xdamage_1.0.1.bb +++ b/packages/xdamage/xdamage_1.0.1.bb @@ -10,3 +10,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \ S = "${WORKDIR}/libXdamage-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xdamage/xdamage_cvs.bb b/packages/xdamage/xdamage_cvs.bb index de3335be39..f66188351b 100644 --- a/packages/xdamage/xdamage_cvs.bb +++ b/packages/xdamage/xdamage_cvs.bb @@ -9,3 +9,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \ S = "${WORKDIR}/Xdamage" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xdmcp/libxdmcp_0.1.1.bb b/packages/xdmcp/libxdmcp_0.1.1.bb index d310a39f59..5136d564b8 100644 --- a/packages/xdmcp/libxdmcp_0.1.1.bb +++ b/packages/xdmcp/libxdmcp_0.1.1.bb @@ -12,3 +12,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xdmcp/libxdmcp_0.1.3.bb b/packages/xdmcp/libxdmcp_0.1.3.bb index e1acf769bd..60d74e9f0e 100644 --- a/packages/xdmcp/libxdmcp_0.1.3.bb +++ b/packages/xdmcp/libxdmcp_0.1.3.bb @@ -12,3 +12,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xdmcp/libxdmcp_cvs.bb index 08f37baa15..51aa252cf5 100644 --- a/packages/xdmcp/libxdmcp_cvs.bb +++ b/packages/xdmcp/libxdmcp_cvs.bb @@ -12,3 +12,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp" S = "${WORKDIR}/Xdmcp" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xext/xext_cvs.bb b/packages/xext/xext_cvs.bb index 38d962f87a..e9f330120f 100644 --- a/packages/xext/xext_cvs.bb +++ b/packages/xext/xext_cvs.bb @@ -10,3 +10,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext" S = "${WORKDIR}/Xext" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/xextensions/xextensions_1.0.1.bb b/packages/xextensions/xextensions_1.0.1.bb index ab1facdfc9..233d0c33b9 100644 --- a/packages/xextensions/xextensions_1.0.1.bb +++ b/packages/xextensions/xextensions_1.0.1.bb @@ -7,3 +7,11 @@ SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2" S = "${WORKDIR}/xextensions-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb index 2925ffac9b..ded1379938 100644 --- a/packages/xextensions/xextensions_20050610.bb +++ b/packages/xextensions/xextensions_20050610.bb @@ -10,3 +10,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtension S = "${WORKDIR}/XExtensions" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb index 3cd52f8d11..3fde3cd338 100644 --- a/packages/xextensions/xextensions_cvs.bb +++ b/packages/xextensions/xextensions_cvs.bb @@ -8,3 +8,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtension S = "${WORKDIR}/XExtensions" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xfont/xfont_1.4.2.bb b/packages/xfont/xfont_1.4.2.bb index 0d0b7bd872..9f8720749a 100644 --- a/packages/xfont/xfont_1.4.2.bb +++ b/packages/xfont/xfont_1.4.2.bb @@ -12,3 +12,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ S = "${WORKDIR}/libXfont-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xfont/xfont_cvs.bb b/packages/xfont/xfont_cvs.bb index 42ba799bb2..dac69e2e2c 100644 --- a/packages/xfont/xfont_cvs.bb +++ b/packages/xfont/xfont_cvs.bb @@ -11,3 +11,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont \ S = "${WORKDIR}/Xfont" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb index 9f8a6235c1..114bd106ae 100644 --- a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb +++ b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb @@ -9,3 +9,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama;d S = "${WORKDIR}/Xinerama" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/xinerama/xinerama_1.0.2.bb b/packages/xinerama/xinerama_1.0.2.bb index 7c6a819b7f..99cdf12853 100644 --- a/packages/xinerama/xinerama_1.0.2.bb +++ b/packages/xinerama/xinerama_1.0.2.bb @@ -10,3 +10,12 @@ SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2" S = "${WORKDIR}/libXinerama-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xinerama/xinerama_cvs.bb index f521f572cf..6846a38600 100644 --- a/packages/xinerama/xinerama_cvs.bb +++ b/packages/xinerama/xinerama_cvs.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Xinerama library" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "panoramixext xproto x11 xext" PV = "0.0cvs${CVSDATE}" @@ -9,3 +10,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama" S = "${WORKDIR}/Xinerama" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/man +} diff --git a/packages/xinetd/xinetd_2.3.13.bb b/packages/xinetd/xinetd_2.3.13.bb index b0643c7d76..699667cb26 100644 --- a/packages/xinetd/xinetd_2.3.13.bb +++ b/packages/xinetd/xinetd_2.3.13.bb @@ -1,7 +1,7 @@ DEPENDS = "" DESCRIPTION = "Highly configurable, modular and secure inetd" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" -PR="r2" +PR="r3" SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd.init \ @@ -21,6 +21,8 @@ do_configure() { oe_runconf } +INHIBIT_AUTO_STAGE = "1" + do_install() { # Same here, the Makefile does some really stupid things, # but since we only want two files why not override diff --git a/packages/xmu/xmu_cvs.bb b/packages/xmu/xmu_cvs.bb index 354e5de182..c7e5f84617 100644 --- a/packages/xmu/xmu_cvs.bb +++ b/packages/xmu/xmu_cvs.bb @@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "xt xext" PR = "r2" @@ -14,3 +15,7 @@ FILES_xmuu = "${libdir}/libXmuu.so.*" FILES_xmuu-dev = "${libdir}/libXmuu.so" inherit autotools pkgconfig + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xproto/xproto_6.6.2+cvs20050226.bb index dac9cf8f21..33241b3d0d 100644 --- a/packages/xproto/xproto_6.6.2+cvs20050226.bb +++ b/packages/xproto/xproto_6.6.2+cvs20050226.bb @@ -7,3 +7,12 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto;dat S = "${WORKDIR}/Xproto" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + mandir=${STAGING_DATADIR}/man \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xproto/xproto_6.6.2.bb b/packages/xproto/xproto_6.6.2.bb index ee332f104c..b982144485 100644 --- a/packages/xproto/xproto_6.6.2.bb +++ b/packages/xproto/xproto_6.6.2.bb @@ -7,3 +7,11 @@ SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz" S = "${WORKDIR}/xproto-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xproto/xproto_cvs.bb b/packages/xproto/xproto_cvs.bb index 06a139f212..00bfb15d5b 100644 --- a/packages/xproto/xproto_cvs.bb +++ b/packages/xproto/xproto_cvs.bb @@ -8,3 +8,13 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto" S = "${WORKDIR}/Xproto" inherit autotools pkgconfig + + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/xres/xres_1.0.1.bb b/packages/xres/xres_1.0.1.bb index 8d94af1a08..0de731f98d 100644 --- a/packages/xres/xres_1.0.1.bb +++ b/packages/xres/xres_1.0.1.bb @@ -7,3 +7,11 @@ SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2" S = "${WORKDIR}/libXres-${PV}" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xres/xres_cvs.bb b/packages/xres/xres_cvs.bb index 0b3725405d..c5fe3b0131 100644 --- a/packages/xres/xres_cvs.bb +++ b/packages/xres/xres_cvs.bb @@ -8,3 +8,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XRes" S = "${WORKDIR}/XRes" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xt/xt_0.1.5.bb b/packages/xt/xt_0.1.5.bb index f648b7aa4e..1d0d79458a 100644 --- a/packages/xt/xt_0.1.5.bb +++ b/packages/xt/xt_0.1.5.bb @@ -22,3 +22,7 @@ do_compile() { ) oe_runmake } + +do_stage () { + oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb index bdc9657ecb..6b611c3c9f 100644 --- a/packages/xt/xt_cvs.bb +++ b/packages/xt/xt_cvs.bb @@ -1,6 +1,7 @@ PV = "0.0cvs${CVSDATE}" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "x11 libsm" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" @@ -18,3 +19,14 @@ do_compile() { ) oe_runmake } + + +do_stage () { + oe_runmake install \ + DESTDIR="" \ + prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + mandir=${STAGING_DATADIR}/man +} diff --git a/packages/xtrans/xtrans_0.1.bb b/packages/xtrans/xtrans_0.1.bb index 41a496bb5e..67bd3a2f38 100644 --- a/packages/xtrans/xtrans_0.1.bb +++ b/packages/xtrans/xtrans_0.1.bb @@ -10,3 +10,10 @@ S = "${WORKDIR}/libXtrans-${PV}" inherit autotools pkgconfig +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xtrans/xtrans_cvs.bb index 9a46f77b0d..fbad3f023c 100644 --- a/packages/xtrans/xtrans_cvs.bb +++ b/packages/xtrans/xtrans_cvs.bb @@ -10,3 +10,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xtrans" S = "${WORKDIR}/xtrans" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb index 38f364e7b0..29119dfe8e 100644 --- a/packages/xtst/xtst_cvs.bb +++ b/packages/xtst/xtst_cvs.bb @@ -2,6 +2,7 @@ LICENSE = "GPL" PV = "0.0cvs${CVSDATE}" SECTION = "x11/libs" PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "x11 recordext xext" DESCRIPTION = "X Test Extension: client side library" PR = "r3" @@ -10,3 +11,11 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst" S = "${WORKDIR}/Xtst" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/xxf86dgaext/xxf86dgaext_cvs.bb index 0ca3839745..1e69cfab0f 100644 --- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb +++ b/packages/xxf86dgaext/xxf86dgaext_cvs.bb @@ -1,9 +1,18 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "Xorg" SECTION = "x11/libs" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DESCRIPTION = "Xxf86dga extension headers" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86DGAExt" S = "${WORKDIR}/XF86DGAExt" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/xxf86vmext/xxf86vmext_cvs.bb index de9b6d3f14..17048b344f 100644 --- a/packages/xxf86vmext/xxf86vmext_cvs.bb +++ b/packages/xxf86vmext/xxf86vmext_cvs.bb @@ -1,9 +1,18 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" SECTION = "x11/libs" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" DESCRIPTION = "Xxf86vm extension headers" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86VMExt" S = "${WORKDIR}/XF86VMExt" inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} |