diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-07-20 12:16:55 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-07-20 12:16:55 +0000 |
| commit | 3223fbd9a2002c79ba09633596c70e5f483094d4 (patch) | |
| tree | 5b64c4a7c4f381d105998030defbfd7bcdfb9c7e /packages | |
| parent | 4a65a66b9482e6af22b7288602bd03e915cc3745 (diff) | |
pulseaudio: fix libtool linking
* pulseaudio authoir did not understand AM_ICONV and what $(LTLIBICONV)
and $(LIBICONV) are for, problem accurs under uclibc
* add patch which fixes the issue
* bum PR
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch | 22 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.10.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch b/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch new file mode 100644 index 0000000000..273b446d78 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch @@ -0,0 +1,22 @@ +Index: pulseaudio-0.9.10/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-07-20 13:16:51.548858829 +0200 ++++ pulseaudio-0.9.10/src/Makefile.am 2008-07-20 13:43:39.842031837 +0200 +@@ -551,7 +551,7 @@ + + libpulse_la_CFLAGS = $(AM_CFLAGS) + libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file +-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV) ++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) + + if HAVE_X11 + libpulse_la_CFLAGS += $(X_CFLAGS) +@@ -771,7 +771,7 @@ + + libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS) + libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO) +-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la ++libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la + + ################################### + # Plug-in support libraries # diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb index 8c858f9015..8da4a1c7da 100644 --- a/packages/pulseaudio/pulseaudio_0.9.10.bb +++ b/packages/pulseaudio/pulseaudio_0.9.10.bb @@ -1,7 +1,7 @@ require pulseaudio.inc DEPENDS += "dbus" -PR = "r3" +PR = "r4" SRC_URI += "\ file://disable-using-glibc-tls.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI += "\ # file://libtool2.patch;patch=1 \ file://2113.diff;patch=1;pnum=0 \ file://2114.diff;patch=1;pnum=0 \ + file://libiconv.patch;patch=1 \ " do_compile_prepend() { |