[oe-commits] org.oe.dev taglib 1.4 fix packaging, fix buildsystem (thanks to debian patch), remove taglibc

[mickeyl commit]

taglib 1.4 fix packaging, fix buildsystem (thanks to debian patch), remove taglibc

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 95c3495ce460c2f8f04e1188464c72bde51ce0c9
ViewMTN: http://monotone.openembedded.org/revision/info/95c3495ce460c2f8f04e1188464c72bde51ce0c9
Files:
1
packages/taglib/taglibc_1.4.bb
packages/taglib/files
packages/taglib/files/taglib_1.4-8.diff.gz
packages/taglib/taglib_1.4.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r97d9e99a391636b455c9569d4c591db317bcc4b8 -r95c3495ce460c2f8f04e1188464c72bde51ce0c9
#
# 
# 
# delete "packages/taglib/taglibc_1.4.bb"
# 
# add_dir "packages/taglib/files"
# 
# add_file "packages/taglib/files/taglib_1.4-8.diff.gz"
#  content [c71a982f1f2f332c4477100d574d2031d3bf4b18]
# 
# patch "packages/taglib/taglib_1.4.bb"
#  from [ba6c47f548d00f94ed177f8934c40cbaea043095]
#    to [be06346f9694f8bab9ce367bdfcaeff9f45d0345]
# 
#   set "packages/taglib/files/taglib_1.4-8.diff.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# packages/taglib/files/taglib_1.4-8.diff.gz is binary
============================================================
--- packages/taglib/taglib_1.4.bb	ba6c47f548d00f94ed177f8934c40cbaea043095
+++ packages/taglib/taglib_1.4.bb	be06346f9694f8bab9ce367bdfcaeff9f45d0345
@@ -1,41 +1,24 @@ DESCRIPTION = "TagLib is a library for r
 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_postpatch() {
+	rm -rf patches && rm -rf .pc && mv -f debian/patches patches && quilt push -av
 }
+addtask postpatch after do_patch before do_configure
 
-do_compile() {
-	oe_runmake -C taglib
+do_stage() {
+	autotools_stage_all
 }
 
+PACKAGES =+ "${PN}-c"
+FILES_${PN}-dbg += "${bindir}/taglib-config"
+FILES_${PN}-c = "${libdir}/libtag_c.so.*"
-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_install() {
-	install -d ${D}${libdir}
-	oe_libinstall -so -C taglib libtag ${D}${libdir}
-}