[arch-commits] Commit in ffmpeg-compat/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Nov 10 20:21:29 UTC 2015
Date: Tuesday, November 10, 2015 @ 21:21:28
Author: foutrelis
Revision: 146532
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
ffmpeg-compat/repos/community-staging-i686/
ffmpeg-compat/repos/community-staging-i686/PKGBUILD
(from rev 146531, ffmpeg-compat/trunk/PKGBUILD)
ffmpeg-compat/repos/community-staging-i686/ffmpeg-0.10-libvpx-1.5.patch
(from rev 146531, ffmpeg-compat/trunk/ffmpeg-0.10-libvpx-1.5.patch)
ffmpeg-compat/repos/community-staging-x86_64/
ffmpeg-compat/repos/community-staging-x86_64/PKGBUILD
(from rev 146531, ffmpeg-compat/trunk/PKGBUILD)
ffmpeg-compat/repos/community-staging-x86_64/ffmpeg-0.10-libvpx-1.5.patch
(from rev 146531, ffmpeg-compat/trunk/ffmpeg-0.10-libvpx-1.5.patch)
-------------------------------------------------------+
community-staging-i686/PKGBUILD | 85 ++++++++++++++++
community-staging-i686/ffmpeg-0.10-libvpx-1.5.patch | 24 ++++
community-staging-x86_64/PKGBUILD | 85 ++++++++++++++++
community-staging-x86_64/ffmpeg-0.10-libvpx-1.5.patch | 24 ++++
4 files changed, 218 insertions(+)
Copied: ffmpeg-compat/repos/community-staging-i686/PKGBUILD (from rev 146531, ffmpeg-compat/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-11-10 20:21:28 UTC (rev 146532)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg-compat
+pkgver=0.10.16
+pkgrel=4
+epoch=1
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL')
+depends=(
+ 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' 'libmodplug' 'libpulse'
+ 'libtheora' 'libva' 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger'
+ 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
+ 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
+)
+makedepends=('libvdpau' 'yasm' 'x264')
+provides=('libavcodec.so' 'libavutil.so' 'libpostproc.so' 'libswscale.so'
+ 'libswresample.so' 'libavformat.so' 'libavfilter.so' 'libavdevice.so')
+source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc}
+ ffmpeg-0.10-libvpx-1.5.patch)
+validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
+sha256sums=('e77823cbd58dfdb61f88059476070bc432d80e3821c14abcf804ef709d2f3fd1'
+ 'SKIP'
+ 'd6797973889582b82b7c81b91a39c222e09b5ccf8a7e031c364ae1e9275a497d')
+
+
+prepare() {
+ cd ffmpeg-$pkgver
+ patch -p1 -i ../ffmpeg-0.10-libvpx-1.5.patch
+}
+
+build() {
+ cd ffmpeg-$pkgver
+
+ CFLAGS+=" -I/usr/include/openjpeg-1.5" \
+ ./configure \
+ --prefix=/usr \
+ --incdir=/usr/include/ffmpeg-compat \
+ --libdir=/usr/lib/ffmpeg-compat \
+ --shlibdir=/usr/lib/ffmpeg-compat \
+ --disable-debug \
+ --disable-static \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libfreetype \
+ --enable-libgsm \
+ --enable-libmodplug \
+ --enable-libmp3lame \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libopenjpeg \
+ --enable-libpulse \
+ --enable-librtmp \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libtheora \
+ --enable-libv4l2 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libxvid \
+ --enable-postproc \
+ --enable-runtime-cpudetect \
+ --enable-shared \
+ --enable-vdpau \
+ --enable-version3 \
+ --enable-x11grab
+
+ make
+}
+
+package() {
+ cd ffmpeg-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir"/usr/{bin,share}
+
+ install -dm755 "$pkgdir"/etc/ld.so.conf.d/
+ echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
+}
Copied: ffmpeg-compat/repos/community-staging-i686/ffmpeg-0.10-libvpx-1.5.patch (from rev 146531, ffmpeg-compat/trunk/ffmpeg-0.10-libvpx-1.5.patch)
===================================================================
--- community-staging-i686/ffmpeg-0.10-libvpx-1.5.patch (rev 0)
+++ community-staging-i686/ffmpeg-0.10-libvpx-1.5.patch 2015-11-10 20:21:28 UTC (rev 146532)
@@ -0,0 +1,24 @@
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 1d33ce9..dface51 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext {
+
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *ctlidstr[] = {
+- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
+- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
+- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
+- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
+- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
+- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
+ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
+ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
+ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
+ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
+ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
+- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
+ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
+ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
+ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
Copied: ffmpeg-compat/repos/community-staging-x86_64/PKGBUILD (from rev 146531, ffmpeg-compat/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-11-10 20:21:28 UTC (rev 146532)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg-compat
+pkgver=0.10.16
+pkgrel=4
+epoch=1
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL')
+depends=(
+ 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' 'libmodplug' 'libpulse'
+ 'libtheora' 'libva' 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger'
+ 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
+ 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
+)
+makedepends=('libvdpau' 'yasm' 'x264')
+provides=('libavcodec.so' 'libavutil.so' 'libpostproc.so' 'libswscale.so'
+ 'libswresample.so' 'libavformat.so' 'libavfilter.so' 'libavdevice.so')
+source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc}
+ ffmpeg-0.10-libvpx-1.5.patch)
+validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
+sha256sums=('e77823cbd58dfdb61f88059476070bc432d80e3821c14abcf804ef709d2f3fd1'
+ 'SKIP'
+ 'd6797973889582b82b7c81b91a39c222e09b5ccf8a7e031c364ae1e9275a497d')
+
+
+prepare() {
+ cd ffmpeg-$pkgver
+ patch -p1 -i ../ffmpeg-0.10-libvpx-1.5.patch
+}
+
+build() {
+ cd ffmpeg-$pkgver
+
+ CFLAGS+=" -I/usr/include/openjpeg-1.5" \
+ ./configure \
+ --prefix=/usr \
+ --incdir=/usr/include/ffmpeg-compat \
+ --libdir=/usr/lib/ffmpeg-compat \
+ --shlibdir=/usr/lib/ffmpeg-compat \
+ --disable-debug \
+ --disable-static \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libfreetype \
+ --enable-libgsm \
+ --enable-libmodplug \
+ --enable-libmp3lame \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libopenjpeg \
+ --enable-libpulse \
+ --enable-librtmp \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libtheora \
+ --enable-libv4l2 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libxvid \
+ --enable-postproc \
+ --enable-runtime-cpudetect \
+ --enable-shared \
+ --enable-vdpau \
+ --enable-version3 \
+ --enable-x11grab
+
+ make
+}
+
+package() {
+ cd ffmpeg-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir"/usr/{bin,share}
+
+ install -dm755 "$pkgdir"/etc/ld.so.conf.d/
+ echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
+}
Copied: ffmpeg-compat/repos/community-staging-x86_64/ffmpeg-0.10-libvpx-1.5.patch (from rev 146531, ffmpeg-compat/trunk/ffmpeg-0.10-libvpx-1.5.patch)
===================================================================
--- community-staging-x86_64/ffmpeg-0.10-libvpx-1.5.patch (rev 0)
+++ community-staging-x86_64/ffmpeg-0.10-libvpx-1.5.patch 2015-11-10 20:21:28 UTC (rev 146532)
@@ -0,0 +1,24 @@
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 1d33ce9..dface51 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext {
+
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *ctlidstr[] = {
+- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
+- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
+- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
+- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
+- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
+- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
+ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
+ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
+ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
+ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
+ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
+- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
+ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
+ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
+ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
More information about the arch-commits
mailing list