diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-16 13:22:26 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-16 13:22:26 +0000 |
| commit | 23c2b9b07811d28c4789abb2376503844f974183 (patch) | |
| tree | 080d6d919c6f346a9261df89fbbfcbf1502cae20 /main/ffmpeg | |
| parent | fbeef61a9ce524ecd64990f8a36470600cf52ba7 (diff) | |
| download | aports-23c2b9b07811d28c4789abb2376503844f974183.tar.bz2 aports-23c2b9b07811d28c4789abb2376503844f974183.tar.xz | |
main/ffmpeg: upgrade to 2.3
Diffstat (limited to 'main/ffmpeg')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 16 | ||||
| -rw-r--r-- | main/ffmpeg/configure-dlvsym.patch | 24 |
2 files changed, 19 insertions, 21 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index dbcf530ce1..1acff44633 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=2.2.4 -pkgrel=3 +pkgver=2.3 +pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" @@ -77,15 +77,15 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="5b85aea53d8dcd5b0f7b497f233bc101 ffmpeg-2.2.4.tar.bz2 -2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch +md5sums="00f98a030d21366b6583875d57d98c27 ffmpeg-2.3.tar.bz2 +d041c60890392d80f74a567523f4c54d configure-dlvsym.patch fad4fc1e886146a4a2befc8fda052d50 fix-defines.patch 2b6897f352583ee8efdc0c09ef27a30f fix-libv4l2-errors.patch" -sha256sums="ff18e584d5daca2291f598389c990a0f4ec31c74647d923e73839c336b80b73f ffmpeg-2.2.4.tar.bz2 -0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch +sha256sums="6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e ffmpeg-2.3.tar.bz2 +ffd6beadaea4cdbc1326fe396d8cd34b3efb791a865a32f64b3fe998b679c1d0 configure-dlvsym.patch 4ccac0cf75fe53685c4cdda4061f7248de9a9b98e11f8e3aed8e1822b94d35d1 fix-defines.patch 872236e91e393b62a1a9d7aebdf0c417314f874a67cef55ad37b39ee57cf9edb fix-libv4l2-errors.patch" -sha512sums="650fe1dbe0b6ef285ebee4f9f2df9afb22e9f10d00fc600c72b80b9585707c256cae51b21d68943bed10bf9f997169e148757c1f6db1564956e1431f7372d7cd ffmpeg-2.2.4.tar.bz2 -635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch +sha512sums="82bbe5109e426cbd3063f8b2edb3e2daa7f237c4fc46ca37907ab316351978b689f2e0c4d88645b2eb19582765072702f3a19a17c6b02dd11bccac3b41d27a03 ffmpeg-2.3.tar.bz2 +d9bb652093b1c2d03cead78bcafd59fc8305f36fe5359ac5d7caf038889f1239829e288c07e77a11bbef89de5fe54a5eae50a1c4718ec77137bb677ef9069e54 configure-dlvsym.patch ea2630d4ae5383bc24a322318aa8c41af745145755333660deec4ed256096eca73a49c41a0921544dfaa53d8087378cb2b5654001332c7262ea39f18e5c472c8 fix-defines.patch 56bba30f200c748d47d60d2b18147522dbceec7e8c97f434d3dbfa239547113a3e9d3b280e22816adeafa994b22eefac4b968448afef1a07aa1c46d3ec359e68 fix-libv4l2-errors.patch" diff --git a/main/ffmpeg/configure-dlvsym.patch b/main/ffmpeg/configure-dlvsym.patch index b48a8e7883..0e74e45b5c 100644 --- a/main/ffmpeg/configure-dlvsym.patch +++ b/main/ffmpeg/configure-dlvsym.patch @@ -1,18 +1,16 @@ -diff --git a/configure b/configure -index c54706a..b5b3225 100755 ---- a/configure -+++ b/configure -@@ -1053,6 +1053,7 @@ HAVE_LIST=" - dev_video_bktr_ioctl_bt848_h - dlfcn_h +--- ./configure.orig ++++ ./configure +@@ -1680,6 +1680,7 @@ + CoTaskMemFree + CryptGenRandom dlopen + dlvsym - dos_paths - ebp_available - ebx_available -@@ -3053,14 +3054,15 @@ check_ldflags -Wl,--warn-common - check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' - test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic + fcntl + flt_lim + fork +@@ -4997,14 +4998,15 @@ + -Wl,--wrap,sws_scale || + disable xmm_clobber_test +check_func dlvsym -lld echo "X{};" > $TMPV |