diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/pulseaudio | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/pulseaudio')
| -rw-r--r-- | package/pulseaudio/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index ddca9a233..6e095a668 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= pulseaudio PKG_VERSION:= 4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3 -PKG_DESCR:= sound system for POSIX OSes -PKG_SECTION:= multimedia +PKG_DESCR:= sound system +PKG_SECTION:= mm/audio PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile PKG_DEPENDS+= libpthread librt alsa-lib libsamplerate |