diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-14 19:39:54 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-14 19:39:54 +0000 |
| commit | 1c4623013ed47ba00247aa913419b52759c4f97b (patch) | |
| tree | 77f089bc41fa6b1e9055bfa2f68ed89c97034e19 /packages/speex | |
| parent | 3bc9495b3e053a89f39289de8fb843f330f8b74f (diff) | |
disapproval of revision '6491515c0991b335eb83774c7692f5c94ed7c304'
Diffstat (limited to 'packages/speex')
| -rw-r--r-- | packages/speex/speex_1.1.12+1.2beta1.bb | 11 | ||||
| -rw-r--r-- | packages/speex/speex_1.1.12+1.2beta2.bb | 24 |
2 files changed, 3 insertions, 32 deletions
diff --git a/packages/speex/speex_1.1.12+1.2beta1.bb b/packages/speex/speex_1.1.12+1.2beta1.bb index 903b5d5248..01bd93909e 100644 --- a/packages/speex/speex_1.1.12+1.2beta1.bb +++ b/packages/speex/speex_1.1.12+1.2beta1.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "BSD" HOMEPAGE = "http://www.speex.org" DEPENDS = "libogg" -PR = "r2" +PR = "r1" SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz" S = "${WORKDIR}/${PN}-1.2beta1" @@ -27,8 +27,8 @@ EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point " do_configure_append() { sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile -# perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile -# perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile + perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile + perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile } @@ -37,8 +37,3 @@ do_stage() { install -d ${STAGING_INCDIR}/speex install -m 0644 include/speex/*.h ${STAGING_INCDIR}/speex } - -PACKAGES += "speex-bin" -FILES_${PN} = "${libdir}/libspeex.so.*" -FILES_${PN}-dev += "${libdir}/libspeex.so.*" -FILES_${PN}-bin = "${bindir}" diff --git a/packages/speex/speex_1.1.12+1.2beta2.bb b/packages/speex/speex_1.1.12+1.2beta2.bb deleted file mode 100644 index f60408d50a..0000000000 --- a/packages/speex/speex_1.1.12+1.2beta2.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech." -SECTION = "libs" -LICENSE = "BSD" -HOMEPAGE = "http://www.speex.org" -DEPENDS = "libogg" - -SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta2.tar.gz" -S = "${WORKDIR}/${PN}-1.2beta2" - -PARALLEL_MAKE = "" - -inherit autotools pkgconfig - -EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} --disable-oggtest" - -do_stage() { - autotools_stage_all -} - -PACKAGES += "${PN}-bin" -FILES_${PN} = "${libdir}/libspeex.so.*" -FILES_${PN}-dev += "${libdir}/libspeex.so.*" -FILES_${PN}-bin = "${bindir}" |