Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=a765708f9f628a38ad79b2746ce35c37754a1468
commit a765708f9f628a38ad79b2746ce35c37754a1468 Author: James Buren <[email protected]> Date: Mon Oct 29 01:03:39 2012 -0500 alsa-plugins-1.0.26-1-x86_64 * version bump * rebuild with ffmpeg diff --git a/source/multimedia/alsa-plugins/FrugalBuild b/source/multimedia/alsa-plugins/FrugalBuild index 9fb7e17..dcb2c2d 100644 --- a/source/multimedia/alsa-plugins/FrugalBuild +++ b/source/multimedia/alsa-plugins/FrugalBuild @@ -3,25 +3,25 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=alsa-plugins -pkgver=1.0.25 -pkgrel=2 +pkgver=1.0.26 +pkgrel=1 pkgdesc="Various plugins for ALSA." url="http://www.alsa-project.org"; -depends=("alsa-lib>=1.0.25") -makedepends=('pulseaudio>=2.1') +depends=("alsa-lib>=1.0.26") options=('scriptlet') groups=('multimedia') archs=('i686' 'x86_64') _F_archive_grepv='rc' up2date="Flasttar $url" -source=(ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2) -sha1sums=('ab66de081c5b0137943658a2991ba3d5efe91573') +source=(http://ftp.frugalware.org/pub/other/sources/alsa/$pkgname-$pkgver.tar.xz ffmpeg.patch) +sha1sums=('7ac117bba6250ee7136e8eb3e98198910e4f0187' \ + 'e053e8efd5d8ae5b7fdadfe31aa89d8cefc5809d') subname="alsa-plugin" subdesc="ALSA plugin for" subprefix="/usr/lib/alsa-lib/libasound_module" -Faddsubpkg "$subname-ffmpeg" "$subdesc ffmpeg." "ffmpeg" "$pkgname=$pkgver" +Faddsubpkg "$subname-ffmpeg" "$subdesc ffmpeg." "ffmpeg>=1.0" "$pkgname=$pkgver" Faddsubpkg "$subname-jack" "$subdesc jack." "jack" "$pkgname=$pkgver" Faddsubpkg "$subname-pulseaudio" "$subdesc pulseaudio." "libpulse" "$pkgname=$pkgver" Faddsubpkg "$subname-speex" "$subdesc speex." "speex" "$pkgname=$pkgver" @@ -29,6 +29,9 @@ Faddsubpkg "$subname-samplerate" "$subdesc samplerate." "libsamplerate" "$pkgnam build() { + export GITCOMPILE_NO_MAKE=y + Fcd + ./gitcompile || Fdie Fbuild Fsplit $subname-ffmpeg ${subprefix}_{pcm_a52,rate_lavcrate}\* Fsplit $subname-jack ${subprefix}_pcm_jack\* diff --git a/source/multimedia/alsa-plugins/ffmpeg.patch b/source/multimedia/alsa-plugins/ffmpeg.patch new file mode 100644 index 0000000..574884a --- /dev/null +++ b/source/multimedia/alsa-plugins/ffmpeg.patch @@ -0,0 +1,34 @@ +diff -ur a/a52/pcm_a52.c b/a52/pcm_a52.c +--- a/a52/pcm_a52.c 2012-09-06 02:52:58.000000000 -0500 ++++ b/a52/pcm_a52.c 2012-10-29 01:02:11.280092390 -0500 +@@ -441,7 +441,21 @@ + #else + rec->avctx->sample_fmt = SAMPLE_FMT_S16; + #endif +-#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) ++#if (LIBAVCODEC_VERSION_MAJOR >= 54) ++ switch (io->channels) { ++ case 2: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; ++ break; ++ case 4: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; ++ break; ++ case 6: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; ++ break; ++ default: ++ break; ++ } ++#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) + switch (io->channels) { + case 2: + rec->avctx->channel_layout = CH_LAYOUT_STEREO; +@@ -702,7 +716,6 @@ + rec->channels = channels; + rec->format = format; + +- avcodec_init(); + avcodec_register_all(); + + rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
