diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-11-13 13:51:37 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-11-13 13:53:14 +0200 |
| commit | a716ed810e0c2d423de2f7efd0074c027aa02ef4 (patch) | |
| tree | cae82ba5f168c6676b8cc24cfc2586c4abb623e4 /main | |
| parent | bb0047baac241425c425d698399e7486026fe1b8 (diff) | |
| download | aports-a716ed810e0c2d423de2f7efd0074c027aa02ef4.tar.bz2 aports-a716ed810e0c2d423de2f7efd0074c027aa02ef4.tar.xz | |
main/libvpx: fix armv7 configuration triplet
Diffstat (limited to 'main')
| -rw-r--r-- | main/libvpx/APKBUILD | 14 | ||||
| -rw-r--r-- | main/libvpx/fix-arm-float-abi.patch | 12 | ||||
| -rw-r--r-- | main/libvpx/libm-pc.patch | 11 |
3 files changed, 19 insertions, 18 deletions
diff --git a/main/libvpx/APKBUILD b/main/libvpx/APKBUILD index 4929524b0e..767b2b21fa 100644 --- a/main/libvpx/APKBUILD +++ b/main/libvpx/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libvpx pkgver=1.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Library for the vp8 codec" url="https://www.webmproject.org/" arch="all" @@ -9,15 +9,15 @@ license="GPL" depends="" makedepends="coreutils yasm bash perl" subpackages="$pkgname-dev $pkgname-utils" -source="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/$pkgname-$pkgver.tar.bz2" +source="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/$pkgname-$pkgver.tar.bz2 + fix-arm-float-abi.patch + " builddir="$srcdir"/$pkgname-$pkgver build() { cd "$builddir" # build fix for arm export CROSS=" " - #TODO this is a hack to get build working on armv7 - [ "$CARCH" = "armv7" ] && _target="--target=generic-gnu" bash ./configure \ --enable-pic \ --enable-libs \ @@ -26,8 +26,7 @@ build() { --enable-vp9 \ --enable-shared \ --disable-install-srcs \ - --enable-postproc \ - $_target + --enable-postproc make } @@ -46,4 +45,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d libvpx-1.6.1.tar.bz2" +sha512sums="1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d libvpx-1.6.1.tar.bz2 +4eadbc2f4eb68eaff35cf85515aef271d6fd47293a53cba7b7a6e9e0fb71106dfb5ded45b9e9ba83264a91846e4a5fa4db42e39fc3eaff6ac37769e622f90f6c fix-arm-float-abi.patch" diff --git a/main/libvpx/fix-arm-float-abi.patch b/main/libvpx/fix-arm-float-abi.patch new file mode 100644 index 0000000000..52253aff59 --- /dev/null +++ b/main/libvpx/fix-arm-float-abi.patch @@ -0,0 +1,12 @@ +diff -ru libvpx-1.6.1.orig/build/make/configure.sh libvpx-1.6.1/build/make/configure.sh +--- libvpx-1.6.1.orig/build/make/configure.sh 2017-01-12 22:27:27.000000000 +0200 ++++ libvpx-1.6.1/build/make/configure.sh 2018-11-13 13:49:37.998514809 +0200 +@@ -680,7 +680,7 @@ + aarch64*) + tgt_isa=arm64 + ;; +- armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf) ++ armv7*-hardfloat* | armv7*-*eabihf | arm-*-*eabihf) + tgt_isa=armv7 + float_abi=hard + ;; diff --git a/main/libvpx/libm-pc.patch b/main/libvpx/libm-pc.patch deleted file mode 100644 index 87f07a3980..0000000000 --- a/main/libvpx/libm-pc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libs.mk.orig -+++ ./libs.mk -@@ -241,7 +241,7 @@ - $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@ - $(qexec)echo 'Requires:' >> $@ - $(qexec)echo 'Conflicts:' >> $@ -- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@ -+ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@ - $(qexec)echo 'Cflags: -I$${includedir}' >> $@ - INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc - INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc |