diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-avbin-remove-unwanted-optimization.patch | 10 | ||||
| -rw-r--r-- | 0002-avbin-fix-link-and-add-full-relro.patch | 10 | ||||
| -rw-r--r-- | 0003-avbin-faster-build.patch | 5 | ||||
| -rw-r--r-- | PKGBUILD | 32 |
5 files changed, 28 insertions, 39 deletions
@@ -1,6 +1,6 @@ pkgbase = avbin-git pkgdesc = A C library that provides a wrapper around Libav’s video and audio decoding functionality (git version) - pkgver = 10.r60.g6a8ea87 + pkgver = 10.r61.g92d515a pkgrel = 1 url = https://avbin.github.io/ arch = x86_64 @@ -11,6 +11,7 @@ pkgbase = avbin-git depends = zlib provides = avbin conflicts = avbin + options = !lto source = git+https://github.com/AVbin/AVbin.git source = libav-avbin::git+https://github.com/AVbin/libav.git source = 0001-avbin-remove-unwanted-optimization.patch @@ -19,10 +20,9 @@ pkgbase = avbin-git source = avbin.pc sha256sums = SKIP sha256sums = SKIP - sha256sums = 8f8b20d6e57bdc6bf73723691740ae35b157785ebda5764a7611a68df427c30a - sha256sums = fa8f7263326b10f968836f5fe7ae9efef04cdce58a28cfd3f7cb93985fffb469 - sha256sums = 5629f9f239b5dafb8ded30224136854ee8fda537d5e528f9db35450bf057a5ad + sha256sums = cd44745477803d96d9cf762c4004b7d53c0b84e5a6ba4a3c1f5ce46f4572a2ca + sha256sums = a177c0906928338113469c688d309ae8e95a753de35c2a73bff02b6d99de6008 + sha256sums = c86083e6286af140dbb97b39a06c778bffad5557bb9f46465f6b7a2e050cbe97 sha256sums = d601ceed81c584d7af1d4cb0217e7ab34b7973232a81a09ce24eb620b4796199 pkgname = avbin-git - diff --git a/0001-avbin-remove-unwanted-optimization.patch b/0001-avbin-remove-unwanted-optimization.patch index da283151dd02..7c1767564bda 100644 --- a/0001-avbin-remove-unwanted-optimization.patch +++ b/0001-avbin-remove-unwanted-optimization.patch @@ -1,6 +1,5 @@ -diff -Naurp a/linux-x86-32.Makefile b/linux-x86-32.Makefile ---- a/linux-x86-32.Makefile 2019-04-28 20:25:40.000000000 +0000 -+++ b/linux-x86-32.Makefile 2019-04-28 20:32:41.972095497 +0000 +--- a/linux-x86-32.Makefile ++++ b/linux-x86-32.Makefile @@ -1,7 +1,7 @@ SONAME=libavbin.so.$(AVBIN_VERSION) LIBNAME=$(OUTDIR)/$(SONAME) @@ -10,9 +9,8 @@ diff -Naurp a/linux-x86-32.Makefile b/linux-x86-32.Makefile LDFLAGS += -shared -soname $(SONAME) -zmuldefs STATIC_LIBS = -whole-archive \ -diff -Naurp a/linux-x86-64.Makefile b/linux-x86-64.Makefile ---- a/linux-x86-64.Makefile 2019-04-28 20:25:40.000000000 +0000 -+++ b/linux-x86-64.Makefile 2019-04-28 20:32:47.072032317 +0000 +--- a/linux-x86-64.Makefile ++++ b/linux-x86-64.Makefile @@ -1,7 +1,7 @@ SONAME=libavbin.so.$(AVBIN_VERSION) LIBNAME=$(OUTDIR)/$(SONAME) diff --git a/0002-avbin-fix-link-and-add-full-relro.patch b/0002-avbin-fix-link-and-add-full-relro.patch index 735a88b48073..df29ce2aa229 100644 --- a/0002-avbin-fix-link-and-add-full-relro.patch +++ b/0002-avbin-fix-link-and-add-full-relro.patch @@ -1,6 +1,5 @@ -diff -Naurp a/linux-x86-32.Makefile b/linux-x86-32.Makefile ---- a/linux-x86-32.Makefile 2019-04-28 20:32:41.000000000 +0000 -+++ b/linux-x86-32.Makefile 2019-04-28 20:36:08.000000000 +0000 +--- a/linux-x86-32.Makefile ++++ b/linux-x86-32.Makefile @@ -2,7 +2,7 @@ SONAME=libavbin.so.$(AVBIN_VERSION) LIBNAME=$(OUTDIR)/$(SONAME) @@ -10,9 +9,8 @@ diff -Naurp a/linux-x86-32.Makefile b/linux-x86-32.Makefile STATIC_LIBS = -whole-archive \ $(BACKEND_DIR)/libavformat/libavformat.a \ -diff -Naurp a/linux-x86-64.Makefile b/linux-x86-64.Makefile ---- a/linux-x86-64.Makefile 2019-04-28 20:32:47.000000000 +0000 -+++ b/linux-x86-64.Makefile 2019-04-28 20:36:08.000000000 +0000 +--- a/linux-x86-64.Makefile ++++ b/linux-x86-64.Makefile @@ -2,7 +2,7 @@ SONAME=libavbin.so.$(AVBIN_VERSION) LIBNAME=$(OUTDIR)/$(SONAME) diff --git a/0003-avbin-faster-build.patch b/0003-avbin-faster-build.patch index e2ce3a82486f..71a2b7615ba3 100644 --- a/0003-avbin-faster-build.patch +++ b/0003-avbin-faster-build.patch @@ -1,6 +1,5 @@ -diff -Naurp a/build.sh b/build.sh ---- a/build.sh 2019-06-09 18:44:46.000000000 +0000 -+++ b/build.sh 2019-06-09 18:44:47.000000000 +0000 +--- a/build.sh ++++ b/build.sh @@ -147,7 +147,7 @@ die_usage() { echo echo "Options" @@ -1,7 +1,7 @@ # Maintainer: Daniel Bermond < gmail-com: danielbermond > pkgname=avbin-git -pkgver=10.r60.g6a8ea87 +pkgver=10.r61.g92d515a pkgrel=1 pkgdesc='A C library that provides a wrapper around Libav’s video and audio decoding functionality (git version)' arch=('x86_64') @@ -11,6 +11,7 @@ depends=('bzip2' 'zlib') makedepends=('git' 'yasm') provides=('avbin') conflicts=('avbin') +options=('!lto') source=('git+https://github.com/AVbin/AVbin.git' 'libav-avbin'::'git+https://github.com/AVbin/libav.git' '0001-avbin-remove-unwanted-optimization.patch' @@ -19,35 +20,28 @@ source=('git+https://github.com/AVbin/AVbin.git' 'avbin.pc') sha256sums=('SKIP' 'SKIP' - '8f8b20d6e57bdc6bf73723691740ae35b157785ebda5764a7611a68df427c30a' - 'fa8f7263326b10f968836f5fe7ae9efef04cdce58a28cfd3f7cb93985fffb469' - '5629f9f239b5dafb8ded30224136854ee8fda537d5e528f9db35450bf057a5ad' + 'cd44745477803d96d9cf762c4004b7d53c0b84e5a6ba4a3c1f5ce46f4572a2ca' + 'a177c0906928338113469c688d309ae8e95a753de35c2a73bff02b6d99de6008' + 'c86083e6286af140dbb97b39a06c778bffad5557bb9f46465f6b7a2e050cbe97' 'd601ceed81c584d7af1d4cb0217e7ab34b7973232a81a09ce24eb620b4796199') prepare() { - cd AVbin - - git submodule init - git config --local "submodule.libav.url" "${srcdir}/libav-avbin" - git submodule update + git -C AVbin submodule init + git -C AVbin config --local "submodule.libav.url" "${srcdir}/libav-avbin" + git -C AVbin -c protocol.file.allow='always' submodule update - patch -Np1 -i "${srcdir}/0001-avbin-remove-unwanted-optimization.patch" - patch -Np1 -i "${srcdir}/0002-avbin-fix-link-and-add-full-relro.patch" - patch -Np1 -i "${srcdir}/0003-avbin-faster-build.patch" + patch -d AVbin -Np1 -i "${srcdir}/0001-avbin-remove-unwanted-optimization.patch" + patch -d AVbin -Np1 -i "${srcdir}/0002-avbin-fix-link-and-add-full-relro.patch" + patch -d AVbin -Np1 -i "${srcdir}/0003-avbin-faster-build.patch" } pkgver() { - cd AVbin - - # git, tags available - git describe --long --tags | sed 's/^avbin-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' + git -C AVbin describe --long --tags | sed 's/^avbin-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' } build() { cd AVbin - - unset LDFLAGS # won't build if setted, modified by patch - + unset -v LDFLAGS # won't build if setted, modified by patch ./build.sh --fast linux-x86-64 } |