diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2013-03-19 13:29:40 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2013-03-19 13:29:40 +0000 |
| commit | 4917bfdb2896048d4ef634d7f12841cc7835b4de (patch) | |
| tree | b40da3974f8c07fc3b32036b36e70db57939bdcb /main/ffmpeg/APKBUILD | |
| parent | cdc6be738b7f8d118288c82d045f53776aa0fed5 (diff) | |
| download | aports-fcolista-4917bfdb2896048d4ef634d7f12841cc7835b4de.tar.bz2 aports-fcolista-4917bfdb2896048d4ef634d7f12841cc7835b4de.tar.xz | |
main/ffmpeg
Diffstat (limited to 'main/ffmpeg/APKBUILD')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 6b44b943c4..cde37f8048 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=1.1.2 -pkgrel=3 +pkgver=1.1.3 +pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" @@ -9,12 +9,7 @@ license="GPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl libvpx-dev - libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev -<<<<<<< HEAD - vo-aacenc-dev" -======= - v4l-utils-dev" ->>>>>>> 38cbbfaeafb21f57533ff98a232ffd99bd81d415 + libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev" depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 configure-dlvsym.patch" @@ -43,12 +38,6 @@ build() { --enable-libxvid \ --enable-libx264 \ --enable-libtheora \ -<<<<<<< HEAD - --enable-libvo-aacenc \ - --enable-version3 \ -======= - --enable-libv4l2 \ ->>>>>>> 38cbbfaeafb21f57533ff98a232ffd99bd81d415 --enable-nonfree \ --enable-postproc \ --enable-pic \ @@ -80,9 +69,15 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="7434c0b38be2ce9c4344d067cc0067f5 ffmpeg-1.1.2.tar.bz2 +md5sums="f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" +<<<<<<< HEAD sha256sums="dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce ffmpeg-1.1.2.tar.bz2 0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" sha512sums="b947d18c7ea7d371e772c97873b180c00b94025a8546eb4663e42f37fbf66d52b1ea8241219b6c4700bd8c12cfb6af12fb7d823f7632061c447e2d95e30f83aa ffmpeg-1.1.2.tar.bz2 +======= +sha256sums="a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 ffmpeg-1.1.3.tar.bz2 +0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" +sha512sums="56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 ffmpeg-1.1.3.tar.bz2 +>>>>>>> 7e618390d4ba971927b8052fd4c5e22796e2ce4a 635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch" |