Bump pkgrel for new changes

Change sources list to use new mirror

Append new dependency (libxv) to allow building in chroot

Remove dependency on dead Xorg package (libxxf86dga)

Fix samba 4.0 patch to include time.h

Add patch to fix compilation with libx264

4 files changed, 87 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 406d862bd682..0bb232a057f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mplayer-vaapi
 	pkgdesc = A movie player, compiled with vaapi support
 	pkgver = 36265
-	pkgrel = 18
+	pkgrel = 19
 	url = http://gitorious.org/vaapi/mplayer
 	install = mplayer-vaapi.install
 	arch = i686
@@ -14,7 +14,6 @@ pkgbase = mplayer-vaapi
 	makedepends = git
 	makedepends = mesa
 	makedepends = x264
-	depends = libxxf86dga
 	depends = libxxf86vm
 	depends = libmad
 	depends = libcdio-paranoia
@@ -53,6 +52,7 @@ pkgbase = mplayer-vaapi
 	depends = rtmpdump
 	depends = gsm
 	depends = desktop-file-utils
+	depends = libxv
 	depends = libx264.so
 	provides = mplayer=36265
 	conflicts = mplayer
@@ -60,20 +60,23 @@ pkgbase = mplayer-vaapi
 	options = !emptydirs
 	backup = etc/mplayer/codecs.conf
 	backup = etc/mplayer/input.conf
-	source = http://pkgbuild.com/~foutrelis/sources/mplayer-vaapi/mplayer-vaapi-36265.tar.xz
-	source = http://pkgbuild.com/~foutrelis/sources/mplayer-vaapi/mplayer-vaapi-36265.tar.xz.sig
+	source = https://github.com/ryshglene/mplayer-vaapi/releases/download/36265/mplayer-vaapi-36265.tar.xz
+	source = https://github.com/ryshglene/mplayer-vaapi/releases/download/36265/mplayer-vaapi-36265.tar.xz.sig
 	source = cdio-includes.patch
 	source = tweak-desktop-file.patch
 	source = subreader-fix-srt-parsing.patch
 	source = include-samba-4.0.patch
 	source = ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+	source = ffmpeg-?-libx264-fix-compilation-with-x264-builds-ge-153.patch
+	validpgpkeys = 86CFFCA918CF3AF47147588051E8B148A9999C34
 	sha256sums = 5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a
 	sha256sums = SKIP
 	sha256sums = 72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720
 	sha256sums = 5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b
 	sha256sums = 8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3
-	sha256sums = 169eb47b3b838ea95e50c871bdbbfb6fe0b9349b054da830f55f3b4d5055e4f3
+	sha256sums = 7a91109a107ac45c585653bc76459ca3ddc56329fb16260d14e7571d6c94eb08
 	sha256sums = 277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a
+	sha256sums = ab52cbbf93ec33beeed345d69540e24d5aa4db129d97cbe1926dc77bea786d1e
 
 pkgname = mplayer-vaapi
 
diff --git a/PKGBUILD b/PKGBUILD
index 4bde2c11ecb6..d1910a76a5bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,35 @@
 # $Id: PKGBUILD 129113 2015-03-12 10:45:30Z foutrelis $
-# Maintainer:
+# Maintainer: Angelo Geulin <angelogeulin123@gmail.com>
 # Contributor: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=mplayer-vaapi
 pkgver=36265
-pkgrel=18
+pkgrel=19
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
+depends=('libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
          'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
          'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'libx264' 'faac' 'faad2'
          'lirc' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'opus'
-         'libbluray' 'libva' 'libass' 'rtmpdump' 'gsm' 'desktop-file-utils')
+         'libbluray' 'libva' 'libass' 'rtmpdump' 'gsm' 'desktop-file-utils'
+         'libxv')
 depends+=('libx264.so')
 makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa' 'x264')
 provides=("mplayer=$pkgver")
 conflicts=('mplayer')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+source=(https://github.com/ryshglene/mplayer-vaapi/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
         cdio-includes.patch
         tweak-desktop-file.patch
         subreader-fix-srt-parsing.patch
         include-samba-4.0.patch
-        ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch)
+        ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+        ffmpeg-?-libx264-fix-compilation-with-x264-builds-ge-153.patch)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
 sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
@@ -35,8 +37,9 @@ sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
             '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
             '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
             '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3'
-            '169eb47b3b838ea95e50c871bdbbfb6fe0b9349b054da830f55f3b4d5055e4f3'
-            '277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a')
+            '7a91109a107ac45c585653bc76459ca3ddc56329fb16260d14e7571d6c94eb08'
+            '277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a'
+            'ab52cbbf93ec33beeed345d69540e24d5aa4db129d97cbe1926dc77bea786d1e')
 validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
 
 
@@ -54,6 +57,9 @@ prepare() {
 
   # https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
   patch -d ffmpeg -Np1 -i "$srcdir/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch"
+
+  # https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=2a111c99a60fdf4fe5eea2b073901630190c6c93
+  patch -d ffmpeg -Np0 -i "$srcdir/ffmpeg-?-libx264-fix-compilation-with-x264-builds-ge-153.patch"
 }
 
 build() {
diff --git a/ffmpeg-?-libx264-fix-compilation-with-x264-builds-ge-153.patch b/ffmpeg-?-libx264-fix-compilation-with-x264-builds-ge-153.patch
new file mode 100644
index 000000000000..cf725db3ef69
--- /dev/null
+++ b/ffmpeg-?-libx264-fix-compilation-with-x264-builds-ge-153.patch
@@ -0,0 +1,63 @@
+--- libavcodec/libx264.c	2019-11-06 13:14:09.518221792 +0800
++++ libavcodec/libx264.c	2019-11-06 13:20:27.458682406 +0800
+@@ -159,7 +159,7 @@
+ 
+     x264_picture_init( &x4->pic );
+     x4->pic.img.i_csp   = x4->params.i_csp;
+-    if (x264_bit_depth > 8)
++    if (X264_BIT_DEPTH > 8)
+         x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
+     x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
+ 
+@@ -502,6 +502,9 @@
+ 
+     x4->params.i_width          = avctx->width;
+     x4->params.i_height         = avctx->height;
++#if X264_BUILD >= 153
++    x4->params.i_bitdepth       = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1;
++#endif
+     av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096);
+     x4->params.vui.i_sar_width  = sw;
+     x4->params.vui.i_sar_height = sh;
+@@ -581,6 +584,23 @@
+     return 0;
+ }
+ 
++static const enum AVPixelFormat pix_fmts[] = {
++    AV_PIX_FMT_YUV420P,
++    AV_PIX_FMT_YUVJ420P,
++    AV_PIX_FMT_YUV422P,
++    AV_PIX_FMT_YUVJ422P,
++    AV_PIX_FMT_YUV444P,
++    AV_PIX_FMT_YUVJ444P,
++    AV_PIX_FMT_YUV420P10,
++    AV_PIX_FMT_YUV422P10,
++    AV_PIX_FMT_YUV444P10,
++    AV_PIX_FMT_NV12,
++#ifdef X264_CSP_NV21
++    AV_PIX_FMT_NV21,
++#endif
++    AV_PIX_FMT_NONE
++};
++
+ static const enum AVPixelFormat pix_fmts_8bit[] = {
+     AV_PIX_FMT_YUV420P,
+     AV_PIX_FMT_YUVJ420P,
+@@ -609,12 +629,14 @@
+ 
+ static av_cold void X264_init_static(AVCodec *codec)
+ {
+-    if (x264_bit_depth == 8)
++    if (X264_BIT_DEPTH == 8)
+         codec->pix_fmts = pix_fmts_8bit;
+-    else if (x264_bit_depth == 9)
++    else if (X264_BIT_DEPTH == 9)
+         codec->pix_fmts = pix_fmts_9bit;
+-    else if (x264_bit_depth == 10)
++    else if (X264_BIT_DEPTH == 10)
+         codec->pix_fmts = pix_fmts_10bit;
++    else /* X264_BIT_DEPTH == 0 */
++        codec->pix_fmts = pix_fmts;
+ }
+ 
+ #define OFFSET(x) offsetof(X264Context, x)
diff --git a/include-samba-4.0.patch b/include-samba-4.0.patch
index 2ed272b6a5f3..256693a7c051 100644
--- a/include-samba-4.0.patch
+++ b/include-samba-4.0.patch
@@ -1,11 +1,12 @@
 diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
 --- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
 +++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,8 @@
  
  #include "config.h"
  
 -#include <libsmbclient.h>
++#include <time.h>
 +#include <samba-4.0/libsmbclient.h>
  #include <unistd.h>