[arch-commits] Commit in ffmpeg0.10/repos/community-i686 (4 files)
Maxime Gauduin
alucryd at archlinux.org
Wed Nov 2 10:32:18 UTC 2016
Date: Wednesday, November 2, 2016 @ 10:32:17
Author: alucryd
Revision: 194371
archrelease: copy trunk to community-i686
Added:
ffmpeg0.10/repos/community-i686/PKGBUILD
(from rev 194370, ffmpeg0.10/trunk/PKGBUILD)
ffmpeg0.10/repos/community-i686/ffmpeg-0.10-libvpx-1.5.patch
(from rev 194370, ffmpeg0.10/trunk/ffmpeg-0.10-libvpx-1.5.patch)
Deleted:
ffmpeg0.10/repos/community-i686/PKGBUILD
ffmpeg0.10/repos/community-i686/ffmpeg-0.10-libvpx-1.5.patch
------------------------------+
PKGBUILD | 179 ++++++++++++++++++++---------------------
ffmpeg-0.10-libvpx-1.5.patch | 48 +++++-----
2 files changed, 113 insertions(+), 114 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-02 10:31:59 UTC (rev 194370)
+++ PKGBUILD 2016-11-02 10:32:17 UTC (rev 194371)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: 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=ffmpeg0.10
-pkgver=0.10.16
-pkgrel=2
-pkgdesc='Complete solution to record, convert and stream audio and video'
-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')
-provides=('ffmpeg-compat'
- 'libavcodec.so' 'libavutil.so' 'libpostproc.so' 'libswscale.so'
- 'libswresample.so' 'libavformat.so' 'libavfilter.so'
- 'libavdevice.so')
-replaces=('ffmpeg-compat')
-source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2"
- "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 -Np1 -i ../ffmpeg-0.10-libvpx-1.5.patch
-}
-
-build() {
- cd ffmpeg-${pkgver}
-
- export CFLAGS="$CFLAGS -I/usr/include/openjpeg-1.5"
-
- ./configure \
- --prefix='/usr' \
- --incdir='/usr/include/ffmpeg0.10' \
- --libdir='/usr/lib/ffmpeg0.10' \
- --shlibdir='/usr/lib/ffmpeg0.10' \
- --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 -dm 755 "${pkgdir}"/etc/ld.so.conf.d
- echo -e '/usr/lib/\n/usr/lib/ffmpeg0.10/' > "${pkgdir}"/etc/ld.so.conf.d/ffmpeg0.10.conf
-}
-
-# vim: ts=2 sw=2 et:
Copied: ffmpeg0.10/repos/community-i686/PKGBUILD (from rev 194370, ffmpeg0.10/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-11-02 10:32:17 UTC (rev 194371)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: 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=ffmpeg0.10
+pkgver=0.10.16
+pkgrel=2
+pkgdesc='Complete solution to record, convert and stream audio and video'
+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')
+provides=('ffmpeg-compat'
+ 'libavcodec.so' 'libavutil.so' 'libpostproc.so' 'libswscale.so'
+ 'libswresample.so' 'libavformat.so' 'libavfilter.so'
+ 'libavdevice.so')
+replaces=('ffmpeg-compat')
+source=("https://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 -Np1 -i ../ffmpeg-0.10-libvpx-1.5.patch
+}
+
+build() {
+ cd ffmpeg-${pkgver}
+
+ export CFLAGS="$CFLAGS -I/usr/include/openjpeg-1.5"
+
+ ./configure \
+ --prefix='/usr' \
+ --incdir='/usr/include/ffmpeg0.10' \
+ --libdir='/usr/lib/ffmpeg0.10' \
+ --shlibdir='/usr/lib/ffmpeg0.10' \
+ --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 -dm 755 "${pkgdir}"/etc/ld.so.conf.d
+ echo -e '/usr/lib/\n/usr/lib/ffmpeg0.10/' > "${pkgdir}"/etc/ld.so.conf.d/ffmpeg0.10.conf
+}
+
+# vim: ts=2 sw=2 et:
Deleted: ffmpeg-0.10-libvpx-1.5.patch
===================================================================
--- ffmpeg-0.10-libvpx-1.5.patch 2016-11-02 10:31:59 UTC (rev 194370)
+++ ffmpeg-0.10-libvpx-1.5.patch 2016-11-02 10:32:17 UTC (rev 194371)
@@ -1,24 +0,0 @@
-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: ffmpeg0.10/repos/community-i686/ffmpeg-0.10-libvpx-1.5.patch (from rev 194370, ffmpeg0.10/trunk/ffmpeg-0.10-libvpx-1.5.patch)
===================================================================
--- ffmpeg-0.10-libvpx-1.5.patch (rev 0)
+++ ffmpeg-0.10-libvpx-1.5.patch 2016-11-02 10:32:17 UTC (rev 194371)
@@ -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