summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-11 16:10:23 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-11 16:10:23 +0000
commit78b5898fc93c309b68c76a9fe09c34e8045e228b (patch)
treede2465466e649dc55c13eb2b622f68c0494220d1 /meta/packages
parent4da5771577fc6424039bb4ef767d98dbc860888b (diff)
downloadpoky-78b5898fc93c309b68c76a9fe09c34e8045e228b.tar.gz
libmad: add pkg-config support
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3469 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/libmad/files/add-pkgconfig.patch68
-rw-r--r--meta/packages/libmad/libmad_0.15.1b.bb5
2 files changed, 72 insertions, 1 deletions
diff --git a/meta/packages/libmad/files/add-pkgconfig.patch b/meta/packages/libmad/files/add-pkgconfig.patch
new file mode 100644
index 0000000000..636b27a928
--- /dev/null
+++ b/meta/packages/libmad/files/add-pkgconfig.patch
@@ -0,0 +1,68 @@
1Here is a patch for adding pkg-config support to libmad.
2It would make life a bit easier for distro maintainers if this was applied.
3In case you didn't know, pkg-config is a tool for providing LDFLAGS and
4CFLAGS for packages using shared libraries. It's on freedesktop.org.
5Debian has already been distributing the pkg-config file mad.pc with
6libmad for some time, and people developing on debian (notably xmms2
7developers) have started relying on this support being present, causing
8some confusion for people installing from source and on some BSDs which
9do not provide mad.pc (google: pkgconfig libmad).
10
11EMH
12
13--h31gzZEtNLTqOjlF
14Content-Type: text/plain; charset=us-ascii
15Content-Disposition: attachment; filename=&quot;libmad-0.15.1b-pkgconfig.patch&quot;
16
17diff -Naur libmad-0.15.1b.old/configure.ac libmad-0.15.1b/configure.ac
18--- libmad-0.15.1b.old/configure.ac 2004-01-23 10:41:32.000000000 +0100
19+++ libmad-0.15.1b/configure.ac 2004-08-07 02:25:24.633462168 +0200
20@@ -429,5 +429,5 @@
21 dnl AC_SUBST(LTLIBOBJS)
22
23 AC_CONFIG_FILES([Makefile msvc++/Makefile \
24- libmad.list])
25+ libmad.list mad.pc])
26 AC_OUTPUT
27diff -Naur libmad-0.15.1b.old/mad.pc.in libmad-0.15.1b/mad.pc.in
28--- libmad-0.15.1b.old/mad.pc.in 1970-01-01 01:00:00.000000000 +0100
29+++ libmad-0.15.1b/mad.pc.in 2004-08-07 02:04:59.617692872 +0200
30@@ -0,0 +1,14 @@
31+# libmad pkg-config source file
32+
33+prefix=@prefix@
34+exec_prefix=@exec_prefix@
35+libdir=@libdir@
36+includedir=@includedir@
37+
38+Name: mad
39+Description: MPEG Audio Decoder
40+Version: @VERSION@
41+Requires:
42+Conflicts:
43+Libs: -L${libdir} -lmad -lm
44+Cflags: -I${includedir}
45diff -Naur libmad-0.15.1b.old/Makefile.am libmad-0.15.1b/Makefile.am
46--- libmad-0.15.1b.old/Makefile.am 2004-02-17 03:02:03.000000000 +0100
47+++ libmad-0.15.1b/Makefile.am 2004-08-07 02:03:19.859858368 +0200
48@@ -24,6 +24,9 @@
49 SUBDIRS =
50 DIST_SUBDIRS = msvc++
51
52+pkgconfigdir = $(libdir)/pkgconfig
53+pkgconfig_DATA = mad.pc
54+
55 lib_LTLIBRARIES = libmad.la
56 include_HEADERS = mad.h
57
58@@ -34,7 +37,8 @@
59 minimad_LDADD = libmad.la
60
61 EXTRA_DIST = mad.h.sed \
62- CHANGES COPYRIGHT CREDITS README TODO VERSION
63+ CHANGES COPYRIGHT CREDITS README TODO VERSION \
64+ mad.pc.in
65
66 exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \
67 synth.h decoder.h
68
diff --git a/meta/packages/libmad/libmad_0.15.1b.bb b/meta/packages/libmad/libmad_0.15.1b.bb
index a43186bc4f..768d63d470 100644
--- a/meta/packages/libmad/libmad_0.15.1b.bb
+++ b/meta/packages/libmad/libmad_0.15.1b.bb
@@ -3,11 +3,14 @@ SECTION = "libs"
3PRIORITY = "optional" 3PRIORITY = "optional"
4DEPENDS = "libid3tag" 4DEPENDS = "libid3tag"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r1"
6 7
7SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz" 8SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz"
9 file://add-pkgconfig.patch;patch=1"
10
8S = "${WORKDIR}/libmad-${PV}" 11S = "${WORKDIR}/libmad-${PV}"
9 12
10inherit autotools 13inherit autotools pkgconfig
11 14
12EXTRA_OECONF = "-enable-speed --enable-shared" 15EXTRA_OECONF = "-enable-speed --enable-shared"
13# The ASO's don't take any account of thumb... 16# The ASO's don't take any account of thumb...