diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-29 16:16:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-31 12:48:15 +0000 |
| commit | 60a6f8ab71d314046189830d011bf6c3b78db322 (patch) | |
| tree | 5cd5b32028f9294d2590dc2f8b6e7e93b5b53326 /main | |
| parent | 8cd583453648f2731f4ebb37e1a1357d6d25082c (diff) | |
| download | aports-60a6f8ab71d314046189830d011bf6c3b78db322.tar.bz2 aports-60a6f8ab71d314046189830d011bf6c3b78db322.tar.xz | |
main/moc: rebuild against ffmpeg-3.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/moc/APKBUILD | 15 | ||||
| -rw-r--r-- | main/moc/ffmpeg-3.patch | 14 |
2 files changed, 24 insertions, 5 deletions
diff --git a/main/moc/APKBUILD b/main/moc/APKBUILD index ad8e7f8875..a6ecc6fdd2 100644 --- a/main/moc/APKBUILD +++ b/main/moc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to> pkgname=moc pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="MOC is a console audio player" url="http://moc.daper.net/" arch="all" @@ -13,7 +13,9 @@ makedepends="curl-dev libtool file ffmpeg-dev speex-dev alsa-lib-dev libmodplug-dev faad2-dev jack-dev libmad-dev ncurses-dev" install="" subpackages="$pkgname-doc" -source="http://ftp.daper.net/pub/soft/moc/stable/moc-${pkgver}.tar.bz2" +source="http://ftp.daper.net/pub/soft/moc/stable/moc-${pkgver}.tar.bz2 + ffmpeg-3.patch + " _builddir="${srcdir}/${pkgname}-${pkgver}" prepare() { @@ -60,6 +62,9 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums="18e3a979b67091bfee4b62217908c473 moc-2.5.0.tar.bz2" -sha256sums="d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091 moc-2.5.0.tar.bz2" -sha512sums="ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c moc-2.5.0.tar.bz2" +md5sums="18e3a979b67091bfee4b62217908c473 moc-2.5.0.tar.bz2 +d43483c3c55a323dfcbdb29681879601 ffmpeg-3.patch" +sha256sums="d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091 moc-2.5.0.tar.bz2 +8c8e70f6bcecff99e9bd8ada1ee4d07ad5a0b6f8f6585c7be26ff39d04ec9ec9 ffmpeg-3.patch" +sha512sums="ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c moc-2.5.0.tar.bz2 +e060063d09263eec789e03dc0e6e1970bb3944e70e43fc2fa680b492f62c0a903eff8ef0001afc96cd668c5488afad3a863749be114165f75e7395f2e7ef78bc ffmpeg-3.patch" diff --git a/main/moc/ffmpeg-3.patch b/main/moc/ffmpeg-3.patch new file mode 100644 index 0000000000..f6d3225444 --- /dev/null +++ b/main/moc/ffmpeg-3.patch @@ -0,0 +1,14 @@ +diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c +index 206b2b1..6af6759 100644 +--- a/decoder_plugins/ffmpeg/ffmpeg.c ++++ b/decoder_plugins/ffmpeg/ffmpeg.c +@@ -66,9 +66,6 @@ GCC_DIAG_OFF(deprecated-declarations) + #include <libavformat/avformat.h> + GCC_DIAG_ON(deprecated-declarations) + #include <libavutil/mathematics.h> +-#ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS +-#include <libavutil/audioconvert.h> +-#endif + #else + #include <ffmpeg/avformat.h> + #endif |