summaryrefslogtreecommitdiffstats
path: root/main/ffmpeg
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <b@bpiotrowski.pl>2013-10-10 08:36:45 +0200
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2013-10-10 08:37:56 +0200
commit82b580915a0a0ba4ef651fe9e30d579622d951db (patch)
tree13348c8f7a15169da4cd91d42a61bd677a73ddfb /main/ffmpeg
parentfd9020fe6dccbd84e1453800890883c9ed69c905 (diff)
downloadaports-82b580915a0a0ba4ef651fe9e30d579622d951db.tar.bz2
aports-82b580915a0a0ba4ef651fe9e30d579622d951db.tar.xz
main/ffmpeg: upgrade to 1.2.4
Diffstat (limited to 'main/ffmpeg')
-rw-r--r--main/ffmpeg/APKBUILD8
-rw-r--r--main/ffmpeg/pic.patch11
2 files changed, 4 insertions, 15 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 94b6d2867..54a7c567d 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ffmpeg
-pkgver=1.2.2
+pkgver=1.2.4
pkgrel=0
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
url="http://ffmpeg.org/"
@@ -75,15 +75,15 @@ libs() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
}
-md5sums="4997660dfc077922e37d0583f9322f6b ffmpeg-1.2.2.tar.bz2
+md5sums="f1cfdbaae308214beeb621746300de16 ffmpeg-1.2.4.tar.bz2
2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch
fad4fc1e886146a4a2befc8fda052d50 fix-defines.patch
2b6897f352583ee8efdc0c09ef27a30f fix-libv4l2-errors.patch"
-sha256sums="1cb29ec4951f5941ea43638ea1e3042e3d3215992bda03f45628e8c49cb21064 ffmpeg-1.2.2.tar.bz2
+sha256sums="3b96c8ce1b86575cd74f540e5b7a52681554289017d4b974e4efad2a09290ddf ffmpeg-1.2.4.tar.bz2
0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch
4ccac0cf75fe53685c4cdda4061f7248de9a9b98e11f8e3aed8e1822b94d35d1 fix-defines.patch
872236e91e393b62a1a9d7aebdf0c417314f874a67cef55ad37b39ee57cf9edb fix-libv4l2-errors.patch"
-sha512sums="555a9fee6c5017602396362a7d073d444ef7539f020a2437d9fa7849310a4956e716fd60a956e1074e6f57fd260bb00cd1c8178bcd4052a3bad0117c1683e8cf ffmpeg-1.2.2.tar.bz2
+sha512sums="9c3bf2b31cc0d0028cb83b9c4821073b7c11a0c24ca44f6353086e67c208c45840e71810d70309b655fb1e7b8bbe073f9ab7f336d8064c0e6130244a806a10b2 ffmpeg-1.2.4.tar.bz2
635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch
ea2630d4ae5383bc24a322318aa8c41af745145755333660deec4ed256096eca73a49c41a0921544dfaa53d8087378cb2b5654001332c7262ea39f18e5c472c8 fix-defines.patch
56bba30f200c748d47d60d2b18147522dbceec7e8c97f434d3dbfa239547113a3e9d3b280e22816adeafa994b22eefac4b968448afef1a07aa1c46d3ec359e68 fix-libv4l2-errors.patch"
diff --git a/main/ffmpeg/pic.patch b/main/ffmpeg/pic.patch
deleted file mode 100644
index 737e30dde..000000000
--- a/main/ffmpeg/pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libswscale/rgb2rgb.c.orig
-+++ ./libswscale/rgb2rgb.c
-@@ -159,7 +159,7 @@
- #define RENAME(a) a ## _C
- #include "rgb2rgb_template.c"
-
--#if ARCH_X86
-+#if ARCH_X86 && !defined(PIC)
-
- //MMX versions
- #undef RENAME