diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2013-03-13 07:08:54 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2013-03-13 07:08:54 +0000 |
| commit | cdc6be738b7f8d118288c82d045f53776aa0fed5 (patch) | |
| tree | 11e2a05b8d13f850ec2ca97217fa99ac2c1456cf | |
| parent | 0bd0a0f379abc2bc3e3946eb7dc46aa8d3439326 (diff) | |
| parent | 38cbbfaeafb21f57533ff98a232ffd99bd81d415 (diff) | |
| download | aports-fcolista-cdc6be738b7f8d118288c82d045f53776aa0fed5.tar.bz2 aports-fcolista-cdc6be738b7f8d118288c82d045f53776aa0fed5.tar.xz | |
Merge git://dev.alpinelinux.org/aports
Conflicts:
main/ffmpeg/APKBUILD
| -rw-r--r-- | main/ffmpeg/APKBUILD | 8 | ||||
| -rw-r--r-- | main/perl/APKBUILD | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index c5f497ca80..6b44b943c4 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -10,7 +10,11 @@ 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 depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 configure-dlvsym.patch" @@ -39,8 +43,12 @@ build() { --enable-libxvid \ --enable-libx264 \ --enable-libtheora \ +<<<<<<< HEAD --enable-libvo-aacenc \ --enable-version3 \ +======= + --enable-libv4l2 \ +>>>>>>> 38cbbfaeafb21f57533ff98a232ffd99bd81d415 --enable-nonfree \ --enable-postproc \ --enable-pic \ diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD index c264b332f3..a67e64805a 100644 --- a/main/perl/APKBUILD +++ b/main/perl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl -pkgver=5.16.2 +pkgver=5.16.3 pkgrel=0 pkgdesc="Larry Wall's Practical Extraction and Report Language" url=http://www.perl.org @@ -94,4 +94,6 @@ dev() { } -md5sums="0e57f2d01d96471d9effc3fb43175e84 perl-5.16.2.tar.gz" +md5sums="eb5c40f2575df6c155bc99e3fe0a9d82 perl-5.16.3.tar.gz" +sha256sums="69cf08dca0565cec2c5c6c2f24b87f986220462556376275e5431cc2204dedb6 perl-5.16.3.tar.gz" +sha512sums="8328de506dcb8e2f9b0dfbff74aebce11d2edbc9d1fe95ff48b22c2061fc3947278f6abf1b16a63acf109113be2400b059fcb565a4ec83d91fe2a42ed277da5d perl-5.16.3.tar.gz" |