summarylogtreecommitdiffstats
path: root/PKGBUILD
AgeCommit message (Collapse)Author
2016-02-03Update to 2.8.6Ben Widawsky
Matching upstream: commit e5864695cb46ce14bb62570fc26fe997c57332c4 Author: alucryd <alucryd@eb2447ed-0c53-47e4-bac8-5bc4a241df78> Date: Tue Feb 2 18:18:47 2016 +0000 upgpkg: ffmpeg 1:2.8.6-1
2016-01-16upgpkg: ffmpeg 1:2.8.5-1alucryd
git-svn-id: file:///srv/repos/svn-packages/svn@258355 eb2447ed-0c53-47e4-bac8-5bc4a241df78
2016-01-16Merge with upstream PKGBUILDBen Widawsky
There are some minor things I guess got out of sync.
2016-01-16Bring package up to upstreamBen Widawsky
I guess the last change had a lot of churn, and instead of following all the churn, let's just fast forward to the end result.
2016-01-13FS#47738: ffmpeg 1:2.8.4-3alucryd
git-svn-id: file:///srv/repos/svn-packages/svn@258176 eb2447ed-0c53-47e4-bac8-5bc4a241df78 By Ben: I had to use the bashism to get the inline comment - but otherwise, this is just the original change from upstream.
2015-12-24Merge upstream PKGBUILDBen Widawsky
upgpkg: ffmpeg 1:2.8.4-1 git-svn-id: file:///srv/repos/svn-packages/svn@257034 eb2447ed-0c53-47e4-bac8-5bc4a241df78
2015-12-18PKGBUILD: Correct merge failure which resulted in duplicatesBen Widawsky
2015-12-18upgpkg: ffmpeg 1:2.8.3-1alucryd
git-svn-id: file:///srv/repos/svn-packages/svn@252002 eb2447ed-0c53-47e4-bac8-5bc4a241df78
2015-12-18upgpkg: ffmpeg 1:2.8.2-1alucryd
git-svn-id: file:///srv/repos/svn-packages/svn@251029 eb2447ed-0c53-47e4-bac8-5bc4a241df78
2015-11-11Fix missing dep on vid.stabBen Widawsky
I accidentally missed this when I did the merge from upstream 2.8.1 PKGBUILD Reported-by: Noctem
2015-11-10Pull in upstream's libvpx supportBen Widawsky
commit 5386618a53be68fd5db153a7598a7e80eda8cf6c Author: bpiotrowski <bpiotrowski@eb2447ed-0c53-47e4-bac8-5bc4a241df78> Date: Tue Nov 10 13:21:27 2015 +0000 Backport upstream fix for libvpx 1.5.0 compatibility git-svn-id: file:///srv/repos/svn-packages/svn@250536 eb2447ed-0c53-47e4-bac8-5bc4a241df78
2015-11-10Update to 2.8.1Ben Widawsky
Also pull in the upstream change for libvidstab (whatever that is)
2015-09-17Try to fix the license situationBen Widawsky
I am not positive what the correct way to do this is. libfdk-aac installs the license we want, but I cannot figure out how to get namcap happy without copyin.
2015-09-17Fix stray whitespaceBen Widawsky
2015-09-17Merge latest upstream PKGBUILDBen Widawsky
+stray whitespace removal and license customization
2015-08-02re-add GPG key.Ben Widawsky
The failure I was seeing was my fault for not following the appropriate GPG setup. See: https://bbs.archlinux.org/viewtopic.php?pid=1488734#p1488734
2015-08-02Drop the GPG keyBen Widawsky
2015-07-30Forgot to fixup the providesBen Widawsky
2015-07-30Update to latest upstream packageBen Widawsky
This commit actually merges together a few things from the upstream Arch build. Ideally, I would split it out, but I doubt anyone would notice or care in this case.
2015-07-30Pedantic formattingBen Widawsky
2015-07-17Remove stray commaBen Widawsky
2015-07-17Update release #Ben Widawsky
2015-07-17Add qt-faststart to providesBen Widawsky
ffmpeg-git does this, and that seems to be the most prolific of the ffmpeg AUR pacakges.
2015-07-17Merge with latest upstream PKGBUILDBen Widawsky
2015-07-17Initial importBen Widawsky