From 9a1485276b7fd3042f7095c76d81d61f8d90a6fe Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:40:18 +0000 Subject: [PATCH] minisip and related libraries: fix SRC_URI and bring svn versions back from nonworking --- packages/libmikey/libmikey0_svn.bb | 26 ------------------- packages/libmsip/libmsip0_svn.bb | 25 ------------------ packages/{libmikey => minisip}/.mtn2git_empty | 0 packages/minisip/libmikey_svn.bb | 17 ++++++++++++ packages/minisip/libmnetutil_svn.bb | 16 ++++++++++++ packages/minisip/libmsip_svn.bb | 16 ++++++++++++ .../{libmutil => minisip}/libmutil0_svn.bb | 8 ++---- .../minisip/minisip-video_svn.bb | 14 +++++----- .../{nonworking => }/minisip/minisip_svn.bb | 21 ++++++--------- .../libmikey}/.mtn2git_empty | 0 .../libmikey/libmikey0_0.3.2.bb | 0 .../libmikey/libmikey_0.1a.bb | 0 .../libmnetutil/libmnetutil0_svn.bb | 25 ------------------ packages/nonworking/libmsip/.mtn2git_empty | 0 .../libmsip/libmsip0_0.2.2.bb | 0 15 files changed, 65 insertions(+), 103 deletions(-) delete mode 100644 packages/libmikey/libmikey0_svn.bb delete mode 100644 packages/libmsip/libmsip0_svn.bb rename packages/{libmikey => minisip}/.mtn2git_empty (100%) create mode 100644 packages/minisip/libmikey_svn.bb create mode 100644 packages/minisip/libmnetutil_svn.bb create mode 100644 packages/minisip/libmsip_svn.bb rename packages/{libmutil => minisip}/libmutil0_svn.bb (66%) rename packages/{nonworking => }/minisip/minisip-video_svn.bb (98%) rename packages/{nonworking => }/minisip/minisip_svn.bb (77%) rename packages/{libmsip => nonworking/libmikey}/.mtn2git_empty (100%) rename packages/{ => nonworking}/libmikey/libmikey0_0.3.2.bb (100%) rename packages/{ => nonworking}/libmikey/libmikey_0.1a.bb (100%) delete mode 100644 packages/nonworking/libmnetutil/libmnetutil0_svn.bb create mode 100644 packages/nonworking/libmsip/.mtn2git_empty rename packages/{ => nonworking}/libmsip/libmsip0_0.2.2.bb (100%) diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb deleted file mode 100644 index 663b639b3d..0000000000 --- a/packages/libmikey/libmikey0_svn.bb +++ /dev/null @@ -1,26 +0,0 @@ -PV = "0.3.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" -DEFAULT_PREFERENCE = "-1" - - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmikey" -S = "${WORKDIR}/libmikey" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmikey ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmikey - install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey -} diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb deleted file mode 100644 index 4418757ba2..0000000000 --- a/packages/libmsip/libmsip0_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.2.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmnetutil0 libmutil0" -DEFAULT_PREFERENCE = "-1" - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmsip" -S="${WORKDIR}/libmsip" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmsip ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmsip - install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip -} diff --git a/packages/libmikey/.mtn2git_empty b/packages/minisip/.mtn2git_empty similarity index 100% rename from packages/libmikey/.mtn2git_empty rename to packages/minisip/.mtn2git_empty diff --git a/packages/minisip/libmikey_svn.bb b/packages/minisip/libmikey_svn.bb new file mode 100644 index 0000000000..c51e466f9c --- /dev/null +++ b/packages/minisip/libmikey_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" +HOMEPAGE = "http://www.minisip.org" +SECTION = "libs/network" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" +PV = "0.3.2+svn${SRCDATE}" +LICENSE = "LGPL" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmikey" +S = "${WORKDIR}/libmikey" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/minisip/libmnetutil_svn.bb b/packages/minisip/libmnetutil_svn.bb new file mode 100644 index 0000000000..a2a60ba930 --- /dev/null +++ b/packages/minisip/libmnetutil_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Networking class library for C++ programming" +HOMEPAGE = "http://www.minisip.org" +SECTION = "libs/network" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" +PV = "0.2.2+svn${SRCDATE}" +LICENSE = "LGPL" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmnetutil" +S = "${WORKDIR}/libmnetutil" + +do_stage() { + autotools_stage_all +} diff --git a/packages/minisip/libmsip_svn.bb b/packages/minisip/libmsip_svn.bb new file mode 100644 index 0000000000..747cc49f0e --- /dev/null +++ b/packages/minisip/libmsip_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" +HOMEPAGE = "http://www.minisip.org" +SECTION = "libs/network" +PRIORITY = "optional" +DEPENDS = "libmnetutil0 libmutil0" +PV = "0.2.2+svn${SRCDATE}" +LICENSE = "LGPL" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmsip" +S = "${WORKDIR}/libmsip" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libmutil/libmutil0_svn.bb b/packages/minisip/libmutil0_svn.bb similarity index 66% rename from packages/libmutil/libmutil0_svn.bb rename to packages/minisip/libmutil0_svn.bb index 8766d623e3..a7a20bdf00 100644 --- a/packages/libmutil/libmutil0_svn.bb +++ b/packages/minisip/libmutil0_svn.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Class library implementing utilities for C++ programming" +HOMEPAGE = "http://www.minisip.org" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" - DEPENDS = "openssl" - PV = "0.3.1+svn${SRCDATE}" inherit autotools lib_package @@ -13,8 +12,5 @@ SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmutil" S = "${WORKDIR}/libmutil" do_stage() { - oe_libinstall -a -so libmutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmutil - install -m 0644 ${S}/include/libmutil/* ${STAGING_INCDIR}/libmutil + autotools_stage_all } diff --git a/packages/nonworking/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb similarity index 98% rename from packages/nonworking/minisip/minisip-video_svn.bb rename to packages/minisip/minisip-video_svn.bb index 136f09e156..ffd8f16e3d 100644 --- a/packages/nonworking/minisip/minisip-video_svn.bb +++ b/packages/minisip/minisip-video_svn.bb @@ -1,18 +1,13 @@ -PV = "0.6.2+svn${SRCDATE}" +DESCRIPTION = "SIP user agent, with focus on security - video support" LICENSE = "GPL" SECTION = "x11/utils" -PR = "r0" +DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" CONFLICTS = "minisip" +PV = "0.6.2+svn${SRCDATE}" -DESCRIPTION = "SIP user agent, with focus on security - video support" -DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" S = "${WORKDIR}/minisip" - - -FILES_${PN} += "${datadir}/minisip" - inherit autotools EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg" @@ -23,3 +18,6 @@ do_install_append () { install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop } + +FILES_${PN} += "${datadir}/minisip" + diff --git a/packages/nonworking/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb similarity index 77% rename from packages/nonworking/minisip/minisip_svn.bb rename to packages/minisip/minisip_svn.bb index 6928387ad0..9e9d426d84 100644 --- a/packages/nonworking/minisip/minisip_svn.bb +++ b/packages/minisip/minisip_svn.bb @@ -1,28 +1,23 @@ -PV = "0.6.2+svn${SRCDATE}" +DESCRIPTION = "SIP user agent, with focus on security" +HOMEPAGE = "http://www.minisip.org" +DEPENDS = "libglademm libmsip0 libmikey0" LICENSE = "GPL" SECTION = "x11/utils" -PR = "r0" +PV = "0.6.2+svn${SRCDATE}" -DESCRIPTION = "SIP user agent, with focus on security" -DEPENDS = "libglademm libmsip0 libmikey0" -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip" S = "${WORKDIR}/${PN}" -DEFAULT_PREFERENCE="-1" - -FILES_${PN} += "${datadir}/minisip" - inherit autotools EXTRA_OECONF = "--enable-ipaq" -# do_configure_prepend() { -# ./bootstrap -#} - do_install_append () { install -d ${D}${datadir}/pixmaps install -d ${D}${datadir}/applications install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop } + +FILES_${PN} += "${datadir}/minisip" + diff --git a/packages/libmsip/.mtn2git_empty b/packages/nonworking/libmikey/.mtn2git_empty similarity index 100% rename from packages/libmsip/.mtn2git_empty rename to packages/nonworking/libmikey/.mtn2git_empty diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/nonworking/libmikey/libmikey0_0.3.2.bb similarity index 100% rename from packages/libmikey/libmikey0_0.3.2.bb rename to packages/nonworking/libmikey/libmikey0_0.3.2.bb diff --git a/packages/libmikey/libmikey_0.1a.bb b/packages/nonworking/libmikey/libmikey_0.1a.bb similarity index 100% rename from packages/libmikey/libmikey_0.1a.bb rename to packages/nonworking/libmikey/libmikey_0.1a.bb diff --git a/packages/nonworking/libmnetutil/libmnetutil0_svn.bb b/packages/nonworking/libmnetutil/libmnetutil0_svn.bb deleted file mode 100644 index a8e156bc13..0000000000 --- a/packages/nonworking/libmnetutil/libmnetutil0_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.2.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "Networking class library for C++ programming" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" -DEFAULT_PREFERENCE = "-1" - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil" -S="${WORKDIR}/libmnetutil" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmnetutil - install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil -} diff --git a/packages/nonworking/libmsip/.mtn2git_empty b/packages/nonworking/libmsip/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/nonworking/libmsip/libmsip0_0.2.2.bb similarity index 100% rename from packages/libmsip/libmsip0_0.2.2.bb rename to packages/nonworking/libmsip/libmsip0_0.2.2.bb -- 2.39.5