diff options
| -rw-r--r-- | packages/e17/enna_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/taglib/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/taglib/files/taglib_1.4-8.diff.gz | bin | 0 -> 74973 bytes | |||
| -rw-r--r-- | packages/taglib/taglib_1.4.bb | 43 | ||||
| -rw-r--r-- | packages/taglib/taglibc_1.4.bb | 33 |
5 files changed, 14 insertions, 64 deletions
diff --git a/packages/e17/enna_cvs.bb b/packages/e17/enna_cvs.bb index 3ea77940b4..4f50b118f3 100644 --- a/packages/e17/enna_cvs.bb +++ b/packages/e17/enna_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Enna is a media center application based on EFL" LICENSE = "GPL" DEPENDS = "curl dbus eet evas edje ecore edbus emotion" -DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglibc" +DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib" SECTION = "x11/multimedia" PV = "0.2.0+cvs${SRCDATE}" diff --git a/packages/taglib/files/.mtn2git_empty b/packages/taglib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/taglib/files/.mtn2git_empty diff --git a/packages/taglib/files/taglib_1.4-8.diff.gz b/packages/taglib/files/taglib_1.4-8.diff.gz Binary files differnew file mode 100644 index 0000000000..f128f4d3de --- /dev/null +++ b/packages/taglib/files/taglib_1.4-8.diff.gz diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb index 43fb2a2bfa..e50eeb6490 100644 --- a/packages/taglib/taglib_1.4.bb +++ b/packages/taglib/taglib_1.4.bb @@ -1,41 +1,24 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats" -SECTION = "libs" +SECTION = "libs/multimedia" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" LICENSE = "LGPL" -PR = "r1" +PR = "r2" -SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz" +SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ + file://taglib_1.4-8.diff.gz;patch=1" S = "${WORKDIR}/taglib-${PV}" -inherit autotools qmake_base pkgconfig binconfig +inherit autotools pkgconfig binconfig -export OE_QMAKE_LINK="${CXX}" - -do_configure() { - # calling oe_runconf to generate pkgconfig and binconfig files - oe_runconf - cd ${S}/taglib && rm -f Makefile* && qmake -project -o tag.pro -t lib && \ - qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S} -} - -do_compile() { - oe_runmake -C taglib +do_postpatch() { + rm -rf patches && rm -rf .pc && mv -f debian/patches patches && quilt push -av } +addtask postpatch after do_patch before do_configure -do_stage_append() { - install -d ${STAGING_INCDIR}/taglib - for i in `find taglib -name "*.h"` - do - install $i ${STAGING_INCDIR}/taglib/ - done - for i in `find taglib -name "*.tcc"` - do - install $i ${STAGING_INCDIR}/taglib/ - done - oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR} +do_stage() { + autotools_stage_all } -do_install() { - install -d ${D}${libdir} - oe_libinstall -so -C taglib libtag ${D}${libdir} -} +PACKAGES =+ "${PN}-c" +FILES_${PN}-dbg += "${bindir}/taglib-config" +FILES_${PN}-c = "${libdir}/libtag_c.so.*" diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb deleted file mode 100644 index 1a3a702bb9..0000000000 --- a/packages/taglib/taglibc_1.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "TagLib is a library for reading and editing the meta-data \ -of several popular audio formats. Currently it supports both ID3v1 and ID3v2 \ -for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC files" -SECTION = "libs" -HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" -DEPENDS = "taglib" -LICENSE = "LGPL" - -SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz" -S = "${WORKDIR}/taglib-${PV}" - -inherit autotools qmake_base pkgconfig binconfig - -do_configure() { - echo running oe_runconf to get pkgconfig and binconfig files created - oe_runconf - cd ${S}/bindings/c && rm -f Makefile* && qmake -project -o tag_c.pro -t lib && \ - qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${STAGING_INCDIR}/taglib LIBS+=-ltag -} - -do_compile() { - oe_runmake -C bindings/c -} - -do_stage_append() { - install -d ${STAGING_INCDIR}/taglib - install -m 0644 bindings/c/tag_c.h ${STAGING_INCDIR} - oe_libinstall -so -C bindings/c libtag_c ${STAGING_LIBDIR} -} - -do_install() { - oe_libinstall -so -C bindings/c libtag_c ${D}${libdir} -} |