Update PKGBUILD

- Add support for libsoxr and libgme
- Remove (commented) build fribidi from sources. use system fribidi instead
- Add SVG icons
- Some PKGBUILD tweaks

2 files changed, 41 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 906e4cb277f7..eaaade9b7744 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = mpv-build-git
 	pkgdesc = Video player based on MPlayer/mplayer2 (uses statically linked ffmpeg). (GIT version)
-	pkgver = 20150904.215afe7
+	pkgver = 20151113.def87f1
 	pkgrel = 1
-	url = http://mpv.io/
+	url = http://mpv.io
 	install = mpv-build-git.install
 	arch = i686
 	arch = x86_64
@@ -11,6 +11,8 @@ pkgbase = mpv-build-git
 	makedepends = python-docutils
 	makedepends = yasm
 	makedepends = ladspa
+	makedepends = fontconfig
+	makedepends = fribidi
 	depends = desktop-file-utils
 	depends = smbclient
 	depends = libguess
@@ -30,6 +32,7 @@ pkgbase = mpv-build-git
 	depends = libpulse
 	depends = libx264
 	depends = libbs2b
+	depends = libgme
 	depends = mesa
 	depends = libxinerama
 	depends = libxrandr
@@ -43,6 +46,7 @@ pkgbase = mpv-build-git
 	depends = rubberband
 	depends = uchardet
 	depends = libarchive
+	depends = libsoxr
 	optdepends = youtube-dl: Another way to view youtuve videos with mpv
 	optdepends = zsh-completions: Additional completion definitions for Zsh users
 	provides = mpv
@@ -53,8 +57,6 @@ pkgbase = mpv-build-git
 	source = git+https://github.com/mpv-player/mpv.git
 	source = ffmpeg::git+https://github.com/FFmpeg/FFmpeg.git
 	source = git+https://github.com/libass/libass.git
-	source = git+http://anongit.freedesktop.org/git/fribidi/fribidi.git
-	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1618cb52374e..6c3429f6974e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=mpv-build-git
-pkgver=20150904.215afe7
+pkgver=20151113.def87f1
 pkgrel=1
 pkgdesc="Video player based on MPlayer/mplayer2 (uses statically linked ffmpeg). (GIT version)"
 arch=('i686' 'x86_64' )
@@ -24,6 +24,7 @@ depends=('desktop-file-utils'
          'libpulse'
          'libx264'
          'libbs2b'
+         'libgme'
          'mesa'
          'libxinerama'
          'libxrandr'
@@ -37,14 +38,17 @@ depends=('desktop-file-utils'
          'rubberband'
          'uchardet'
          'libarchive'
+         'libsoxr'
          # 'vapoursynth'
          )
 license=('GPL2')
-url="http://mpv.io/"
+url='http://mpv.io'
 makedepends=('git'
              'python-docutils'
              'yasm'
              'ladspa'
+             'fontconfig'
+             'fribidi'
              )
 optdepends=('youtube-dl: Another way to view youtuve videos with mpv'
             'zsh-completions: Additional completion definitions for Zsh users')
@@ -56,12 +60,14 @@ source=('git+https://github.com/mpv-player/mpv-build.git'
         'git+https://github.com/mpv-player/mpv.git'
         'ffmpeg::git+https://github.com/FFmpeg/FFmpeg.git'
         'git+https://github.com/libass/libass.git'
-        'git+http://anongit.freedesktop.org/git/fribidi/fribidi.git')
+        #'git+http://anongit.freedesktop.org/git/fribidi/fribidi.git'
+        )
 sha1sums=('SKIP'
           'SKIP'
           'SKIP'
           'SKIP'
-          'SKIP')
+          #'SKIP'
+          )
 backup=('etc/mpv/encoding-profiles.conf')
 
 pkgver() {
@@ -74,11 +80,27 @@ prepare() {
   ln -s ../mpv
   ln -s ../ffmpeg
   ln -s ../libass
-  ln -s ../fribidi
+  #ln -s ../fribidi
 
   # Set ffmpeg/libass/fribidi/mpv flags
-  echo "--disable-programs --enable-libx264 --enable-libmp3lame --enable-libfdk-aac --enable-libssh --enable-nonfree --enable-ladspa --enable-libbs2b" > ffmpeg_options
-  echo "--prefix=/usr --confdir=/etc/mpv --enable-openal --enable-sdl2 --enable-libmpv-shared --enable-zsh-comp --lua=52arch --enable-egl-x11 --enable-libarchive" > mpv_options
+  echo "--disable-programs \
+        --enable-libx264 \
+        --enable-libmp3lame \
+        --enable-libfdk-aac \
+        --enable-libssh \
+        --enable-nonfree \
+        --enable-ladspa \
+        --enable-libbs2b \
+        --enable-libgme \
+        --enable-libsoxr" > ffmpeg_options
+  echo "--prefix=/usr \
+        --confdir=/etc/mpv \
+        --enable-openal \
+        --enable-sdl2 \
+        --enable-libmpv-shared \
+        --enable-zsh-comp \
+        --enable-libarchive \
+        --lua=52arch" > mpv_options
 
   cd mpv
 
@@ -103,13 +125,12 @@ package() {
   install -Dm644 mpv/DOCS/client-api-changes.rst "${pkgdir}/usr/share/doc/mpv/client-api-changes.rst"
   install -Dm644 mpv/DOCS/contribute.md "${pkgdir}/usr/share/doc/mpv/contribute.md"
 
-  sed 's|/usr/local/etc/mpv.conf|/usr/local/etc/mpv.conf or /etc/mpv.conf|g' -i "${pkgdir}/usr/share/doc/mpv/example.conf"
+  install -Dm644 mpv/etc/mpv.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/mpv.svg"
+  install -Dm644 mpv/etc/mpv-symbolic.svg "${pkgdir}/usr/share/icons/hicolor/symbolic/apps/mpv.svg"
 
-  pushd mpv/TOOLS/lua &> /dev/null
-  for i in $(find . -type f); do install -Dm644 "${i}" "${pkgdir}/usr/share/mpv/scripts/${i}"; done
-  popd &> /dev/null
+  sed 's|/usr/local/etc/mpv.conf|/etc/mpv.conf|g' -i "${pkgdir}/usr/share/doc/mpv/example.conf"
 
-  pushd mpv/DOCS/client_api_examples &> /dev/null
-  for i in $(find . -type f); do install -Dm644 "${i}" "${pkgdir}/usr/share/mpv/client_api_examples/${i}"; done
-  popd &> /dev/null
+  (cd mpv/TOOLS/lua; for i in $(find . -type f); do install -Dm644 "${i}" "${pkgdir}/usr/share/mpv/scripts/${i}"; done)
+
+  (cd mpv/DOCS/client_api_examples; for i in $(find . -type f); do install -Dm644 "${i}" "${pkgdir}/usr/share/mpv/client_api_examples/${i}"; done)
 }