From 2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 9 May 2004 03:00:50 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 23:00:41-04:00 local!kergoth Upgrade the alsa packages to 1.0.4. 2004/05/08 22:17:13-04:00 local!kergoth Fix compile error with adns, resulting from a function definition not matching the declaration. 2004/05/08 18:00:51-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:20-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:15-04:00 local!kergoth Fixing up the libtool-native/libtool-cross mess. 2004/05/08 13:59:04-04:00 local!kergoth Bugfix in ncurses usage of oe_libinstall. 2004/05/07 21:46:16-04:00 local!kergoth Merge 2004/05/07 21:45:26-04:00 local!kergoth Adapt some .oe's to use oe_libinstall. BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ --- adns/adns-1.0/fixparsedomainflags.patch | 0 adns/adns_1.0.oe | 7 ++-- alsa-lib/alsa-lib_0.9.8.oe | 20 --------- alsa-lib/alsa-lib_1.0.4.oe | 0 alsa-oss/alsa-oss-0.9.8/configure.patch | 0 alsa-oss/alsa-oss-0.9.8/m4.patch | 0 alsa-oss/alsa-oss-1.0.4/configure.patch | 0 alsa-oss/alsa-oss-1.0.4/m4.patch | 0 alsa-oss/alsa-oss_0.9.8.oe | 20 --------- alsa-oss/alsa-oss_1.0.4.oe | 0 alsa-utils/alsa-utils-0.9.8/autotools.patch | 0 alsa-utils/alsa-utils-0.9.8/m4.patch | 0 alsa-utils/alsa-utils_0.9.8.oe | 10 ----- alsa-utils/alsa-utils_1.0.4.oe | 0 apmd/apmd_3.2.0.oe | 4 +- atk/atk_1.2.0.oe | 6 +-- audiofile/audiofile_0.2.6.oe | 4 +- bluez-libs/bluez-libs_2.4.oe | 4 +- bluez-sdp/bluez-sdp_1.5.oe | 4 +- bzip2/bzip2_1.0.2.oe | 7 +--- clucene/clucene_0.8.9.oe | 20 +++++++++ curl/curl_7.10.8.oe | 4 +- curl/curl_7.11.0.oe | 4 +- cyrus-sasl/cyrus-sasl_2.1.17.oe | 4 +- cyrus-sasl/cyrus-sasl_2.1.18.oe | 4 +- dbus/dbus_0.20.oe | 10 +---- dbus/dbus_0.21.oe | 10 +---- esound/esound-gpe_cvs.oe | 9 ++++ expat/expat_1.95.6.oe | 2 +- expat/expat_1.95.7.oe | 2 +- fakeroot/fakeroot-native_0.9.0.oe | 3 +- fam/fam_2.6.10.oe | 4 +- fam/fam_2.7.0.oe | 4 +- flexis-zaurus/flexis-zaurus_1.0.0.oe | 18 ++++++++ fontconfig/fontconfig_2.2.92.oe | 5 +-- freetype/freetype-native_2.1.7.oe | 5 +-- freetype/freetype_2.1.7.oe | 4 +- gdbm/gdbm_1.8.3.oe | 4 +- glib-2.0/glib-2.0-native_2.2.3.oe | 18 ++------ glib-2.0/glib-2.0_2.2.3.oe | 17 ++------ gmp/gmp_4.1.2.oe | 3 +- gpm/gpm_1.20.1.oe | 3 +- gsl/gsl_1.4.oe | 4 +- gtk+/gtk+_2.2.4.oe | 20 ++------- ipkg/ipkg_0.99.121.oe | 2 +- irk/irk_0.11.0.oe | 2 +- jpeg/jpeg_6b.oe | 2 +- klimt/klimt_0.6.1.oe | 3 +- korganizer/korganizer-embedded_1.5.0.oe | 13 +++--- korganizer/korganizer-embedded_1.7.0.oe | 27 ++++++------ korganizer/korganizer-embedded_1.7.5.oe | 53 ++++++++++++++++++++++++ libao/libao_0.8.4.oe | 4 +- libdaemon/libdaemon_0.3.oe | 4 +- libdisplaymigration/libdisplaymigration_0.28.oe | 2 +- libdotdesktop/libdotdesktop_0.11.oe | 23 ++++++++++ libesmtp/libesmtp_1.0.1.oe | 4 +- libeventdb/libeventdb_0.15.oe | 2 +- libgcrypt/libgcrypt_1.1.91.oe | 4 +- libglade/libglade_2.0.1.oe | 5 +-- libgpepimc/libgpepimc_0.2.oe | 2 +- libgpepimc/libgpepimc_0.3.oe | 25 +++++++++++ libgpevtype/libgpevtype_0.3.oe | 2 +- libgpewidget/libgpewidget_0.78.oe | 2 +- libgpg-error/libgpg-error_0.6.oe | 3 +- libgpg-error/libgpg-error_0.7.oe | 4 +- libid3tag/libid3tag_0.15.0b.oe | 2 +- libmad/libmad_0.15.0b.oe | 3 +- libmatchbox/libmatchbox_1.1.oe | 5 +-- libmatchbox/libmatchbox_1.2.oe | 7 +--- libmikey/libmikey_0.1a.oe | 21 ++++++++++ libmikmod/libmikmod_3.1.11.oe | 5 +-- libmikmod/libmikmod_3.2.0-beta2.oe | 4 +- libmimedir/libmimedir_0.0-20040307.oe | 6 +-- libogg/libogg_1.0.oe | 4 +- libogg/libogg_1.1.oe | 4 +- liboop/liboop_1.0.oe | 4 +- libopie/libopie2_cvs.oe | 13 +++--- libpcap/libpcap_0.7.2.oe | 3 +- libpcap/libpcap_0.8.1.oe | 3 +- libpcap/libpcap_0.8.3.oe | 29 +++++++++++++ libpng/libpng_1.2.5.oe | 5 +-- libqpe/libqpe-opie_cvs.oe | 5 +-- libqtaux/libqtaux2_cvs.oe | 3 +- libschedule/libschedule_0.13.oe | 25 +++++++++++ libsdl/libsdl-image_1.2.3.oe | 4 +- libsdl/libsdl-mixer_1.2.5.oe | 4 +- libsdl/libsdl-net_1.2.5.oe | 4 +- libsdl/libsdl-qpe_1.2.7.oe | 4 +- libsdl/libsdl-ttf_2.0.3.oe | 4 +- libsdl/libsdl-x11_1.2.7.oe | 4 +- libsidplay/libsidplay_1.36.57.oe | 2 +- libsigc++/libsigc++_1.2.5.oe | 3 +- libtododb/libtododb_0.07.oe | 2 +- libtool/libtool-cross_1.5.oe | 29 ++++--------- libtool/libtool-native_1.5.oe | 8 +--- libusb/libusb_0.1.7.oe | 6 +-- libvorbis/libvorbis_1.0.1.oe | 14 ++----- libxine/libxine_1.0.0-beta12.oe | 16 +++---- libxml/libxml2_2.6.7.oe | 5 +-- libxsettings-client/libxsettings-client0_0.12.oe | 24 +++++++++++ libxsettings/libxsettings_0.11.oe | 25 +++++++++++ lirc/lirc_0.6.6.oe | 2 +- lzo/lzo_1.08.oe | 3 +- ncurses/ncurses_5.3.oe | 2 +- ncurses/ncurses_5.4.oe | 4 +- openjade/openjade-native_1.3.2.oe | 13 ++---- openjade/openjade_1.3.2.oe | 13 ++---- openobex/openobex_1.0.1.oe | 6 +-- opensp/opensp-native_1.5.oe | 4 +- opensp/opensp_1.5.oe | 4 +- openssl/openssl_0.9.7b.oe | 4 +- openssl/openssl_0.9.7c.oe | 6 +-- openssl/openssl_0.9.7d.oe | 45 ++++++++++++++++++++ opie-camera/opie-camera_1.0.1.oe | 4 +- opie-ftplib/opie-ftplib_cvs.oe | 7 ++-- pango/pango_1.2.5.oe | 5 +-- pcre/pcre_4.4.oe | 9 +--- pme/pme_1.0.3.oe | 4 +- popt/popt_1.7.oe | 4 +- portaudio/portaudio_0.0.19.oe | 2 +- pth/pth_2.0.0.oe | 2 +- python/python-pyqt_3.11.oe | 4 +- python/python-pyqwt_3.10.oe | 2 +- qplot/qplot_2.0.1cvs.oe | 15 ++++--- qte/qte_2.3.7.oe | 4 +- qte/qte_2.3.8-snap.oe | 5 +-- qwt/qwt_4.2.0rc1.oe | 4 +- readline/readline_4.3.oe | 4 +- slang/slang_1.4.9.oe | 4 +- slotsig/slotsig_0.4.oe | 6 +-- smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe | 8 ++-- sqlite/sqlite_2.8.9.oe | 2 +- subapplet/subapplet_1.0.8.oe | 19 +++++++++ sword/sword_1.5.7.oe | 23 ++++++++++ t1lib/t1lib_5.0.0.oe | 3 +- t1lib/t1lib_5.0.1.oe | 3 +- tslib/tslib.oe | 2 +- x11/x11-cvs.oe | 6 +-- xmms-embedded/xmms-embedded_20040327.oe | 12 +++--- xpm/xpm-cvs.oe | 4 +- zlib/zlib_1.1.4.oe | 3 +- zziplib/zziplib_0.10.82.oe | 8 ++-- 142 files changed, 577 insertions(+), 471 deletions(-) create mode 100644 adns/adns-1.0/fixparsedomainflags.patch delete mode 100644 alsa-lib/alsa-lib_0.9.8.oe create mode 100644 alsa-lib/alsa-lib_1.0.4.oe delete mode 100644 alsa-oss/alsa-oss-0.9.8/configure.patch delete mode 100644 alsa-oss/alsa-oss-0.9.8/m4.patch create mode 100644 alsa-oss/alsa-oss-1.0.4/configure.patch create mode 100644 alsa-oss/alsa-oss-1.0.4/m4.patch delete mode 100644 alsa-oss/alsa-oss_0.9.8.oe create mode 100644 alsa-oss/alsa-oss_1.0.4.oe delete mode 100644 alsa-utils/alsa-utils-0.9.8/autotools.patch delete mode 100644 alsa-utils/alsa-utils-0.9.8/m4.patch delete mode 100644 alsa-utils/alsa-utils_0.9.8.oe create mode 100644 alsa-utils/alsa-utils_1.0.4.oe diff --git a/adns/adns-1.0/fixparsedomainflags.patch b/adns/adns-1.0/fixparsedomainflags.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/adns/adns_1.0.oe b/adns/adns_1.0.oe index e6b2da2269..d541b23605 100644 --- a/adns/adns_1.0.oe +++ b/adns/adns_1.0.oe @@ -2,7 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "An advanced alternative, asynchronous resolver." SRC_URI = "ftp://ftp.gnu.org/gnu/adns/adns-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://${FILESDIR}/configure.patch;patch=1 \ + file://${FILESDIR}/fixparsedomainflags.patch;patch=1" inherit autotools @@ -15,8 +16,8 @@ do_configure_prepend () { do_stage () { install -m 0644 ${S}/src/adns.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/src/libadns.a ${STAGING_LIBDIR}/ - oe_soinstall dynamic/libadns.so.1.0 ${STAGING_LIBDIR}/ + oe_libinstall -so -C dynamic libadns ${STAGING_LIBDIR}/ + oe_libinstall -a -C src libadns ${STAGING_LIBDIR}/ } do_install () { diff --git a/alsa-lib/alsa-lib_0.9.8.oe b/alsa-lib/alsa-lib_0.9.8.oe deleted file mode 100644 index 8b9f24cba3..0000000000 --- a/alsa-lib/alsa-lib_0.9.8.oe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Alsa sound library" -MAINTAINER = "Lorn Potter " -LICENSE = "GPL" -DEPENDS = "virtual/libc" -FILES_alsa-lib_append = " ${datadir}/alsa" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" - -inherit autotools libtool pkgconfig - -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes" - -do_stage () { - oe_soinstall src/.libs/libasound.so.2.0.0 ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libasound.lai ${STAGING_LIBDIR}/libasound.la - install -m 0644 src/.libs/libasound.a ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/alsa/sound - install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ - install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ -} diff --git a/alsa-lib/alsa-lib_1.0.4.oe b/alsa-lib/alsa-lib_1.0.4.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alsa-oss/alsa-oss-0.9.8/configure.patch b/alsa-oss/alsa-oss-0.9.8/configure.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/alsa-oss/alsa-oss-0.9.8/m4.patch b/alsa-oss/alsa-oss-0.9.8/m4.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/alsa-oss/alsa-oss-1.0.4/configure.patch b/alsa-oss/alsa-oss-1.0.4/configure.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alsa-oss/alsa-oss-1.0.4/m4.patch b/alsa-oss/alsa-oss-1.0.4/m4.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alsa-oss/alsa-oss_0.9.8.oe b/alsa-oss/alsa-oss_0.9.8.oe deleted file mode 100644 index b42575754d..0000000000 --- a/alsa-oss/alsa-oss_0.9.8.oe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Alsa OSS Compatibility Package" -MAINTAINER = "Lorn Potter " -LICENSE = "GPL" -DEPENDS = "virtual/libc alsa-lib" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" - -inherit autotools libtool - -do_configure_prepend () { - touch NEWS README AUTHORS ChangeLog -} - -do_stage () { - oe_soinstall .libs/libaoss.so.0.0.0 ${STAGING_LIBDIR}/ - install -m 0644 .libs/libaoss.a ${STAGING_LIBDIR}/ - install -m 0644 .libs/libaoss.lai ${STAGING_LIBDIR}/libaoss.la -} diff --git a/alsa-oss/alsa-oss_1.0.4.oe b/alsa-oss/alsa-oss_1.0.4.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/alsa-utils/alsa-utils-0.9.8/autotools.patch b/alsa-utils/alsa-utils-0.9.8/autotools.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/alsa-utils/alsa-utils-0.9.8/m4.patch b/alsa-utils/alsa-utils-0.9.8/m4.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/alsa-utils/alsa-utils_0.9.8.oe b/alsa-utils/alsa-utils_0.9.8.oe deleted file mode 100644 index 3f17d95325..0000000000 --- a/alsa-utils/alsa-utils_0.9.8.oe +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Alsa Utilities" -MAINTAINER = "Lorn Potter " -LICENSE = "GPL" -DEPENDS = "virtual/libc" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://${FILESDIR}/autotools.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" - -inherit autotools diff --git a/alsa-utils/alsa-utils_1.0.4.oe b/alsa-utils/alsa-utils_1.0.4.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe index 3ea18fcbbc..9b0df16523 100644 --- a/apmd/apmd_3.2.0.oe +++ b/apmd/apmd_3.2.0.oe @@ -26,7 +26,7 @@ do_compile() { } do_stage() { - oe_soinstall .libs/libapm.so.1.0.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libapm ${STAGING_LIBDIR} } do_install() { @@ -50,7 +50,7 @@ do_install() { install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/ install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/ install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd - oe_soinstall .libs/libapm.so.1.0.0 ${D}/${libdir}/ + oe_libinstall -so libapm ${D}/${libdir} cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd chmod 755 ${D}/${sysconfdir}/init.d/apmd diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe index 7cee3c4dd5..9768d9e5c8 100644 --- a/atk/atk_1.2.0.oe +++ b/atk/atk_1.2.0.oe @@ -10,12 +10,10 @@ EXTRA_OECONF = "--disable-glibtest" CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" + -I${STAGING_INCDIR}/glib-2.0/gobject" do_stage () { - oe_soinstall atk/.libs/libatk-1.0.so.0.200.0 ${STAGING_LIBDIR}/ - install -m 0755 atk/.libs/libatk-1.0.lai ${STAGING_LIBDIR}/libatk-1.0.la - install -m 0755 atk/.libs/libatk-1.0.a ${STAGING_LIBDIR}/ + oe_libinstall -so -a -C atk libatk-1.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/atk install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h diff --git a/audiofile/audiofile_0.2.6.oe b/audiofile/audiofile_0.2.6.oe index c81966e5ca..f18a421a40 100644 --- a/audiofile/audiofile_0.2.6.oe +++ b/audiofile/audiofile_0.2.6.oe @@ -13,9 +13,7 @@ inherit autotools libtool pkgconfig do_stage () { install -m 0644 libaudiofile/audiofile.h libaudiofile/aupvlist.h libaudiofile/af_vfs.h ${STAGING_INCDIR}/ - oe_soinstall libaudiofile/.libs/libaudiofile.so.0.0.2 ${STAGING_LIBDIR}/ - install -m 0644 libaudiofile/.libs/libaudiofile.a ${STAGING_LIBDIR}/libaudiofile.a - install -m 0644 libaudiofile/.libs/libaudiofile.lai ${STAGING_LIBDIR}/libaudiofile.la + oe_libinstall -C libaudiofile libaudiofile ${STAGING_LIBDIR} cat audiofile-config | sed -e "s,/usr/include,${STAGING_INCDIR},g; \ s,/usr/lib,${STAGING_LIBDIR},g; \ s,/usr/bin,${STAGING_BINDIR},g; \ diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe index cf1fa66d1b..bda4c084b2 100644 --- a/bluez-libs/bluez-libs_2.4.oe +++ b/bluez-libs/bluez-libs_2.4.oe @@ -10,9 +10,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" inherit autotools libtool do_stage () { - install -m 0644 src/.libs/libbluetooth.a ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libbluetooth.lai ${STAGING_LIBDIR}/libbluetooth.la - oe_soinstall src/.libs/libbluetooth.so.1.0.2 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/bluetooth for X in bluetooth.h hci.h hci_lib.h hci_uart.h hci_vhci.h l2cap.h \ diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe index f857632655..a5c9b9701b 100644 --- a/bluez-sdp/bluez-sdp_1.5.oe +++ b/bluez-sdp/bluez-sdp_1.5.oe @@ -13,9 +13,7 @@ LDFLAGS_prepend = "-L${S}/libs " inherit autotools libtool do_stage () { - install -m 0644 libs/.libs/libsdp.a ${STAGING_LIBDIR}/ - install -m 0644 libs/.libs/libsdp.lai ${STAGING_LIBDIR}/libsdp.la - oe_soinstall libs/.libs/libsdp.so.2.0.1 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C libs libsdp ${STAGING_LIBDIR} for X in sdp.h sdp_lib.h do diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe index db0c6e9652..8efb839d14 100644 --- a/bzip2/bzip2_1.0.2.oe +++ b/bzip2/bzip2_1.0.2.oe @@ -15,14 +15,11 @@ do_compile () { } do_stage () { - install -m 0644 libbz2.a ${STAGING_LIBDIR}/ install -m 0644 bzlib.h ${STAGING_INCDIR}/ - oe_soinstall libbz2.so.1.0.2 ${STAGING_LIBDIR}/ + oe_libinstall -a -so libbz2 ${STAGING_LIBDIR} } do_install () { oe_runmake 'DESTDIR=${D}' install - install -d ${D}/${libdir} - oe_soinstall libbz2.so.1.0.2 ${D}/${libdir}/ - install -m 0644 libbz2.a ${D}/${libdir}/ + oe_libinstall -a -so libbz2 ${D}/${libdir} } diff --git a/clucene/clucene_0.8.9.oe b/clucene/clucene_0.8.9.oe index e69de29bb2..d2cf9c0237 100644 --- a/clucene/clucene_0.8.9.oe +++ b/clucene/clucene_0.8.9.oe @@ -0,0 +1,20 @@ +DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libc" + +SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-${PV}-src.tar.gz" +S = "${WORKDIR}/" + +inherit autotools libtool + +do_stage() { + oe_libinstall -C src libclucene ${STAGING_LIBDIR} + cd src + headers=`find CLucene -name "*.h"` + for f in $headers + do + install -d ${STAGING_INCDIR}/`dirname $f` + install -m 0644 $f ${STAGING_INCDIR}/$f + done +} diff --git a/curl/curl_7.10.8.oe b/curl/curl_7.10.8.oe index d06208eaf2..6e02b39d58 100644 --- a/curl/curl_7.10.8.oe +++ b/curl/curl_7.10.8.oe @@ -12,9 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ do_stage () { install -d ${STAGING_INCDIR}/curl install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_soinstall lib/.libs/libcurl.so.2.0.2 ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.a ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.lai ${STAGING_LIBDIR}/libcurl.la + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \ | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config diff --git a/curl/curl_7.11.0.oe b/curl/curl_7.11.0.oe index 0bbd7a57b9..9b162a96bf 100644 --- a/curl/curl_7.11.0.oe +++ b/curl/curl_7.11.0.oe @@ -12,9 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ do_stage () { install -d ${STAGING_INCDIR}/curl install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_soinstall lib/.libs/libcurl.so.2.0.2 ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.a ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.lai ${STAGING_LIBDIR}/libcurl.la + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \ | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe index efb166e4a3..e0fa2ffe03 100644 --- a/cyrus-sasl/cyrus-sasl_2.1.17.oe +++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe @@ -25,9 +25,7 @@ do_compile_prepend () { } do_stage () { - install -m 0644 lib/.libs/libsasl2.lai ${STAGING_LIBDIR}/libsasl2.la - install -m 0644 lib/.libs/libsasl2.a ${STAGING_LIBDIR}/libsasl2.a - oe_soinstall lib/.libs/libsasl2.so.2.0.18 ${STAGING_LIBDIR}/ + oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR} install -d ${STAGING_LIBDIR}/sasl install -d ${STAGING_INCDIR}/sasl install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/ diff --git a/cyrus-sasl/cyrus-sasl_2.1.18.oe b/cyrus-sasl/cyrus-sasl_2.1.18.oe index 3625e0e6f5..1bf653d224 100644 --- a/cyrus-sasl/cyrus-sasl_2.1.18.oe +++ b/cyrus-sasl/cyrus-sasl_2.1.18.oe @@ -24,9 +24,7 @@ do_compile_prepend () { } do_stage () { - install -m 0644 lib/.libs/libsasl2.lai ${STAGING_LIBDIR}/libsasl2.la - install -m 0644 lib/.libs/libsasl2.a ${STAGING_LIBDIR}/libsasl2.a - oe_soinstall lib/.libs/libsasl2.so.2.0.18 ${STAGING_LIBDIR}/ + oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR} install -d ${STAGING_LIBDIR}/sasl install -d ${STAGING_INCDIR}/sasl install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/ diff --git a/dbus/dbus_0.20.oe b/dbus/dbus_0.20.oe index 8bf7a28d30..a40122b4af 100644 --- a/dbus/dbus_0.20.oe +++ b/dbus/dbus_0.20.oe @@ -13,15 +13,9 @@ EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \ headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h" -libname = "libdbus-1.so.0.0.0" -glibname = "libdbus-glib-1.so.0.0.0" - do_stage () { - oe_soinstall dbus/.libs/${libname} ${STAGING_LIBDIR}/ - install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/ - - oe_soinstall glib/.libs/${glibname} ${STAGING_LIBDIR}/ - install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/ + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus for i in ${headers}; do diff --git a/dbus/dbus_0.21.oe b/dbus/dbus_0.21.oe index 8bf7a28d30..a40122b4af 100644 --- a/dbus/dbus_0.21.oe +++ b/dbus/dbus_0.21.oe @@ -13,15 +13,9 @@ EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \ headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h" -libname = "libdbus-1.so.0.0.0" -glibname = "libdbus-glib-1.so.0.0.0" - do_stage () { - oe_soinstall dbus/.libs/${libname} ${STAGING_LIBDIR}/ - install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/ - - oe_soinstall glib/.libs/${glibname} ${STAGING_LIBDIR}/ - install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/ + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus for i in ${headers}; do diff --git a/esound/esound-gpe_cvs.oe b/esound/esound-gpe_cvs.oe index e69de29bb2..313e80350c 100644 --- a/esound/esound-gpe_cvs.oe +++ b/esound/esound-gpe_cvs.oe @@ -0,0 +1,9 @@ +SRC_URI = "cvs://anoncvs@cvs.handhelds.org/cvs;module=gpe/base/esound" +S = "${WORKDIR}/esound" + +inherit autotools libtool + +do_stage () { + install -m 0644 esd.h ${STAGING_INCDIR}/esd.h + oe_libinstall -so libesd ${STAGING_LIBDIR} +} diff --git a/expat/expat_1.95.6.oe b/expat/expat_1.95.6.oe index 9562239fe1..ae13e5da14 100644 --- a/expat/expat_1.95.6.oe +++ b/expat/expat_1.95.6.oe @@ -9,7 +9,7 @@ export LTCC = "${CC}" do_stage () { install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/ - oe_soinstall .libs/libexpat.so.0.4.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libexpat ${STAGING_LIBDIR}/ } do_install () { diff --git a/expat/expat_1.95.7.oe b/expat/expat_1.95.7.oe index 546d151d86..b3e8125ca7 100644 --- a/expat/expat_1.95.7.oe +++ b/expat/expat_1.95.7.oe @@ -9,7 +9,7 @@ export LTCC = "${CC}" do_stage () { install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/ - oe_soinstall .libs/libexpat.so.0.5.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libexpat ${STAGING_LIBDIR} } do_install () { diff --git a/fakeroot/fakeroot-native_0.9.0.oe b/fakeroot/fakeroot-native_0.9.0.oe index a1b91282ef..256f8212b2 100644 --- a/fakeroot/fakeroot-native_0.9.0.oe +++ b/fakeroot/fakeroot-native_0.9.0.oe @@ -6,6 +6,5 @@ S = ${WORKDIR}/fakeroot-${PV} EXTRA_OECONF = "--program-prefix= " do_stage_append () { - install -d ${STAGING_LIBDIR}/libfakeroot - oe_soinstall ${S}/.libs/libfakeroot.so.0.0.1 ${STAGING_LIBDIR}/libfakeroot + oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ } diff --git a/fam/fam_2.6.10.oe b/fam/fam_2.6.10.oe index 203181cc28..3dbcfd43c3 100644 --- a/fam/fam_2.6.10.oe +++ b/fam/fam_2.6.10.oe @@ -11,9 +11,7 @@ inherit autotools libtool CPPFLAGS_append = " -DNDEBUG" do_stage() { - oe_soinstall libfam/.libs/libfam.so.0.0.0 ${STAGING_LIBDIR}/ - install -m 0644 libfam/.libs/libfam.a ${STAGING_LIBDIR}/libfam.a - install -m 0644 libfam/.libs/libfam.lai ${STAGING_LIBDIR}/libfam.la + oe_libinstall -so -a -C libfam libfam ${STAGING_LIBDIR}/ install -m 0644 ${S}/include/fam.h ${STAGING_INCDIR}/ } diff --git a/fam/fam_2.7.0.oe b/fam/fam_2.7.0.oe index fcc4860fe9..74f7899306 100644 --- a/fam/fam_2.7.0.oe +++ b/fam/fam_2.7.0.oe @@ -11,9 +11,7 @@ inherit autotools libtool CPPFLAGS_append = " -DNDEBUG" do_stage() { - oe_soinstall libfam/.libs/libfam.so.0.0.0 ${STAGING_LIBDIR}/ - install -m 0644 libfam/.libs/libfam.a ${STAGING_LIBDIR}/libfam.a - install -m 0644 libfam/.libs/libfam.lai ${STAGING_LIBDIR}/libfam.la + oe_libinstall -so -a -C libfam libfam ${STAGING_LIBDIR}/ install -m 0644 ${S}/include/fam.h ${STAGING_INCDIR}/ } diff --git a/flexis-zaurus/flexis-zaurus_1.0.0.oe b/flexis-zaurus/flexis-zaurus_1.0.0.oe index e69de29bb2..35f80a717b 100644 --- a/flexis-zaurus/flexis-zaurus_1.0.0.oe +++ b/flexis-zaurus/flexis-zaurus_1.0.0.oe @@ -0,0 +1,18 @@ +DESCRIPTION = "A Qtopia/Opie Input Method plugin for the Flexis FX100 Keyboard." +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Michael Lauer " +LICENSE = "GPL" +DEPENDS = "virtual/libc" + +SRC_URI = "http://www.Vanille.de/mirror/flexis-zaurus-${PV}.tar.bz2 \ + file://${FILESDIR}/gcc3.patch;patch=1" +S = "${WORKDIR}/flexis-zaurus" + +inherit palmtop + +EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia" + +do_install() { + oe_libinstall libqflexis ${D}/${palmtopdir}/plugins/inputmethods/ +} diff --git a/fontconfig/fontconfig_2.2.92.oe b/fontconfig/fontconfig_2.2.92.oe index 2ea4771eb7..495b2a1cc6 100644 --- a/fontconfig/fontconfig_2.2.92.oe +++ b/fontconfig/fontconfig_2.2.92.oe @@ -31,10 +31,7 @@ do_compile () { do_stage () { - oe_soinstall src/.libs/libfontconfig.so.1.0.4 ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libfontconfig.a ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libfontconfig.lai ${STAGING_LIBDIR}/libfontconfig.la + oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/fontconfig cp -a ${S}/fontconfig/*.h ${STAGING_INCDIR}/fontconfig/ } - diff --git a/freetype/freetype-native_2.1.7.oe b/freetype/freetype-native_2.1.7.oe index 1f15d700c3..2fb5816eca 100644 --- a/freetype/freetype-native_2.1.7.oe +++ b/freetype/freetype-native_2.1.7.oe @@ -14,10 +14,7 @@ do_configure () { } do_stage () { - oe_soinstall objs/.libs/libfreetype.so.6.3.5 ${STAGING_LIBDIR}/ - - install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la - install -m 0644 objs/.libs/libfreetype.a ${STAGING_LIBDIR}/libfreetype.a + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} cp -a ${S}/include/*.h ${STAGING_INCDIR} install -d ${STAGING_INCDIR}/freetype2 cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/ diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe index 1207d514ea..c002dff23c 100644 --- a/freetype/freetype_2.1.7.oe +++ b/freetype/freetype_2.1.7.oe @@ -18,10 +18,8 @@ do_configure () { } do_stage () { - oe_soinstall objs/.libs/libfreetype.so.6.3.5 ${STAGING_LIBDIR}/ + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} - install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la - install -m 0644 objs/.libs/libfreetype.a ${STAGING_LIBDIR}/ cp -a ${S}/include/*.h ${STAGING_INCDIR} install -d ${STAGING_INCDIR}/freetype2 cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/ diff --git a/gdbm/gdbm_1.8.3.oe b/gdbm/gdbm_1.8.3.oe index 98956cddd5..8a1e043e70 100644 --- a/gdbm/gdbm_1.8.3.oe +++ b/gdbm/gdbm_1.8.3.oe @@ -10,8 +10,6 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ inherit autotools libtool do_stage () { - oe_soinstall .libs/libgdbm.so.3.0.0 ${STAGING_LIBDIR}/ - install -m 0644 .libs/libgdbm.a ${STAGING_LIBDIR}/ - install -m 0644 .libs/libgdbm.lai ${STAGING_LIBDIR}/libgdbm.la + oe_libinstall -so -a libgdbm ${STAGING_LIBDIR} install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/ } diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe index 6993a712d1..e3a38ad5f2 100644 --- a/glib-2.0/glib-2.0-native_2.2.3.oe +++ b/glib-2.0/glib-2.0-native_2.2.3.oe @@ -12,23 +12,13 @@ do_configure_prepend () { install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . } -SOV = "0.200.3" - do_stage () { install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/ install -m 0755 gobject/glib-genmarshal ${STAGING_BINDIR}/ - oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la - install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a - install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la - install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a - install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la - install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a - install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la - install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a + oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe index 3f50f8cee7..99a9feeb24 100644 --- a/glib-2.0/glib-2.0_2.2.3.oe +++ b/glib-2.0/glib-2.0_2.2.3.oe @@ -20,20 +20,11 @@ do_configure_prepend () { install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . } -SOV = "0.200.3" do_stage () { - oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la - #install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a - install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la - #install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a - install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la - #install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a - install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la - #install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a + oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h diff --git a/gmp/gmp_4.1.2.oe b/gmp/gmp_4.1.2.oe index 9c76cbbe87..efca7421bb 100644 --- a/gmp/gmp_4.1.2.oe +++ b/gmp/gmp_4.1.2.oe @@ -9,7 +9,6 @@ inherit autotools libtool acpaths = "" do_stage () { - install -m 0644 .libs/libgmp.lai ${STAGING_LIBDIR}/libgmp.la - oe_soinstall .libs/libgmp.so.3.3.2 ${STAGING_LIBDIR} + oe_libinstall -so libgmp ${STAGING_LIBDIR} install -m 0644 ${S}/gmp.h ${STAGING_INCDIR}/gmp.h } diff --git a/gpm/gpm_1.20.1.oe b/gpm/gpm_1.20.1.oe index 0d7bde44c6..aad2a7a110 100644 --- a/gpm/gpm_1.20.1.oe +++ b/gpm/gpm_1.20.1.oe @@ -16,8 +16,7 @@ do_configure_prepend () { do_stage () { install -m 0644 src/headers/gpm.h ${STAGING_INCDIR}/ - install -m 0644 src/lib/libgpm.a ${STAGING_LIBDIR}/ - oe_soinstall src/lib/libgpm.so.1.19.0 ${STAGING_LIBDIR}/ + oe_libinstall -so -a -C src/lib libgpm ${STAGING_LIBDIR} } do_install () { diff --git a/gsl/gsl_1.4.oe b/gsl/gsl_1.4.oe index 783371d837..9af8422688 100644 --- a/gsl/gsl_1.4.oe +++ b/gsl/gsl_1.4.oe @@ -10,8 +10,8 @@ inherit autotools libtool pkgconfig do_stage() { oe_runmake DESTDIR=${S}/.install install - oe_soinstall .install/usr/lib/libgslcblas.so.0.0.0 ${STAGING_LIBDIR}/ - oe_soinstall .install/usr/lib/libgsl.so.0.5.0 ${STAGING_LIBDIR}/ + oe_libinstall -so -C .install/usr/lib libgslcblas ${STAGING_LIBDIR} + oe_libinstall -so -C .install/usr/lib libgsl ${STAGING_LIBDIR} cp -a .install/usr/include/* ${STAGING_INCDIR}/ cat gsl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR} -I${STAGING_INCDIR}/python2.3," \ diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe index 2a5b74b76f..349f170dd5 100644 --- a/gtk+/gtk+_2.2.4.oe +++ b/gtk+/gtk+_2.2.4.oe @@ -24,7 +24,6 @@ do_configure_prepend() { EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft" -SOV = "0.200.4" LIBV = "2.2.0" gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h" @@ -32,21 +31,10 @@ gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdk gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h" do_stage () { - oe_soinstall gtk/.libs/libgtk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 gtk/.libs/libgtk-x11-2.0.lai ${STAGING_LIBDIR}/libgtk-x11-2.0.la - install -m 0644 gtk/.libs/libgtk-x11-2.0.a ${STAGING_LIBDIR}/libgtk-x11-2.0.a - - oe_soinstall gdk/.libs/libgdk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 gdk/.libs/libgdk-x11-2.0.lai ${STAGING_LIBDIR}/libgdk-x11-2.0.la - install -m 0644 gdk/.libs/libgdk-x11-2.0.a ${STAGING_LIBDIR}/libgdk-x11-2.0.a - - oe_soinstall contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.lai ${STAGING_LIBDIR}/ - install -m 0644 contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.a ${STAGING_LIBDIR}/ - - oe_soinstall gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.lai ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.la - install -m 0644 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.a ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.a + oe_libinstall -a -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -a -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -a -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} + oe_libinstall -a -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk for i in ${gtk_include}; do diff --git a/ipkg/ipkg_0.99.121.oe b/ipkg/ipkg_0.99.121.oe index 0c271c4ddb..de288e59b2 100644 --- a/ipkg/ipkg_0.99.121.oe +++ b/ipkg/ipkg_0.99.121.oe @@ -33,7 +33,7 @@ update-alternatives --remove ipkg /usr/bin/ipkg-cl } do_stage() { - oe_soinstall .libs/libipkg.so.0.0.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libipkg ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/replace/ install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/ install -d ${STAGING_INCDIR}/libipkg/ diff --git a/irk/irk_0.11.0.oe b/irk/irk_0.11.0.oe index e62b38bb4e..cad2d02e10 100644 --- a/irk/irk_0.11.0.oe +++ b/irk/irk_0.11.0.oe @@ -19,7 +19,7 @@ do_install() { install chicony.conf ${D}/${sysconfdir}/lircd.conf install IRK.conf ${D}/${sysconfdir} - oe_soinstall libirk.so.1.0.0 ${D}${palmtopdir}/plugins/inputmethods/ + oe_libinstall -so libirk ${D}/${palmtopdir}/plugins/inputmethods } FILES_irk_append=" /etc /home/root" diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe index 4e2a5347b4..acebca58b8 100644 --- a/jpeg/jpeg_6b.oe +++ b/jpeg/jpeg_6b.oe @@ -28,7 +28,7 @@ do_stage() { 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_soinstall .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libjpeg ${STAGING_LIBDIR} } do_install() { diff --git a/klimt/klimt_0.6.1.oe b/klimt/klimt_0.6.1.oe index 89e27814d9..c10f563be2 100644 --- a/klimt/klimt_0.6.1.oe +++ b/klimt/klimt_0.6.1.oe @@ -18,6 +18,5 @@ do_stage() { } do_install() { - install -d ${D}${palmtopdir}/lib - oe_soinstall ${STAGING_LIBDIR}/libKlimt.so.0.5.1 ${D}${palmtopdir}/lib/ + oe_libinstall -so -C ${STAGING_LIBDIR} libKlimt ${D}/${palmtopdir}/lib } diff --git a/korganizer/korganizer-embedded_1.5.0.oe b/korganizer/korganizer-embedded_1.5.0.oe index ff81c311dc..586fa79e5b 100644 --- a/korganizer/korganizer-embedded_1.5.0.oe +++ b/korganizer/korganizer-embedded_1.5.0.oe @@ -29,15 +29,14 @@ do_install() { ${D}/${palmtopdir}/lib \ ${D}/${palmtopdir}/apps/Pim \ ${D}/${palmtopdir}/pics/korganizer/icons16 - install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop + install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/Pim/korganizer.desktop cd ${S}/pics - cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer - cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16 - for f in libmicrokde.so.1.0.0 libkcal.so.1.0.0 libkdepim.so.1.0.0 libqtcompat.so.1.0.0 + cp *.png *.wav ${D}/${palmtopdir}/pics/korganizer + cp ./icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16 + for f in libmicrokde libkcal libkdepim libqtcompat do - oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib - rm -f ${STAGING_LIBDIR}/${f} + oe_libinstall -so -C ${STAGING_LIBDIR} $f ${D}/${palmtopdir}/lib done - install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/opt/QtPalmtop/bin/korganizer + install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/${palmtopdir}/bin/korganizer rm -f ${STAGING_DIR}/${HOST_SYS}/bin/korganizer } diff --git a/korganizer/korganizer-embedded_1.7.0.oe b/korganizer/korganizer-embedded_1.7.0.oe index e1f9852bf3..79f8e8c1ce 100644 --- a/korganizer/korganizer-embedded_1.7.0.oe +++ b/korganizer/korganizer-embedded_1.7.0.oe @@ -33,23 +33,22 @@ do_install() { ${D}/${palmtopdir}/pics/korganizer/icons16 \ ${D}/${palmtopdir}/pics/korganizer/iconsmini \ ${D}/${palmtopdir}/plugins/applets - install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop + install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/Pim/korganizer.desktop cd ${S}/pics - cp ko*.png ${D}/opt/QtPalmtop/pics - cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer - cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16 - cp ./iconsmini/*.png ${D}/opt/QtPalmtop/pics/korganizer/iconsmini - - for f in libmicrokde.so.1.0.0 libmicrokdepim.so.1.0.0 libmicrokabc.so.1.0.0 libmicrokcal.so.1.0.0 libmicroqtcompat.so.1.0.0 - do - oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib - done + cp ko*.png ${D}/${palmtopdir}/pics + cp *.png *.wav ${D}/${palmtopdir}/pics/korganizer + cp ./icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16 + cp ./iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini - install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/opt/QtPalmtop/bin/kopi - - for f in libkopialarmapplet.so.1.0.0 + for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat do - oe_soinstall ${STAGING_DIR}/${HOST_SYS}/plugins/applets/${f} ${D}/opt/QtPalmtop/plugins/applets + oe_libinstall -so -C ${STAGING_LIBDIR} $f ${D}/${palmtopdir}/lib done + install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/${palmtopdir}/bin/kopi + + for f in libkopialarmapplet + do + oe_libinstall -so -C ${STAGING_DIR}/${HOST_SYS}/plugins/applets $f ${d}/${palmtopdir}/plugins/applets + done } diff --git a/korganizer/korganizer-embedded_1.7.5.oe b/korganizer/korganizer-embedded_1.7.5.oe index e69de29bb2..90be6abd08 100644 --- a/korganizer/korganizer-embedded_1.7.5.oe +++ b/korganizer/korganizer-embedded_1.7.5.oe @@ -0,0 +1,53 @@ +DESCRIPTION= "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Sebastian Goergen " +LICENSE = "GPL" +RDEPENDS = "lipqpe1" +DEPENDS ="virtual/libc virtual/libqpe libopie1" + +SRC_URI = "http://www.pi-sync.net/daunlood/stable/korganizerPi.175.tar.gz" + +S = "${WORKDIR}/korganizerPi.175" + +inherit palmtop + +EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link," +QMAKE_PROFILES= "all.pro" + +SUBDIRS="microkde libical/src/libical libical/src/libicalss libkcal libkdepim libkabcwrap kalarmd korganizer" + +do_configure_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat ${SUBDIRS}\n" >all.pro + for d in ${SUBDIRS} + do + mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro + done +} + +do_install() { + install -d ${D}/${palmtopdir}/bin \ + ${D}/${palmtopdir}/lib \ + ${D}/${palmtopdir}/apps/1Pim \ + ${D}/${palmtopdir}/pics/korganizer/icons16 \ + ${D}/${palmtopdir}/pics/korganizer/iconsmini \ + ${D}/${palmtopdir}/plugins/applets + install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop + cd ${S}/pics + install -m 0644 ${S}/pics/ko*.png ${D}/${palmtopdir}/pics + install -m 0644 ${S}/pics/*.png ${D}/${palmtopdir}/pics/korganizer + install -m 0644 ${S}/pics/icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16 + install -m 0644 ${S}/pics/iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini + + for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat + do + oe_libinstall -so -C ${STAGING_LIBDIR} $f ${d}/${palmtopdir}/lib + done + + install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/${palmtopdir}/bin/kopi + + for f in libkopialarmapplet + do + oe_libinstall -so -C ${STAGING_DIR}/${HOST_SYS}/plugins/applets $f ${d}/${palmtopdir}/plugins/applets + done +} diff --git a/libao/libao_0.8.4.oe b/libao/libao_0.8.4.oe index d75648d619..c0ffa05e91 100644 --- a/libao/libao_0.8.4.oe +++ b/libao/libao_0.8.4.oe @@ -17,7 +17,5 @@ do_stage () { install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - install -m 0644 src/.libs/libao.a ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libao.lai ${STAGING_LIBDIR}/libao.la - oe_soinstall src/.libs/libao.so.2.1.2 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C src libao ${STAGING_LIBDIR} } diff --git a/libdaemon/libdaemon_0.3.oe b/libdaemon/libdaemon_0.3.oe index 55f07ffd44..a579ec1865 100644 --- a/libdaemon/libdaemon_0.3.oe +++ b/libdaemon/libdaemon_0.3.oe @@ -8,9 +8,7 @@ inherit autotools libtool EXTRA_OECONF = "--disable-lynx" do_stage () { - oe_soinstall src/.libs/libdaemon.so.0.1.0 ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libdaemon.a ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libdaemon.lai ${STAGING_LIBDIR}/libdaemon.la + oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/libdaemon for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/ diff --git a/libdisplaymigration/libdisplaymigration_0.28.oe b/libdisplaymigration/libdisplaymigration_0.28.oe index ab9d840cdc..59ad9562a9 100644 --- a/libdisplaymigration/libdisplaymigration_0.28.oe +++ b/libdisplaymigration/libdisplaymigration_0.28.oe @@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libdisplaymigration- headers = "displaymigration.h auth.h crypt.h" do_stage () { - oe_soinstall libdisplaymigration.so.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libdisplaymigration ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/libdisplaymigration for h in ${headers}; do diff --git a/libdotdesktop/libdotdesktop_0.11.oe b/libdotdesktop/libdotdesktop_0.11.oe index e69de29bb2..62ff1e7a05 100644 --- a/libdotdesktop/libdotdesktop_0.11.oe +++ b/libdotdesktop/libdotdesktop_0.11.oe @@ -0,0 +1,23 @@ +DESCRIPTION = "library for extracting mime data from .desktop files." +DEPENDS = "glib-2.0" + +inherit pkgconfig + +SRC_URI = "ftp://gpe.handhelds.org/gpe/source/libdotdesktop-${PV}.tar.gz \ + file://${FILESDIR}/make_build_var.patch;patch=1" + +headers = "dotdesktop.h" + +do_stage () { + oe_libinstall -so libdotdesktop ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/gpe/$h + done +} + +do_install () { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel +} + diff --git a/libesmtp/libesmtp_1.0.1.oe b/libesmtp/libesmtp_1.0.1.oe index 38c00d40ec..f7b29f3831 100644 --- a/libesmtp/libesmtp_1.0.1.oe +++ b/libesmtp/libesmtp_1.0.1.oe @@ -12,9 +12,7 @@ inherit autotools libtool EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." do_stage () { - install -m 0644 .libs/libesmtp.a ${STAGING_LIBDIR}/ - install -m 0644 .libs/libesmtp.lai ${STAGING_LIBDIR}/libesmtp.la - oe_soinstall .libs/libesmtp.so.5.1.2 ${STAGING_LIBDIR}/ + oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} install -d ${STAGING_INCDIR} install -m 644 auth-client.h ${STAGING_INCDIR} diff --git a/libeventdb/libeventdb_0.15.oe b/libeventdb/libeventdb_0.15.oe index f942bf9baf..61d7384cc6 100644 --- a/libeventdb/libeventdb_0.15.oe +++ b/libeventdb/libeventdb_0.15.oe @@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libeventdb-${PV}.tar headers = "event-db.h" do_stage () { - oe_soinstall libeventdb.so.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libeventdb ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gpe for h in ${headers}; do diff --git a/libgcrypt/libgcrypt_1.1.91.oe b/libgcrypt/libgcrypt_1.1.91.oe index 12e7ab791f..a4fa79d549 100644 --- a/libgcrypt/libgcrypt_1.1.91.oe +++ b/libgcrypt/libgcrypt_1.1.91.oe @@ -11,8 +11,8 @@ inherit autotools libtool EXTRA_OECONF = "--without-pth" do_stage() { - oe_soinstall src/.libs/libgcrypt.so.7.3.1 ${STAGING_LIBDIR}/ - oe_soinstall src/.libs/libgcrypt-pthread.so.7.3.1 ${STAGING_LIBDIR}/ + oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} + oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/ install -d ${STAGING_INCDIR}/ diff --git a/libglade/libglade_2.0.1.oe b/libglade/libglade_2.0.1.oe index b1211f9507..89bbcff35a 100644 --- a/libglade/libglade_2.0.1.oe +++ b/libglade/libglade_2.0.1.oe @@ -9,7 +9,6 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar inherit autotools pkgconfig libtool -libname = "libglade-2.0.so.0.0.1" headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h" do_configure_prepend() { @@ -18,9 +17,7 @@ do_configure_prepend() { } do_stage () { - oe_soinstall glade/.libs/${libname} ${STAGING_LIBDIR}/ - install -m 0644 glade/.libs/libglade-2.0.a ${STAGING_LIBDIR}/libglade-2.0.a - install -m 0644 glade/.libs/libglade-2.0.lai ${STAGING_LIBDIR}/libglade-2.0.la + oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade for i in ${headers}; do diff --git a/libgpepimc/libgpepimc_0.2.oe b/libgpepimc/libgpepimc_0.2.oe index 779502fe1a..0cc6bcf1de 100644 --- a/libgpepimc/libgpepimc_0.2.oe +++ b/libgpepimc/libgpepimc_0.2.oe @@ -12,7 +12,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpepimc-${PV}.tar headers = "pim-categories.h pim-categories-ui.h" do_stage () { - oe_soinstall libgpepimc.so.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libgpepimc ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gpe for h in ${headers}; do diff --git a/libgpepimc/libgpepimc_0.3.oe b/libgpepimc/libgpepimc_0.3.oe index e69de29bb2..2d0f8e4aec 100644 --- a/libgpepimc/libgpepimc_0.3.oe +++ b/libgpepimc/libgpepimc_0.3.oe @@ -0,0 +1,25 @@ +DESCRIPTION = "Common code for GPE PIMs" +SECTION = "gpe/libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite" + +inherit pkgconfig gpe + +SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpepimc-${PV}.tar.gz" + +headers = "pim-categories.h pim-categories-ui.h" + +do_stage () { + oe_libinstall -so libgpepimc ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h + done +} + +do_install () { + gpe_do_install + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel +} diff --git a/libgpevtype/libgpevtype_0.3.oe b/libgpevtype/libgpevtype_0.3.oe index 4875af7c6b..f72e91d1a5 100644 --- a/libgpevtype/libgpevtype_0.3.oe +++ b/libgpevtype/libgpevtype_0.3.oe @@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpevtype-${PV}.ta headers = "tag-db.h vcard.h vevent.h vtodo.h" do_stage () { - oe_soinstall libgpevtype.so.0 ${STAGING_LIBDIR}/ + oe_libinstall -so libgpevtype ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gpe for h in ${headers}; do diff --git a/libgpewidget/libgpewidget_0.78.oe b/libgpewidget/libgpewidget_0.78.oe index b77ea657de..df2bf27a26 100644 --- a/libgpewidget/libgpewidget_0.78.oe +++ b/libgpewidget/libgpewidget_0.78.oe @@ -12,7 +12,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpewidget-${PV}.t headers = "init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h" do_stage () { - oe_soinstall ${S}/libgpewidget.so.1 ${STAGING_LIBDIR}/ + oe_libinstall -so libgpewidget ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gpe for h in ${headers}; do diff --git a/libgpg-error/libgpg-error_0.6.oe b/libgpg-error/libgpg-error_0.6.oe index a53982d896..63e7edfe74 100644 --- a/libgpg-error/libgpg-error_0.6.oe +++ b/libgpg-error/libgpg-error_0.6.oe @@ -9,9 +9,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar. inherit autotools libtool do_stage() { - oe_soinstall src/.libs/libgpg-error.so.0.1.1 ${STAGING_LIBDIR}/ + oe_libinstall -so -C src libgpg-error ${STAGING_LIBDIR} install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/ - install -m 0644 src/.libs/libgpg-error.lai ${STAGING_LIBDIR}/libgpg-error.la install -d ${STAGING_INCDIR}/ for X in gpg-error.h diff --git a/libgpg-error/libgpg-error_0.7.oe b/libgpg-error/libgpg-error_0.7.oe index 9744691a7e..3438710a04 100644 --- a/libgpg-error/libgpg-error_0.7.oe +++ b/libgpg-error/libgpg-error_0.7.oe @@ -9,10 +9,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar. inherit autotools libtool do_stage() { - oe_soinstall src/.libs/libgpg-error.so.0.1.2 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/ - install -m 0644 src/.libs/libgpg-error.lai ${STAGING_LIBDIR}/libgpg-error.la - install -m 0644 src/.libs/libgpg-error.a ${STAGING_LIBDIR}/libgpg-error.a install -d ${STAGING_INCDIR}/ for X in gpg-error.h diff --git a/libid3tag/libid3tag_0.15.0b.oe b/libid3tag/libid3tag_0.15.0b.oe index 70481a7dd6..63060eb85f 100644 --- a/libid3tag/libid3tag_0.15.0b.oe +++ b/libid3tag/libid3tag_0.15.0b.oe @@ -12,6 +12,6 @@ inherit autotools libtool EXTRA_OECONF = "-enable-speed" do_stage() { - oe_soinstall .libs/libid3tag.so.0.2.0 ${STAGING_LIBDIR} + oe_libinstall -so libid3tag ${STAGING_LIBDIR} install -m 0644 id3tag.h ${STAGING_INCDIR} } diff --git a/libmad/libmad_0.15.0b.oe b/libmad/libmad_0.15.0b.oe index 19bf65e1be..e4081d4f76 100644 --- a/libmad/libmad_0.15.0b.oe +++ b/libmad/libmad_0.15.0b.oe @@ -17,7 +17,6 @@ do_configure_prepend () { } do_stage() { - oe_soinstall .libs/libmad.so.0.2.0 ${STAGING_LIBDIR} + oe_libinstall -so libmad ${STAGING_LIBDIR} install -m 0644 mad.h ${STAGING_INCDIR} } - diff --git a/libmatchbox/libmatchbox_1.1.oe b/libmatchbox/libmatchbox_1.1.oe index b864694b11..7db7fa7dfa 100644 --- a/libmatchbox/libmatchbox_1.1.oe +++ b/libmatchbox/libmatchbox_1.1.oe @@ -18,8 +18,5 @@ do_stage () { install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/ done - cp -a ${S}/libmb/.libs/libmb.a ${STAGING_LIBDIR}/libmb.a - cp -a ${S}/libmb/libmb.lai ${STAGING_LIBDIR}/libmb.la - oe_soinstall ${S}/libmb/.libs/libmb.so.1.0.1 ${STAGING_LIBDIR}/ -# cp -a ${S}/libmb.pc ${STAGING_LIBDIR}/pkgconfig/libmb.pc + oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR} } diff --git a/libmatchbox/libmatchbox_1.2.oe b/libmatchbox/libmatchbox_1.2.oe index ed263fd064..7db7fa7dfa 100644 --- a/libmatchbox/libmatchbox_1.2.oe +++ b/libmatchbox/libmatchbox_1.2.oe @@ -12,16 +12,11 @@ EXTRA_OECONF = "--enable-jpeg --enable-pango" headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \ mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h" -SOV = 1.0.2 - do_stage () { install -d ${STAGING_INCDIR}/libmb for h in ${headers}; do install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/ done - cp -a ${S}/libmb/.libs/libmb.a ${STAGING_LIBDIR}/libmb.a - cp -a ${S}/libmb/.libs/libmb.lai ${STAGING_LIBDIR}/libmb.la - oe_soinstall ${S}/libmb/.libs/libmb.so.${SOV} ${STAGING_LIBDIR}/ -# cp -a ${S}/libmb.pc ${STAGING_LIBDIR}/pkgconfig/libmb.pc + oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR} } diff --git a/libmikey/libmikey_0.1a.oe b/libmikey/libmikey_0.1a.oe index e69de29bb2..97e81b24d2 100644 --- a/libmikey/libmikey_0.1a.oe +++ b/libmikey/libmikey_0.1a.oe @@ -0,0 +1,21 @@ +DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol." +HOMEPAGE = "http://minisip.org/libmikey" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libc openssl" + +SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz" +S = "${WORKDIR}/libmikey-0.1" + +inherit autotools libtool + +do_configure() { + oe_runconf +} + +do_stage() { + oe_libinstall -so libmikey ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libmikey + install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/ +} diff --git a/libmikmod/libmikmod_3.1.11.oe b/libmikmod/libmikmod_3.1.11.oe index 7590911899..91e8f095ca 100644 --- a/libmikmod/libmikmod_3.1.11.oe +++ b/libmikmod/libmikmod_3.1.11.oe @@ -16,9 +16,6 @@ do_configure() { } do_stage() { - oe_soinstall libmikmod/.libs/libmikmod.so.2.0.4 ${STAGING_LIBDIR}/ - install -m 0644 libmikmod/.libs/libmikmod.lai ${STAGING_LIBDIR}/libmikmod.la - install -m 0644 libmikmod/.libs/libmikmod.a ${STAGING_LIBDIR}/libmikmod.a + oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ } - diff --git a/libmikmod/libmikmod_3.2.0-beta2.oe b/libmikmod/libmikmod_3.2.0-beta2.oe index 606bb998df..b86cd19105 100644 --- a/libmikmod/libmikmod_3.2.0-beta2.oe +++ b/libmikmod/libmikmod_3.2.0-beta2.oe @@ -16,9 +16,7 @@ do_configure() { } do_stage() { - oe_soinstall libmikmod/.libs/libmikmod.so.3.0.0 ${STAGING_LIBDIR}/ - install -m 0644 libmikmod/.libs/libmikmod.a ${STAGING_LIBDIR}/ - install -m 0644 libmikmod/.libs/libmikmod.lai ${STAGING_LIBDIR}/libmikmod.la + oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ cat libmikmod-config | sed 's,$libdir , ,' \ diff --git a/libmimedir/libmimedir_0.0-20040307.oe b/libmimedir/libmimedir_0.0-20040307.oe index 59931bea7b..5f1e4a9a4c 100644 --- a/libmimedir/libmimedir_0.0-20040307.oe +++ b/libmimedir/libmimedir_0.0-20040307.oe @@ -11,15 +11,11 @@ inherit autotools libtool pkgconfig headers = "mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-recurrence-rule.h mimedir-recurrence.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h" -libname = "libmimedir-0.2.so.0.0.0" - do_stage() { install -d ${STAGING_INCDIR}/mimedir-1.0/mimedir for i in ${headers}; do install -m 0644 ${S}/mimedir/$i ${STAGING_INCDIR}/mimedir-1.0/mimedir/$i done - oe_soinstall mimedir/.libs/${libname} ${STAGING_LIBDIR}/ - ln -sf ${libname} ${STAGING_LIBDIR}/libmimedir.so - install -m 0755 mimedir/libmimedir.la ${STAGING_LIBDIR}/ + oe_libinstall -so -C mimedir libmimedir-0.2 ${STAGING_LIBDIR} } diff --git a/libogg/libogg_1.0.oe b/libogg/libogg_1.0.oe index 60b7fe830c..7e5097b23e 100644 --- a/libogg/libogg_1.0.oe +++ b/libogg/libogg_1.0.oe @@ -9,9 +9,7 @@ SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libogg-${PV}.tar.gz" inherit autotools libtool do_stage () { - install -m 0644 src/.libs/libogg.a ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libogg.lai ${STAGING_LIBDIR}/libogg.la - oe_soinstall src/.libs/libogg.so.0.4.0 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/ogg (cd ${S}/include/ogg; cp config_types.h ogg.h os_types.h ${STAGING_INCDIR}/ogg/) diff --git a/libogg/libogg_1.1.oe b/libogg/libogg_1.1.oe index 501a490a96..be8a3c300a 100644 --- a/libogg/libogg_1.1.oe +++ b/libogg/libogg_1.1.oe @@ -9,9 +9,7 @@ SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz" inherit autotools libtool do_stage () { - install -m 0644 src/.libs/libogg.a ${STAGING_LIBDIR}/ - install -m 0644 src/.libs/libogg.lai ${STAGING_LIBDIR}/libogg.la - oe_soinstall src/.libs/libogg.so.0.5.0 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/ogg (cd ${S}/include/ogg; cp config_types.h ogg.h os_types.h ${STAGING_INCDIR}/ogg/) diff --git a/liboop/liboop_1.0.oe b/liboop/liboop_1.0.oe index 3532fade2c..ec598ed4c2 100644 --- a/liboop/liboop_1.0.oe +++ b/liboop/liboop_1.0.oe @@ -12,8 +12,6 @@ headers = "oop.h oop-adns.h oop-glib.h \ oop-tcl.h oop-www.h oop-rl.h \ oop-read.h" do_stage () { - oe_soinstall .libs/liboop.so.4.0.1 ${STAGING_LIBDIR}/ - install -m 0644 .libs/liboop.lai ${STAGING_LIBDIR}/liboop.la - install -m 0644 .libs/liboop.a ${STAGING_LIBDIR}/liboop.a + oe_libinstall -a -so liboop ${STAGING_LIBDIR} install -m 0644 ${headers} ${STAGING_INCDIR}/ } diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe index f8fd8400f0..005d171697 100644 --- a/libopie/libopie2_cvs.oe +++ b/libopie/libopie2_cvs.oe @@ -42,13 +42,12 @@ do_stage() { } do_install() { - install -d ${D}${palmtopdir}/lib/ - oe_soinstall ${STAGING_LIBDIR}/libopiecore2.so.1.9.1 ${D}${palmtopdir}/lib/ - oe_soinstall ${STAGING_LIBDIR}/libopiedb2.so.1.9.0 ${D}${palmtopdir}/lib/ - oe_soinstall ${STAGING_LIBDIR}/libopiemm2.so.1.9.0 ${D}${palmtopdir}/lib/ - oe_soinstall ${STAGING_LIBDIR}/libopienet2.so.1.8.4 ${D}${palmtopdir}/lib/ - oe_soinstall ${STAGING_LIBDIR}/libopiepim2.so.1.8.6 ${D}${palmtopdir}/lib/ - oe_soinstall ${STAGING_LIBDIR}/libopieui2.so.1.8.5 ${D}${palmtopdir}/lib/ + oe_libinstall -so -C ${STAGING_LIBDIR} libopiecore2 ${D}/${palmtopdir}/lib + oe_libinstall -so -C ${STAGING_LIBDIR} libopiedb2 ${D}/${palmtopdir}/lib + oe_libinstall -so -C ${STAGING_LIBDIR} libopiemm2 ${D}/${palmtopdir}/lib + oe_libinstall -so -C ${STAGING_LIBDIR} libopienet2 ${D}/${palmtopdir}/lib + oe_libinstall -so -C ${STAGING_LIBDIR} libopiepim2 ${D}/${palmtopdir}/lib + oe_libinstall -so -C ${STAGING_LIBDIR} libopieui2 ${D}/${palmtopdir}/lib } PACKAGES = "libopiecore2 libopiedb2 libopiemm2 libopienet2 libopiepim2 libopieui2" diff --git a/libpcap/libpcap_0.7.2.oe b/libpcap/libpcap_0.7.2.oe index c02bd2b4d1..cc53cfed06 100644 --- a/libpcap/libpcap_0.7.2.oe +++ b/libpcap/libpcap_0.7.2.oe @@ -27,6 +27,5 @@ do_stage () { install -m 0644 net/bpf.h ${STAGING_INCDIR}/net/bpf.h install -m 0644 pcap.h ${STAGING_INCDIR}/p