mplayer-38125-5.par1: updating version

2 files changed, 41 insertions, 44 deletions

diff --git a/libre/mplayer/PKGBUILD b/libre/mplayer/PKGBUILD
index ed124e3b3..c2d05c370 100644
--- a/libre/mplayer/PKGBUILD
+++ b/libre/mplayer/PKGBUILD
@@ -11,37 +11,44 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=38101
-pkgrel=2.parabola1
-pkgdesc='Media player for GNU/Linux, without nonfree UnRAR and FAAC'
+pkgver=38125
+pkgrel=5
+pkgrel+=.par1
+pkgdesc='Media player for GNU/Linux'
+pkgdesc+=', without nonfree UnRAR and FAAC'
 url='http://www.mplayerhq.hu/'
-arch=('x86_64' 'i686' 'armv7h')
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 license=('GPL')
-makedepends=('libxxf86dga' 'libmad' 'libxinerama' 'libmng' 'libxss' 'smbclient' 'aalib' 'jack'
-             'libcaca' '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' '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
         include-samba-4.0.patch
         revert-icl-fixes.patch)
-source_i686=(mplayer-glibc-2.27.patch)
 sha512sums=('SKIP'
             'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc'
             '9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99'
             '0cae0b26d3d97fd4c962962c43a481de20335369cbca406cadfc9bda1a0608b32f5374e76c477cb9a85bda83a568a1ed17126df224ae61579d0a402c1824aea8')
-sha512sums_i686=('e333820880de1a276a3f693fe257bd9468720d193975483537ff09af0a44e0283a233392e92284c4dc3af4897e69f20dbec715b54545810e30743c1d6537fb51')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   patch -p1 < "../include-samba-4.0.patch"
   patch -p0 < "../revert-icl-fixes.patch"
-
-  if [ "$CARCH" = "i686" ]; then
-    patch -p1 < "../mplayer-glibc-2.27.patch"
-  fi
-
+  # https://bugs.archlinux.org/task/62050
+  sed -E "s|(#include <samba-4.0/libsmbclient.h>)|#include <time.h>\n\1|g" -i stream/stream_smb.c
   ./version.sh
 }
 
@@ -64,8 +71,6 @@ build() {
     --disable-gui \
     --disable-arts \
     --disable-liblzo \
-    --disable-speex \
-    --disable-openal \
     --disable-libdv \
     --disable-musepack \
     --disable-esd \
@@ -81,7 +86,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
@@ -89,11 +94,18 @@ build() {
 
 package_mplayer() {
   pkgdesc='Media player for GNU/Linux, without nonfree UnRAR and FAAC'
-  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' 'faad2' 'libxvmc' 'mpg123'
-           'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg')
+           'jack' 'libmad' 'libcaca' 'libxxf86dga' 'libxxf86vm' '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
@@ -105,8 +117,14 @@ package_mplayer() {
 
 package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree FAAC'
-  depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'smbclient' 'libmad'
-           'faad2' 'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg')
+  depends=('glibc' 'enca' 'a52dec' 'libvpx' 'x264' 'libx264.so' 'libmng' 'libdca'
+           'smbclient' 'libmad' '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 {} +
diff --git a/libre/mplayer/mplayer-glibc-2.27.patch b/libre/mplayer/mplayer-glibc-2.27.patch
deleted file mode 100644
index 68f1c892a..000000000
--- a/libre/mplayer/mplayer-glibc-2.27.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix FTBFS with glibc 2.27 on i386
- cpudetect.c uses the non-standard "struct sigcontext" in its SIGILL handler. As
- of glibc 2.27, this is not defined in strict standards compliant mode.
- .
- Fix by defining _GNU_SOURCE in cpudetect.c.
-Author: James Cowgill <jcowgill@debian.org>
-Bug: https://trac.mplayerhq.hu/ticket/2343
-Bug-Debian: https://bugs.debian.org/896805
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cpudetect.c
-+++ b/cpudetect.c
-@@ -16,6 +16,8 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#define _GNU_SOURCE
-+
- #include "mpx86asm.h"
- #include "config.h"
- #include "cpudetect.h"