diff options
author | Richard Purdie <richard@openedhand.com> | 2008-04-22 21:28:47 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-04-22 21:28:47 +0000 |
commit | 1cea70a354f155c2e802d1cd1b8d3218c099695b (patch) | |
tree | 7a0ac309f1c994724c8b942e747646718dbb4919 /meta/packages/libvorbis | |
parent | 9fac1c5e4354cceb892c0993bfbe687e8725e992 (diff) | |
download | poky-1cea70a354f155c2e802d1cd1b8d3218c099695b.tar.gz |
libvorbis: Remove now uneeded hack
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4313 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libvorbis')
-rw-r--r-- | meta/packages/libvorbis/libvorbis/makefile.patch | 14 | ||||
-rw-r--r-- | meta/packages/libvorbis/libvorbis_1.0.1.bb | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/meta/packages/libvorbis/libvorbis/makefile.patch b/meta/packages/libvorbis/libvorbis/makefile.patch deleted file mode 100644 index ecf41e357a..0000000000 --- a/meta/packages/libvorbis/libvorbis/makefile.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | # Breaks with libtool 2.2.2 | ||
2 | |||
3 | Index: libvorbis-1.0.1/examples/Makefile.am | ||
4 | =================================================================== | ||
5 | --- libvorbis-1.0.1.orig/examples/Makefile.am 2008-04-15 17:48:52.000000000 +0100 | ||
6 | +++ libvorbis-1.0.1/examples/Makefile.am 2008-04-15 17:48:57.000000000 +0100 | ||
7 | @@ -7,7 +7,6 @@ | ||
8 | noinst_PROGRAMS = decoder_example encoder_example chaining_example\ | ||
9 | vorbisfile_example seeking_example | ||
10 | |||
11 | -LDFLAGS = -all-static | ||
12 | LDADD = ../lib/libvorbis.la | ||
13 | |||
14 | decoder_example_SOURCES = decoder_example.c | ||
diff --git a/meta/packages/libvorbis/libvorbis_1.0.1.bb b/meta/packages/libvorbis/libvorbis_1.0.1.bb index 66e04ce582..6dd677a830 100644 --- a/meta/packages/libvorbis/libvorbis_1.0.1.bb +++ b/meta/packages/libvorbis/libvorbis_1.0.1.bb | |||
@@ -4,10 +4,9 @@ DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \ | |||
4 | that is free of intellectual property restrictions. libvorbis \ | 4 | that is free of intellectual property restrictions. libvorbis \ |
5 | is the main vorbis codec library." | 5 | is the main vorbis codec library." |
6 | LICENSE = "BSD" | 6 | LICENSE = "BSD" |
7 | PR = "r4" | 7 | PR = "r5" |
8 | 8 | ||
9 | SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \ | 9 | SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \ |
10 | file://makefile.patch;patch=1 \ | ||
11 | file://m4.patch;patch=1" | 10 | file://m4.patch;patch=1" |
12 | 11 | ||
13 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |