summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-15 16:50:54 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-15 16:50:54 +0000
commit76be5f46496eef8403b38d7f1a1624d0d5bcece0 (patch)
treef37854b8fbe17ea12e408637a3a9bf97b15bb5e0 /meta
parent142d32ee93905675b0ede7588046f8bb5d191bbc (diff)
downloadpoky-76be5f46496eef8403b38d7f1a1624d0d5bcece0.tar.gz
libtvorbis: Fix with libtool 2.2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4276 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libvorbis/libvorbis/m4.patch19
-rw-r--r--meta/packages/libvorbis/libvorbis/makefile.patch14
-rw-r--r--meta/packages/libvorbis/libvorbis_1.0.1.bb5
3 files changed, 34 insertions, 4 deletions
diff --git a/meta/packages/libvorbis/libvorbis/m4.patch b/meta/packages/libvorbis/libvorbis/m4.patch
index 797a6b62a5..a62f365c92 100644
--- a/meta/packages/libvorbis/libvorbis/m4.patch
+++ b/meta/packages/libvorbis/libvorbis/m4.patch
@@ -1,5 +1,7 @@
1--- libvorbis-1.0.1/vorbis.m4.orig 2002-08-14 20:25:39 +0200 1Index: libvorbis-1.0.1/vorbis.m4
2+++ libvorbis-1.0.1/vorbis.m4 2004-08-12 12:58:13 +0200 2===================================================================
3--- libvorbis-1.0.1.orig/vorbis.m4 2002-08-14 19:25:39.000000000 +0100
4+++ libvorbis-1.0.1/vorbis.m4 2008-04-15 15:43:15.000000000 +0100
3@@ -6,7 +6,7 @@ 5@@ -6,7 +6,7 @@
4 dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 6 dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
5 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS 7 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
@@ -9,3 +11,16 @@
9 [dnl 11 [dnl
10 dnl Get the cflags and libraries 12 dnl Get the cflags and libraries
11 dnl 13 dnl
14Index: libvorbis-1.0.1/acinclude.m4
15===================================================================
16--- libvorbis-1.0.1.orig/acinclude.m4 2008-04-15 17:46:44.000000000 +0100
17+++ libvorbis-1.0.1/acinclude.m4 2008-04-15 17:46:55.000000000 +0100
18@@ -8,7 +8,7 @@
19 dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
20 dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
21 dnl
22-AC_DEFUN(XIPH_PATH_OGG,
23+AC_DEFUN([XIPH_PATH_OGG],
24 [dnl
25 dnl Get the cflags and libraries
26 dnl
diff --git a/meta/packages/libvorbis/libvorbis/makefile.patch b/meta/packages/libvorbis/libvorbis/makefile.patch
new file mode 100644
index 0000000000..ecf41e357a
--- /dev/null
+++ b/meta/packages/libvorbis/libvorbis/makefile.patch
@@ -0,0 +1,14 @@
1# Breaks with libtool 2.2.2
2
3Index: 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 70f279403f..66e04ce582 100644
--- a/meta/packages/libvorbis/libvorbis_1.0.1.bb
+++ b/meta/packages/libvorbis/libvorbis_1.0.1.bb
@@ -4,10 +4,11 @@ DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
4that is free of intellectual property restrictions. libvorbis \ 4that is free of intellectual property restrictions. libvorbis \
5is the main vorbis codec library." 5is the main vorbis codec library."
6LICENSE = "BSD" 6LICENSE = "BSD"
7PR = "r3" 7PR = "r4"
8 8
9SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \ 9SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \
10 file://m4.patch;patch=1" 10 file://makefile.patch;patch=1 \
11 file://m4.patch;patch=1"
11 12
12inherit autotools pkgconfig 13inherit autotools pkgconfig
13 14