From 8ec5c9b98dadd9c1e9b3298dfd5199dfada46d30 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 23 Jul 2016 19:55:15 +0200
Subject: [PATCH] Update mingw-w64-x264, rebuild ffmpeg

---
 ffmpeg/libfdk_aac/PKGBUILD        |  2 +-
 ffmpeg/mingw-w64/PKGBUILD         |  2 +-
 x264/mingw-w64-bootstrap/PKGBUILD |  3 +++
 x264/mingw-w64/PKGBUILD           |  5 ++++-
 x265/mingw-w64/PKGBUILD           | 15 ++++++++++-----
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD
index 056ad897..00725077 100644
--- a/ffmpeg/libfdk_aac/PKGBUILD
+++ b/ffmpeg/libfdk_aac/PKGBUILD
@@ -10,7 +10,7 @@
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
 pkgver=3.1.1
-pkgrel=1
+pkgrel=1.1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
 arch=('i686' 'x86_64')
diff --git a/ffmpeg/mingw-w64/PKGBUILD b/ffmpeg/mingw-w64/PKGBUILD
index 43972b5d..29bf3ee0 100644
--- a/ffmpeg/mingw-w64/PKGBUILD
+++ b/ffmpeg/mingw-w64/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mingw-w64-ffmpeg
 pkgver=3.1.1
-pkgrel=1
+pkgrel=1.1
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)"
 arch=('any')
diff --git a/x264/mingw-w64-bootstrap/PKGBUILD b/x264/mingw-w64-bootstrap/PKGBUILD
index 7caa84b7..556c8a2d 100644
--- a/x264/mingw-w64-bootstrap/PKGBUILD
+++ b/x264/mingw-w64-bootstrap/PKGBUILD
@@ -1,5 +1,8 @@
 # Maintainer: Martchus <martchus@gmx.net>
 # Contributor: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+
+# This version includes the programs in contrast to the version found in the AUR.
+
 pkgname=mingw-w64-x264-bootstrap
 pkgver=148.20160103
 pkgrel=1
diff --git a/x264/mingw-w64/PKGBUILD b/x264/mingw-w64/PKGBUILD
index 099f5f85..6e69dcee 100644
--- a/x264/mingw-w64/PKGBUILD
+++ b/x264/mingw-w64/PKGBUILD
@@ -1,8 +1,11 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 # Contributor: Martchus <martchus@gmx.net>
+
+# This version includes the programs in contrast to the version found in the AUR.
+
 pkgname=mingw-w64-x264
 pkgver=148.20160103
-pkgrel=1.1
+pkgrel=1
 epoch=1
 pkgdesc='Free library for encoding H264/AVC video streams (mingw-w64)'
 arch=('any')
diff --git a/x265/mingw-w64/PKGBUILD b/x265/mingw-w64/PKGBUILD
index 07a0f750..ea892ceb 100644
--- a/x265/mingw-w64/PKGBUILD
+++ b/x265/mingw-w64/PKGBUILD
@@ -1,6 +1,11 @@
+# Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+
+# This version includes the programs and enables Windows XP support
+# in contrast to the version found in the AUR.
+
 pkgname=mingw-w64-x265
-pkgver=1.8
-pkgrel=2.1
+pkgver=2.0
+pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder (mingw-w64)'
 arch=('any')
 url='https://bitbucket.org/multicoreware/x265'
@@ -10,12 +15,12 @@ options=(!strip !buildflags staticlibs)
 makedepends=('mingw-w64-gcc' 'yasm' 'mingw-w64-cmake' 'mingw-w64-pkg-config')
 source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz"
         mingw.patch)
-md5sums=('8b7ef9bc0b5bd26965d05a4508effeed'
+md5sums=('a4f16c0f054f002d6d8c9c6f7fb03026'
          'd1f6263ad2f345673a8b0ece73f68338')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-    cd x265_11047
+    cd "${srcdir}/x265_${pkgver}"
     patch -Np1 -i "${srcdir}/mingw.patch"
 }
 
@@ -27,7 +32,7 @@ build() {
        -DENABLE_SHARED='TRUE' \
        -DENABLE_CLI='TRUE' \
        -DWINXP_SUPPORT:BOOL='TRUE' \
-       "${srcdir}"/x265_11047/source
+       "${srcdir}"/x265_${pkgver}/source
     make
   done
 }