diff options
| author | Łukasz Jendrysik <scadu@yandex.com> | 2014-12-17 09:16:29 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-17 12:28:52 +0000 |
| commit | cd1cf3dd7308b223a5be4a6210fb5412e6cce096 (patch) | |
| tree | db2df62c5b5e97b203eabc3fb42abfab325428c3 | |
| parent | 1ad1088977f85accdabaed75634c45a81a6fdc2a (diff) | |
| download | aports-cd1cf3dd7308b223a5be4a6210fb5412e6cce096.tar.bz2 aports-cd1cf3dd7308b223a5be4a6210fb5412e6cce096.tar.xz | |
main/vlc: fix build against ffmpeg 2.5.1
| -rw-r--r-- | main/vlc/APKBUILD | 7 | ||||
| -rw-r--r-- | main/vlc/vlc-2.1.5-ffmpeg-2.5.patch | 15 |
2 files changed, 21 insertions, 1 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 38881a21f..cf6b3d7eb 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -1,10 +1,11 @@ +# Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vlc pkgver=2.1.5 _pkgver=${pkgver/_/-} _ver=${_pkgver%[a-z]} -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -112,6 +113,7 @@ source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pk 0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch 0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch 0010-omxil-rpi-codecs.patch + vlc-2.1.5-ffmpeg-2.5.patch vlc-libs.trigger" @@ -349,6 +351,7 @@ md5sums="3941b561f590cc95ca5e795213cba2f2 vlc-2.1.5.tar.xz 4209dd3c03001a921ece0f8647ecb1c5 0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch 616a2e6dc58810732146ea922819aea2 0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch d43b448ee0ba6980ecfc5fdfa655f473 0010-omxil-rpi-codecs.patch +068a1b792064bb1aff0765a3ffa8a27a vlc-2.1.5-ffmpeg-2.5.patch dd899a9926ad84db9446d92890a5aa3e vlc-libs.trigger" sha256sums="6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 vlc-2.1.5.tar.xz 0c802698c215dd2d2ad9a4889b1d46dfd5d6c304d4cd1b34bacb2bacc35dd3c9 fix-waitpid-usage.patch @@ -358,6 +361,7 @@ f9e5d27aa46cc4ebb929afaa30f53343eb40347915ec827cf461a42745fa525a 0002-omxil-vou 7709d3fa0090e4aa8fb21eff55320fa11b681e6b7a8faab24b4473645cda3112 0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch fe0b937e0b0a05b7d2cccd27dab49df77e84928e49fb148bae3d0effeb261d2f 0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch 11db39f206ddb968d6a4411c75bfa6102189cb8e784316c491dd964ee9a3dfaf 0010-omxil-rpi-codecs.patch +250949a9c984e5b98adbcf57c39a2d6508a10f18190fe072fb47a08ae42b478f vlc-2.1.5-ffmpeg-2.5.patch 1c93af2feb217a06f6adc3cd51def8f00eea431f9d26ace7b90c377f7e85fc7a vlc-libs.trigger" sha512sums="37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 vlc-2.1.5.tar.xz 3c6ff4f25b7e1f0041bc47872a2b59b6c4f8bc1747d6830e9f2d9c35ee75cd2581558a12225070dede37d6a2287b0fc5c089c8f4f8ae26784aa6aded7177bed0 fix-waitpid-usage.patch @@ -367,4 +371,5 @@ c276962f33c38ad64caa6c4f8ca673c4367635b8998ee8a1003047f89e652c535027c68a836822d9 db15b7488768b429f26e4e7fdf82259ffc834fa2bdf1461b297b36111aad87603f7b015b0855afb8bc797fb351311dee555bbef0dc0a5d029748b057a3c23f92 0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch a9bd6f622a9868de3e0a9f6643b906a73cabcfbc79ffebafbac00a45e3eec31cbb7bc9c9ec2748c58c928e95f45b29878ac78f654e5e658413687b60aaf52683 0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch 6fb242c37bd9af224b7bcd78702ac1b5612748c7363405e594c509288940a18ae4334f032497e9d6e11f83e870b9437a5c3197db0271123c95de24db63b8802e 0010-omxil-rpi-codecs.patch +b741e90e59eb01b7ec1ac8e99a69379eb5addcc311a9d9a0a70ed367258dfc77c607ceaffe63a5be566d3784e97eb76bca81a67bdabba4237718ff1401a917e5 vlc-2.1.5-ffmpeg-2.5.patch b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406 vlc-libs.trigger" diff --git a/main/vlc/vlc-2.1.5-ffmpeg-2.5.patch b/main/vlc/vlc-2.1.5-ffmpeg-2.5.patch new file mode 100644 index 000000000..2bd0949ec --- /dev/null +++ b/main/vlc/vlc-2.1.5-ffmpeg-2.5.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index a684338..053713a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec, + [ --enable-avcodec libavcodec codec (default enabled)]) + AS_IF([test "${enable_avcodec}" != "no"], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ +- PKG_CHECK_EXISTS([libavcodec < 56],, [ +- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) ++ PKG_CHECK_EXISTS([libavcodec < 57],, [ ++ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" |