Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9fa6c958c317c081bf0d88d9115f3bdd6cf7cd59
commit 9fa6c958c317c081bf0d88d9115f3bdd6cf7cd59 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sat Feb 9 11:37:32 2013 +0100 alsa-plugins-1.0.26-2-x86_64 - fix build - t/deps-xorg-i686: fix alsa-plugin-ffmpeg and alsa-plugin-pulseaudio diff --git a/source/multimedia/alsa-plugins/FrugalBuild b/source/multimedia/alsa-plugins/FrugalBuild index dcb2c2d..d44ddc7 100644 --- a/source/multimedia/alsa-plugins/FrugalBuild +++ b/source/multimedia/alsa-plugins/FrugalBuild @@ -4,7 +4,7 @@ pkgname=alsa-plugins pkgver=1.0.26 -pkgrel=1 +pkgrel=2 pkgdesc="Various plugins for ALSA." url="http://www.alsa-project.org"; depends=("alsa-lib>=1.0.26") @@ -13,26 +13,28 @@ groups=('multimedia') archs=('i686' 'x86_64') _F_archive_grepv='rc' up2date="Flasttar $url" -source=(http://ftp.frugalware.org/pub/other/sources/alsa/$pkgname-$pkgver.tar.xz ffmpeg.patch) +source=(http://ftp.frugalware.org/pub/other/sources/alsa/$pkgname-$pkgver.tar.xz ffmpeg.patch use_libavutil.patch) sha1sums=('7ac117bba6250ee7136e8eb3e98198910e4f0187' \ - 'e053e8efd5d8ae5b7fdadfe31aa89d8cefc5809d') + 'e053e8efd5d8ae5b7fdadfe31aa89d8cefc5809d' \ + 'ef9c284aff86e3772053ef9fc00aadffe65c6f9e') subname="alsa-plugin" subdesc="ALSA plugin for" subprefix="/usr/lib/alsa-lib/libasound_module" -Faddsubpkg "$subname-ffmpeg" "$subdesc ffmpeg." "ffmpeg>=1.0" "$pkgname=$pkgver" +Faddsubpkg "$subname-ffmpeg" "$subdesc ffmpeg." "ffmpeg>=1.0" "$pkgname=$pkgver" "" "" "" "" "" "" "" "" "xmultimedia" Faddsubpkg "$subname-jack" "$subdesc jack." "jack" "$pkgname=$pkgver" -Faddsubpkg "$subname-pulseaudio" "$subdesc pulseaudio." "libpulse" "$pkgname=$pkgver" +Faddsubpkg "$subname-pulseaudio" "$subdesc pulseaudio." "libpulse" "$pkgname=$pkgver" "" "" "" "" "" "" "" "" "xmultimedia" Faddsubpkg "$subname-speex" "$subdesc speex." "speex" "$pkgname=$pkgver" Faddsubpkg "$subname-samplerate" "$subdesc samplerate." "libsamplerate" "$pkgname=$pkgver" build() { export GITCOMPILE_NO_MAKE=y - Fcd + Fpatchall ./gitcompile || Fdie - Fbuild + Fmake + Fmakeinstall Fsplit $subname-ffmpeg ${subprefix}_{pcm_a52,rate_lavcrate}\* Fsplit $subname-jack ${subprefix}_pcm_jack\* Fsplit $subname-pulseaudio ${subprefix}_{ctl,pcm,conf}_pulse\* diff --git a/source/multimedia/alsa-plugins/use_libavutil.patch b/source/multimedia/alsa-plugins/use_libavutil.patch new file mode 100644 index 0000000..c31b29a --- /dev/null +++ b/source/multimedia/alsa-plugins/use_libavutil.patch @@ -0,0 +1,34 @@ +Author: Jordi Mallach <jo...@debian.org> +Description: Check for and include libavutil.h to avoid unresolved symbols. + The a52 plugin uses av_free(), but does not check for libavutil + availability. Patch configure.in to check for the module, and include + libavutil.h. + . + The patch needs to be extended to do proper checks for avutil header files. +Forwarded: no + +Index: alsa-plugins-1.0.25/configure.in +=================================================================== +--- alsa-plugins-1.0.25.orig/configure.in 2012-01-25 08:57:07.000000000 +0100 ++++ alsa-plugins-1.0.25/configure.in 2012-02-11 22:22:41.439521425 +0100 +@@ -67,7 +67,7 @@ + AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)])) + + if test "x$enable_avcodec" != "xno"; then +- PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) ++ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) + fi + + if test "x$HAVE_AVCODEC" = "xno"; then +Index: alsa-plugins-1.0.25/a52/pcm_a52.c +=================================================================== +--- alsa-plugins-1.0.25.orig/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 ++++ alsa-plugins-1.0.25/a52/pcm_a52.c 2012-02-11 22:28:58.219502171 +0100 +@@ -26,6 +26,7 @@ + #include <alsa/pcm_external.h> + #include <alsa/pcm_plugin.h> + #include AVCODEC_HEADER ++#include <libavutil/avutil.h> + + struct a52_ctx { + snd_pcm_ioplug_t io; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
