summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kharitonov2016-01-17 00:39:01 +0500
committerDmitry Kharitonov2016-01-17 00:39:01 +0500
commitf6e5a346a19c492f705be500ec175dc4ddb5c373 (patch)
tree416225b1577fda5efbb0bd66fa9e31c1f64b204a
parentbb417efab89086705821fc8f77ff6c51ce3d2988 (diff)
downloadaur-f6e5a346a19c492f705be500ec175dc4ddb5c373.tar.gz
Removing unnecessary patches
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD17
2 files changed, 3 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bba12b4f414b..5f7b6fa6ace5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Jan 16 15:06:21 UTC 2016
+# Sat Jan 16 19:38:48 UTC 2016
pkgbase = ffmpeg-full-nvenc
pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC)
pkgver = 2.8.5
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -97,15 +97,9 @@ pkgbase = ffmpeg-full-nvenc
conflicts = ffmpeg-full-extra
source = http://ffmpeg.org/releases/ffmpeg-2.8.5.tar.bz2
source = http://ffmpeg.org/releases/ffmpeg-2.8.5.tar.bz2.asc
- source = https://github.com/FFmpeg/FFmpeg/commit/7145e80b4f78cff5ed5fee04d4c4d53daaa0e077.patch
- source = https://github.com/FFmpeg/FFmpeg/commit/6ba42b6482c725a59eb468391544dc0c75b8c6f0.patch
- source = https://github.com/FFmpeg/FFmpeg/commit/cfda1bea4c18ec1edbc11ecc465f788b02851488.patch
source = UNREDISTRIBUTABLE.txt
sha256sums = 3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a
sha256sums = SKIP
- sha256sums = 402477e1cdea436bc322016d97f0a48433c7063ab8cb1100490d059b1663e92e
- sha256sums = c5e5d2cba239f663004e65f86f87ab608348b5eedb11c0ac6d3403a0b8b49f42
- sha256sums = cd285af37d91e04c26a112d6bcbab994e9acf7f49e9f9db06d7c9e8540bb25bd
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
pkgname = ffmpeg-full-nvenc
diff --git a/PKGBUILD b/PKGBUILD
index e44ed48d2513..3682f20bebe2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=ffmpeg-full-nvenc
_pkgbasename=ffmpeg
pkgver=2.8.5
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
arch=('i686' 'x86_64')
@@ -34,27 +34,12 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
'libswscale.so' 'ffmpeg' 'qt-faststart')
source=(http://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.bz2{,.asc}
- https://github.com/FFmpeg/FFmpeg/commit/7145e80b4f78cff5ed5fee04d4c4d53daaa0e077.patch
- https://github.com/FFmpeg/FFmpeg/commit/6ba42b6482c725a59eb468391544dc0c75b8c6f0.patch
- https://github.com/FFmpeg/FFmpeg/commit/cfda1bea4c18ec1edbc11ecc465f788b02851488.patch
'UNREDISTRIBUTABLE.txt')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
sha256sums=('3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a'
'SKIP'
- '402477e1cdea436bc322016d97f0a48433c7063ab8cb1100490d059b1663e92e'
- 'c5e5d2cba239f663004e65f86f87ab608348b5eedb11c0ac6d3403a0b8b49f42'
- 'cd285af37d91e04c26a112d6bcbab994e9acf7f49e9f9db06d7c9e8540bb25bd'
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
-prepare() {
- cd $_pkgbasename-${pkgver}
-
- # FS#47738
- patch -Np1 -i ../7145e80b4f78cff5ed5fee04d4c4d53daaa0e077.patch
- patch -Np1 -i ../6ba42b6482c725a59eb468391544dc0c75b8c6f0.patch
- patch -Np1 -i ../cfda1bea4c18ec1edbc11ecc465f788b02851488.patch
-}
-
build() {
cd $_pkgbasename-$pkgver