Ops.Wrong merging. Try again

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44c247195b26..dcbb463d9ce9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Nov 11 21:57:53 UTC 2016
+# Sat Nov 12 15:54:34 UTC 2016
 pkgbase = libva-intel-driver-g45-h264
 	pkgdesc = VA-API implementation for Intel G45 chipsets with H264 support.
 	pkgver = 1.7.3
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://freedesktop.org/wiki/Software/vaapi
 	arch = i686
@@ -17,8 +17,8 @@ pkgbase = libva-intel-driver-g45-h264
 	conflicts = libva-intel-driver
 	replaces = libva-intel-driver
 	options = !libtool
-	source = https://bitbucket.org/alium/g45-h264/downloads/libva-intel-driver-g45-h264-1.7.3.tar.gz
-	sha256sums = b9b31942635c92b76ca414ae9af7d3d3c8ef7be11fbb0922678cb30fd292e0d2
+	source = https://bitbucket.org/alium/g45-h264/downloads/intel-driver-g45-h264-1.7.3.tar.gz
+	sha256sums = 0d64274924523020b467944cfa88c0d6c11696a4b33b45f5fc92c26ec12eaeb3
 
 pkgname = libva-intel-driver-g45-h264
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e70959ee17e..92197386e8a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=libva-intel-driver-g45-h264
 epoch=1
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="VA-API implementation for Intel G45 chipsets with H264 support."
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
@@ -17,18 +17,18 @@ options=('!libtool')
 conflicts=('libva-intel-driver')
 provides=('libva-intel-driver')
 replaces=('libva-intel-driver')
-source=(https://bitbucket.org/alium/g45-h264/downloads/libva-intel-driver-g45-h264-$pkgver.tar.gz)
+source=(https://bitbucket.org/alium/g45-h264/downloads/intel-driver-g45-h264-$pkgver.tar.gz)
 
 build () {
-    cd "$srcdir"/libva-intel-driver
+    cd "$srcdir"/intel-driver
     ./autogen.sh --prefix=/usr
     sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/shaders/gpp.py
     make
 }
 
 package () {
-    cd ${srcdir}/libva-intel-driver
+    cd ${srcdir}/intel-driver
     make DESTDIR="${pkgdir}" install
     install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
-sha256sums=('b9b31942635c92b76ca414ae9af7d3d3c8ef7be11fbb0922678cb30fd292e0d2')
+sha256sums=('0d64274924523020b467944cfa88c0d6c11696a4b33b45f5fc92c26ec12eaeb3')