lib32-libass: 0.12.2 and asm fixes

2 files changed, 24 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0e7fb6220d2..0523787313d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = lib32-libass
 	pkgdesc = A portable library for SSA/ASS subtitles rendering (32 bit)
-	pkgver = 0.10.1
-	pkgrel = 2
+	pkgver = 0.12.2
+	pkgrel = 1
 	url = https://github.com/libass/libass/
 	arch = x86_64
 	license = BSD
 	makedepends = gcc-multilib
+	makedepends = yasm
 	depends = libass
 	depends = lib32-enca
 	depends = lib32-fontconfig
 	depends = lib32-fribidi
 	depends = lib32-harfbuzz
-	source = http://libass.googlecode.com/files/libass-0.10.1.tar.xz
-	md5sums = 0f54b1f3a24fa897ebbbcc5bc744b32a
+	source = https://github.com/libass/libass//releases/download/0.12.2/libass-0.12.2.tar.xz
+	md5sums = d4b78e6a0794a9d386ece5cd08eb2d3e
 
 pkgname = lib32-libass
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a9d6ce92fda..464c80f27b6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,30 @@
 
 _pkgbase=libass
 pkgname=lib32-${_pkgbase}
-pkgver=0.10.1
-pkgrel=2
+pkgver=0.12.2
+pkgrel=1
 pkgdesc="A portable library for SSA/ASS subtitles rendering (32 bit)"
 arch=('x86_64')
 url="https://github.com/libass/libass/"
 license=('BSD')
 depends=("${_pkgbase}"
 'lib32-enca' 'lib32-fontconfig' 'lib32-fribidi' 'lib32-harfbuzz')
-makedepends=('gcc-multilib')
-source=("http://libass.googlecode.com/files/${_pkgbase}-${pkgver}.tar.xz")
-md5sums=('0f54b1f3a24fa897ebbbcc5bc744b32a')
+makedepends=('gcc-multilib' 'yasm')
+source=("${url}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.tar.xz")
+md5sums=('d4b78e6a0794a9d386ece5cd08eb2d3e')
+
+prepare() {
+  cd "$srcdir/${_pkgbase}-${pkgver}"
+  # force yasm to 32 bit
+  sed -i -e 's|X64=true|X86=true|g' configure.ac
+  sed -i -e 's|BITS=64|BITS=32|g' configure.ac
+  sed -i -e 's|-DARCH_X86_64=1|-DARCH_X86_64=0|g' configure.ac
+  sed -i -e 's|-m amd64|-m x86|g' configure.ac
+}
 
 build() {
-  export CC='gcc -m32'  
-  cd ${_pkgbase}-${pkgver}
+  export CC='gcc -m32'
+  cd "$srcdir/${_pkgbase}-${pkgver}"
   ./configure --prefix=/usr --libdir=/usr/lib32 \
 	--enable-enca \
 	--enable-harfbuzz \
@@ -26,8 +35,9 @@ build() {
 }
 
 package() {
-  make -C ${_pkgbase}-${pkgver} DESTDIR="${pkgdir}" install
+  cd "$srcdir/${_pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/include
   install -dm755 "${pkgdir}"/usr/share/licenses
-  ln -s ${_pkgbase} "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }