aboutsummaryrefslogtreecommitdiffstats
path: root/main/ffmpeg
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-10-07 13:40:57 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-10-07 13:40:57 +0000
commitdb616839c83b258c2d587e2a6f9c38939a137429 (patch)
tree13e729d343c784912122f146ff87b90008327e63 /main/ffmpeg
parent20d9cf8f35cd0bc4506cfb2e4302deb18f10b405 (diff)
downloadaports-db616839c83b258c2d587e2a6f9c38939a137429.tar.bz2
aports-db616839c83b258c2d587e2a6f9c38939a137429.tar.xz
main/ffmpeg: fix musl build
Diffstat (limited to 'main/ffmpeg')
-rw-r--r--main/ffmpeg/APKBUILD4
-rw-r--r--main/ffmpeg/fix-defines.patch10
2 files changed, 14 insertions, 0 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 7ded5766dd..94b6d28670 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -14,6 +14,7 @@ makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev
depends=
source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
configure-dlvsym.patch
+ fix-defines.patch
fix-libv4l2-errors.patch"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -76,10 +77,13 @@ libs() {
md5sums="4997660dfc077922e37d0583f9322f6b ffmpeg-1.2.2.tar.bz2
2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch
+fad4fc1e886146a4a2befc8fda052d50 fix-defines.patch
2b6897f352583ee8efdc0c09ef27a30f fix-libv4l2-errors.patch"
sha256sums="1cb29ec4951f5941ea43638ea1e3042e3d3215992bda03f45628e8c49cb21064 ffmpeg-1.2.2.tar.bz2
0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch
+4ccac0cf75fe53685c4cdda4061f7248de9a9b98e11f8e3aed8e1822b94d35d1 fix-defines.patch
872236e91e393b62a1a9d7aebdf0c417314f874a67cef55ad37b39ee57cf9edb fix-libv4l2-errors.patch"
sha512sums="555a9fee6c5017602396362a7d073d444ef7539f020a2437d9fa7849310a4956e716fd60a956e1074e6f57fd260bb00cd1c8178bcd4052a3bad0117c1683e8cf ffmpeg-1.2.2.tar.bz2
635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch
+ea2630d4ae5383bc24a322318aa8c41af745145755333660deec4ed256096eca73a49c41a0921544dfaa53d8087378cb2b5654001332c7262ea39f18e5c472c8 fix-defines.patch
56bba30f200c748d47d60d2b18147522dbceec7e8c97f434d3dbfa239547113a3e9d3b280e22816adeafa994b22eefac4b968448afef1a07aa1c46d3ec359e68 fix-libv4l2-errors.patch"
diff --git a/main/ffmpeg/fix-defines.patch b/main/ffmpeg/fix-defines.patch
new file mode 100644
index 0000000000..8479e8b8d3
--- /dev/null
+++ b/main/ffmpeg/fix-defines.patch
@@ -0,0 +1,10 @@
+--- ffmpeg-1.2.2.orig/libavutil/error.c
++++ ffmpeg-1.2.2/libavutil/error.c
+@@ -17,6 +17,7 @@
+ */
+
+ #undef _GNU_SOURCE
++#define _XOPEN_SOURCE 600
+ #include "avutil.h"
+ #include "avstring.h"
+ #include "common.h"