update to 1.6.1, based on the original extra/libvpx

3 files changed, 44 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac860c55e03..1cbd19080083 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = libvpx-1.6
-	pkgdesc = The VP8 Codec SDK (version 1.6, provides libvpx.so.4)
-	pkgver = 1.6.0
+	pkgdesc = VP8 and VP9 codec
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = http://www.webmproject.org/
-	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = yasm
 	makedepends = git
 	depends = glibc
-	conflicts = libvpx<1.6
-	source = http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.0.tar.bz2
-	sha256sums = d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad
+	depends = gcc-libs
+	provides = libvpx.so
+	source = libvpx-1.6.1.tar.gz::https://github.com/webmproject/libvpx/archive/v1.6.1.tar.gz
+	sha256sums = cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588
 
 pkgname = libvpx-1.6
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..577de7a7059f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg
+src
+*.pkg.tar.xz
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 060ebd5b1610..9b9bdfa02f6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,52 @@
 # Maintainer: Michal Donat <donny579@gmail.com>
-# Contributor: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+
 pkgname=libvpx-1.6
-_pkgname=libvpx
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
-pkgdesc='The VP8 Codec SDK (version 1.6, provides libvpx.so.4)'
-arch=('i686' 'x86_64')
+pkgdesc='VP8 and VP9 codec'
+arch=('x86_64')
 url='http://www.webmproject.org/'
 license=('BSD')
-depends=('glibc')
+depends=('glibc' 'gcc-libs')
 makedepends=('yasm' 'git')
 conflicts=('libvpx<1.7')
-source=("http://storage.googleapis.com/downloads.webmproject.org/releases/webm/$_pkgname-$pkgver.tar.bz2")
-sha256sums=('d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad')
-
+source=("libvpx-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz")
+sha256sums=('cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588')
 
 build() {
-  cd "${_pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --enable-vp8 \
-    --enable-vp9 \
+  cd libvpx-${pkgver}
+
+  ./configure \
+    --prefix='/usr' \
     --enable-runtime-cpu-detect \
     --enable-shared \
-    --disable-static \
-    --enable-postproc \
     --enable-pic \
     --disable-install-docs \
-    --disable-install-bins \
-    --disable-install-srcs
+    --disable-install-srcs \
+    --enable-vp8 \
+    --enable-postproc \
+    --enable-vp9 \
+    --enable-vp9-highbitdepth \
+    --enable-experimental \
+    --enable-spatial-svc
+
   make
 }
 
 package() {
-  cd "${_pkgname}-${pkgver}"
-  make DIST_DIR="${pkgdir}/usr" install
-  install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  # Remove useless files, already provided by libvpx package
-  rm "${pkgdir}/usr/lib/pkgconfig/vpx.pc"
-  rmdir "${pkgdir}/usr/lib/pkgconfig"
-  rm "${pkgdir}/usr/lib/libvpx.so"
-  rm -rf "${pkgdir}/usr/include/vpx"
-  rmdir "${pkgdir}/usr/include"
+  cd libvpx-${pkgver}
+  
+  mkdir -p "${pkgdir}"/opt/"${pkgname}"
+  mkdir -p "${pkgdir}"/usr/lib
+
+  make DIST_DIR="${pkgdir}"/opt/"${pkgname}" install
+
+  ln -rs "${pkgdir}"/opt/"${pkgname}"/lib/libvpx.so.4 "${pkgdir}"/usr/lib/libvpx.so.4
+  ln -rs "${pkgdir}"/usr/lib/libvpx.so.4 "${pkgdir}"/usr/lib/libvpx.so.4.1
+  ln -rs "${pkgdir}"/usr/lib/libvpx.so.4 "${pkgdir}"/usr/lib/libvpx.so.4.1.0
+
+  install -Dm 644 LICENSE -t "${pkgdir}"/opt/${pkgname}/licenses/libvpx-1.6/
 }