From 4bef6bb6f1782d7fca07f101b09bf3532ab22e21 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Fri, 10 Oct 2014 23:02:54 +0400
Subject: [PATCH] x264: Some fixes.

---
 mingw-w64-x264/0001-beautify-pc.all.patch     | 14 ++++++++++++++
 .../0002-install-avisynth_c.h.mingw.patch     | 14 ++++++++++++++
 mingw-w64-x264/PKGBUILD                       | 19 +++++++++++++++----
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 mingw-w64-x264/0001-beautify-pc.all.patch
 create mode 100644 mingw-w64-x264/0002-install-avisynth_c.h.mingw.patch

diff --git a/mingw-w64-x264/0001-beautify-pc.all.patch b/mingw-w64-x264/0001-beautify-pc.all.patch
new file mode 100644
index 0000000000..2cc549bc48
--- /dev/null
+++ b/mingw-w64-x264/0001-beautify-pc.all.patch
@@ -0,0 +1,14 @@
+--- x264-snapshot-20140208-2245-stable/configure.orig	2014-02-09 16:10:32.011010400 +0000
++++ x264-snapshot-20140208-2245-stable/configure	2014-02-09 16:11:59.730649400 +0000
+@@ -1249,9 +1249,9 @@
+ Name: x264
+ Description: H.264 (MPEG4 AVC) encoder library
+ Version: $(grep POINTVER < x264_config.h | sed -e 's/.* "//; s/".*//')
+-Libs: -L$libdir -lx264 $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl)
++Libs: -L\${libdir} -lx264 $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl)
+ Libs.private: $([ "$shared" = "yes" ] && echo $libpthread $libm $libdl)
+-Cflags: -I$includedir
++Cflags: -I\${includedir}
+ EOF
+ 
+ filters="crop select_every"
diff --git a/mingw-w64-x264/0002-install-avisynth_c.h.mingw.patch b/mingw-w64-x264/0002-install-avisynth_c.h.mingw.patch
new file mode 100644
index 0000000000..f7650f8d6f
--- /dev/null
+++ b/mingw-w64-x264/0002-install-avisynth_c.h.mingw.patch
@@ -0,0 +1,14 @@
+--- x264-snapshot-20131221-2245-stable/Makefile.orig	2013-12-21 21:45:07.000000000 +0000
++++ x264-snapshot-20131221-2245-stable/Makefile	2013-12-22 21:25:49.711777600 +0000
+@@ -252,9 +252,11 @@
+ 
+ install-lib-dev:
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)
++	$(INSTALL) -d $(DESTDIR)$(includedir)/avisynth
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -m 644 $(SRCPATH)/x264.h $(DESTDIR)$(includedir)
++	$(INSTALL) -m 644 $(SRCPATH)/extras/avisynth_c.h $(DESTDIR)$(includedir)/avisynth
+ 	$(INSTALL) -m 644 x264_config.h $(DESTDIR)$(includedir)
+ 	$(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+ 
diff --git a/mingw-w64-x264/PKGBUILD b/mingw-w64-x264/PKGBUILD
index cb6005a8a6..309de4af94 100644
--- a/mingw-w64-x264/PKGBUILD
+++ b/mingw-w64-x264/PKGBUILD
@@ -1,7 +1,6 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=x264
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=r2479.dd79a61
 pkgrel=1
@@ -13,21 +12,33 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config"
 depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread"
          "${MINGW_PACKAGE_PREFIX}-l-smash")
 options=('strip' 'staticlibs')
-source=("$_realname"::"git://git.videolan.org/x264.git")
-md5sums=('SKIP')
+source=("$_realname"::"git://git.videolan.org/x264.git"
+        0001-beautify-pc.all.patch
+        0002-install-avisynth_c.h.mingw.patch)
+md5sums=('SKIP'
+         '618a7bfdad03a5f7fa098244e87000c9'
+         'e8732209599273d3b8ef24ace9cc6fe5')
 
 pkgver() {
   cd ${srcdir}/${_realname}
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd ${_realname}
+  patch -p1 -i ${srcdir}/0001-beautify-pc.all.patch
+  patch -p1 -i ${srcdir}/0002-install-avisynth_c.h.mingw.patch
+}
+
 build() {
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
   ../${_realname}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
-    --enable-shared
+    --enable-static \
+    --enable-shared \
+    --enable-win32thread
   make
 }