[oe-commits] Andreas Oberritter : libid3tag: patch libid3tag.pc.in into source tree, update recipe

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b92a5ec362603f3de9b983128c0a9c464cc4bb65
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b92a5ec362603f3de9b983128c0a9c464cc4bb65

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Mon Oct 25 03:01:06 2010 +0000

libid3tag: patch libid3tag.pc.in into source tree, update recipe

* set SECTION to libs/multimedia
* bump PR
* oe-stylize

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 recipes/libid3tag/files/id3tag.pc                  |   11 ------
 recipes/libid3tag/files/libid3tag-pkg-config.patch |   38 ++++++++++++++++++++
 recipes/libid3tag/libid3tag_0.15.1b.bb             |   21 ++++-------
 3 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/recipes/libid3tag/files/id3tag.pc b/recipes/libid3tag/files/id3tag.pc
deleted file mode 100644
index e686000..0000000
--- a/recipes/libid3tag/files/id3tag.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: id3tag
-Description: ID3 tag reading library
-Requires:
-Version: 0.15.0b
-Libs: -L${libdir} -lid3tag -lz
-Cflags: -I${includedir}
diff --git a/recipes/libid3tag/files/libid3tag-pkg-config.patch b/recipes/libid3tag/files/libid3tag-pkg-config.patch
new file mode 100644
index 0000000..16da613
--- /dev/null
+++ b/recipes/libid3tag/files/libid3tag-pkg-config.patch
@@ -0,0 +1,38 @@
+upstream: unmaintained
+source: http://gentoo.mindzoo.de/index.cgi/export/586/openmoko/trunk/openmoko-target/media-libs/libid3tag/files/0.15.1b/libid3tag-pkg-config.patch
+
+--- /dev/null	2009-07-02 12:43:53.540375369 +0200
++++ b/id3tag.pc.in	2009-07-02 16:19:21.000000000 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: id3tag
++Description: ID3 tag reading library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lid3tag -lz
++Cflags: -I${includedir}
+--- a/Makefile.am	2004-02-17 03:11:28.000000000 +0100
++++ b/Makefile.am	2009-07-02 16:17:35.000000000 +0200
+@@ -94,6 +94,9 @@
+ 
+ BUILT_SOURCES =		frametype.c compat.c genre.dat
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = id3tag.pc
++
+ $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am
+ 	cd $(srcdir) &&  \
+ 	gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*'  \
+--- a/configure.ac	2004-01-24 00:22:46.000000000 +0100
++++ b/configure.ac	2009-07-02 16:19:00.000000000 +0200
+@@ -201,5 +201,5 @@
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libid3tag.list])
++	libid3tag.list id3tag.pc])
+ AC_OUTPUT
diff --git a/recipes/libid3tag/libid3tag_0.15.1b.bb b/recipes/libid3tag/libid3tag_0.15.1b.bb
index 7675dc3..c7869da 100644
--- a/recipes/libid3tag/libid3tag_0.15.1b.bb
+++ b/recipes/libid3tag/libid3tag_0.15.1b.bb
@@ -1,22 +1,15 @@
-SECTION = "libs"
+DESCRIPTION = "Library for interacting with ID3 tags"
+SECTION = "libs/multimedia"
 PRIORITY = "optional"
-DEPENDS = "zlib"
-DESCRIPTION = "Library for interacting with ID3 tags."
 LICENSE = "GPL"
-PR = "r2"
+DEPENDS = "zlib"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
-           file://id3tag.pc"
-
-S = "${WORKDIR}/libid3tag-${PV}"
+           file://libid3tag-pkg-config.patch"
+SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3"
+SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "-enable-speed"
-
-do_configure_prepend() {
-    install -m 0644 ${WORKDIR}/id3tag.pc ${S}
-}
-
-SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3"
-SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"