diff options
| -rw-r--r-- | meta/packages/libid3tag/files/id3tag.pc | 11 | ||||
| -rw-r--r-- | meta/packages/libid3tag/libid3tag/addpkgconfig.patch | 41 | ||||
| -rw-r--r-- | meta/packages/libid3tag/libid3tag_0.15.1b.bb | 16 |
3 files changed, 45 insertions, 23 deletions
diff --git a/meta/packages/libid3tag/files/id3tag.pc b/meta/packages/libid3tag/files/id3tag.pc deleted file mode 100644 index e68600068..000000000 --- a/meta/packages/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/meta/packages/libid3tag/libid3tag/addpkgconfig.patch b/meta/packages/libid3tag/libid3tag/addpkgconfig.patch new file mode 100644 index 000000000..07a8f6ec4 --- /dev/null +++ b/meta/packages/libid3tag/libid3tag/addpkgconfig.patch @@ -0,0 +1,41 @@ +Index: libid3tag-0.15.1b/Makefile.am +=================================================================== +--- libid3tag-0.15.1b.orig/Makefile.am 2009-07-29 09:29:20.000000000 +0100 ++++ libid3tag-0.15.1b/Makefile.am 2009-07-29 09:29:47.000000000 +0100 +@@ -27,6 +27,9 @@ + lib_LTLIBRARIES = libid3tag.la + include_HEADERS = id3tag.h + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = id3tag.pc ++ + ## From the libtool documentation on library versioning: + ## + ## CURRENT +Index: libid3tag-0.15.1b/configure.ac +=================================================================== +--- libid3tag-0.15.1b.orig/configure.ac 2009-07-29 09:27:15.000000000 +0100 ++++ libid3tag-0.15.1b/configure.ac 2009-07-29 09:27:45.000000000 +0100 +@@ -201,5 +201,5 @@ + dnl AC_SUBST(LTLIBOBJS) + + AC_CONFIG_FILES([Makefile msvc++/Makefile \ +- libid3tag.list]) ++ libid3tag.list id3tag.pc]) + AC_OUTPUT +Index: libid3tag-0.15.1b/id3tag.pc.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libid3tag-0.15.1b/id3tag.pc.in 2009-07-29 09:29:10.000000000 +0100 +@@ -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} diff --git a/meta/packages/libid3tag/libid3tag_0.15.1b.bb b/meta/packages/libid3tag/libid3tag_0.15.1b.bb index c9f4a0c0b..3b5a87e03 100644 --- a/meta/packages/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/packages/libid3tag/libid3tag_0.15.1b.bb @@ -2,22 +2,14 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "zlib" DESCRIPTION = "Library for interacting with ID3 tags." -LICENSE = "GPL" -PR = "r1" +LICENSE = "GPLv2" +PR = "r3" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \ - file://id3tag.pc" + file://addpkgconfig.patch;patch=1" S = "${WORKDIR}/libid3tag-${PV}" -inherit autotools pkgconfig +inherit autotools_stage pkgconfig EXTRA_OECONF = "-enable-speed" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/id3tag.pc ${S} -} -do_stage() { - oe_libinstall -so libid3tag ${STAGING_LIBDIR} - install -m 0644 id3tag.h ${STAGING_INCDIR} -} |