From c879bb8ba063ac2ee2337c8020ff973e2d277752 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 2 Apr 2019 23:52:01 +0000
Subject: [PATCH] extra/mplayer to 38125-4

---
 extra/mplayer/PKGBUILD | 46 ++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/extra/mplayer/PKGBUILD b/extra/mplayer/PKGBUILD
index fb182ffa6..985e1c697 100644
--- a/extra/mplayer/PKGBUILD
+++ b/extra/mplayer/PKGBUILD
@@ -10,15 +10,24 @@
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
 pkgver=38125
-pkgrel=3
+pkgrel=4
 pkgdesc='Media player for Linux'
 url='http://www.mplayerhq.hu/'
 arch=('x86_64')
 license=('GPL')
-makedepends=('libxxf86dga' 'libmad' 'libxinerama' 'libmng' 'libxss' 'smbclient' 'aalib' 'jack'
-             'libcaca' 'faac' 'faad2' 'lirc'  'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip'
-             'mesa' 'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 'libcdio-paranoia' 'subversion'
-             'x264' 'rtmpdump' 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'libmng' 'libxss'
+             'smbclient' 'aalib' 'jack' 'libcaca' 'faac' 'faad2' 'lirc' 'libxv'
+             'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa'
+             'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 'libcdio' 'zlib'
+             'libcdio-paranoia' 'subversion' 'x264' 'libx264.so' 'rtmpdump'
+             'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg' 'giflib' 'libgif.so'
+             'libbs2b' 'fribidi' 'opus' 'libvorbis' 'libvorbis.so' 'gsm'
+             'libpulse' 'alsa-lib' 'glibc' 'libass' 'libass.so' 'libjpeg'
+             'libpng' 'libogg' 'libtheora' 'libbluray' 'libbluray.so'
+             'xvidcore' 'libxvidcore.so' 'ncurses' 'libncursesw.so'
+             'fontconfig' 'freetype2' 'libx11' 'libxext' 'libvdpau' 'libgl'
+             'lame' 'desktop-file-utils' 'ttf-font' 'openal' 'speex'
+             'libmpeg2')
 options=('!emptydirs')
 source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
         mplayer.desktop
@@ -47,8 +56,6 @@ build() {
     --disable-gui \
     --disable-arts \
     --disable-liblzo \
-    --disable-speex \
-    --disable-openal \
     --disable-libdv \
     --disable-musepack \
     --disable-esd \
@@ -62,7 +69,7 @@ build() {
     --enable-smb \
     --language=all \
     --confdir=/etc/mplayer \
-    --extra-cflags="${CFLAGS}" \
+    --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
     --extra-ldflags="${LDFLAGS}"
   [[ "${CARCH}" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
   make
@@ -70,11 +77,18 @@ build() {
 
 package_mplayer() {
   pkgdesc='Media player for Linux'
-  backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+  backup=('etc/mplayer/codecs.conf'
+          'etc/mplayer/input.conf')
   depends=('desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
            'lirc' 'x264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
-           'jack' 'libmad' 'libcaca' 'libxxf86dga' 'faac' 'faad2' 'libxvmc' 'mpg123'
-           'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg')
+           'jack' 'libmad' 'libcaca' 'libxxf86dga' 'libxxf86vm' 'faac' 'faad2'
+           'libxv' 'libxvmc' 'mpg123' 'libx11' 'libcdio' 'libcdio-paranoia'
+           'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg' 'libbs2b' 'alsa-lib'
+           'giflib' 'libgif.so' 'glibc' 'libass' 'libass.so' 'zlib' 'libjpeg'
+           'libpng' 'libpulse' 'libogg' 'fribidi' 'libtheora' 'libvorbis'
+           'libvorbis.so' 'libbluray' 'libbluray.so' 'xvidcore'
+           'libxvidcore.so' 'ncurses' 'libncursesw.so' 'fontconfig' 'freetype2'
+           'libxext' 'libvdpau' 'libgl' 'openal' 'speex' 'libmpeg2')
 
   cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
@@ -86,8 +100,14 @@ package_mplayer() {
 
 package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool'
-  depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'smbclient' 'libmad'
-           'faac' 'faad2' 'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg')
+  depends=('glibc' 'enca' 'a52dec' 'libvpx' 'x264' 'libx264.so' 'libmng' 'libdca'
+           'smbclient' 'libmad' 'faac' 'faad2' 'mpg123' 'libcdio'
+           'libcdio-paranoia' 'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg'
+           'libbs2b' 'ncurses' 'libncursesw.so' 'zlib' 'alsa-lib' 'fontconfig'
+           'freetype2' 'fribidi' 'giflib' 'libgif.so' 'libvorbis'
+           'libvorbis.so' 'libpng' 'libjpeg' 'libass' 'libass.so' 'lame'
+           'libbluray' 'libbluray.so' 'libtheora' 'xvidcore' 'libxvidcore.so'
+           'openal' 'speex' 'libmpeg2')
 
   make -C ${pkgbase}-${pkgver} DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
   find "${pkgdir}/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +