bump

14 files changed, 238 insertions, 341 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc994d30a7e8..374f1df48a99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Fri Mar 25 13:24:55 UTC 2016
+# Mon Jan  9 19:18:44 UTC 2017
 pkgbase = mplayer2-build-git
 	pkgdesc = A movie player for linux (uses statically linked libav). (GIT version)
-	pkgver = 2.0.728.g2c378c7
-	pkgrel = 7
+	pkgver = 2.0.728.g2c378c71a
+	pkgrel = 1
 	url = http://www.mplayer2.org/
-	install = mplayer2-build-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -67,31 +66,31 @@ pkgbase = mplayer2-build-git
 	source = git+http://repo.or.cz/mplayer2.git
 	source = libav::git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git
 	source = git+https://github.com/libass/libass.git
-	source = 0004-use-pkg-config-for-dvdnav.patch
-	source = 0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch
+	source = use-pkg-config-for-dvdnav_dvdread.patch
+	source = switch_title-switch-to-next-title-if-no-parameter-passed.patch
 	source = stream_dvdnav.diff
-	source = giflib-5.0.patch
-	source = giflib-5.1.patch
 	source = libquvi-0.9.patch
-	source = include-samba-4.0.patch
+	source = samba-4.0.patch
 	source = vo_gl_locale_fix.patch
 	source = patch-libmpcodecs-vd_theora.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c?view=co
 	source = patch-libmpdemux-demux_ogg.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c?view=co
-	sha1sums = 0df8d4e5484128b7b28029273b7704ab5d5419bc
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = a073d296dbebfd9caead117eb0edefe317a97fd8
-	sha1sums = 901d3a80e6c69f1f804c102d1c5b7b294e8d30c9
-	sha1sums = 0d06ab2bdde0fdabe750ae528b0351149e9640e5
-	sha1sums = f8b33a47c4aae10fdd6de246667dd0f7900a3142
-	sha1sums = 85d54b02f6f59fa9bd785d403c852031dcb517af
-	sha1sums = 06919a6dc0ae8db9e8ab50b55bb83a26445de51d
-	sha1sums = 8c2fc1526a413cd821b46fd48ea08364abbf5c4c
-	sha1sums = 703825cd187fe90c449a299ced54710ced494ed7
-	sha1sums = f2b68b21f4cc02546048e2179df88742bd6501d4
-	sha1sums = 8153505fb503d90f96501577923068af48306f50
+	source = patch-libvo_vo_giflib.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libvo_vo_gif89a.c?view=co
+	source = patch-libmpdemux-demux_gif.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c?view=co
+	sha256sums = f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = c26893e024d8146be5a94704e0d461547e6e0dff8a28ca53403e3d094e53a222
+	sha256sums = 3a3831b0fe08e43263a685e342b53dc1c644ce24efc61765226f217f1ada7490
+	sha256sums = 239dc3a71091bd6bbcad66fbcddc2d53a41477e6b989acd202f9ed6af7fd0fd6
+	sha256sums = b20562a1d485a61dbb6411305841ac113311a7021a70f8e13ad118af0cfe4193
+	sha256sums = a420455ed4a791ef8514cc88b7f67130a279580447c9178b3066c0826ddc1519
+	sha256sums = 8cf89faaa442dafa3430a604050e29b20435c7402a29a13d0a385c38f1556c7e
+	sha256sums = 4117a80e11039d63c93a537901feaa952c275b85a5f5fc84ac56f38d820a25e1
+	sha256sums = 74894f00d3f9ff20d0721b4a1d04dd9313167c884a983d19dba9c2aa1c237254
+	sha256sums = 070b10bad1aa84ed78e15f7500788a7ab536c955c60cbbd330ec19dd86743439
+	sha256sums = 9f98ba01f9450c68c2638f2597158b5eda579d90d6673914c741f1e7dcf52260
 
 pkgname = mplayer2-build-git
 
diff --git a/.gitignore b/.gitignore
index 1f739865bdcd..2bf3d106b354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,9 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!mplayer2-build-git.install
-!0004-use-pkg-config-for-dvdnav.patch
-!0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch
-!giflib-5.0.patch
-!giflib-5.1.patch
-!include-samba-4.0.patch
+!switch_title-switch-to-next-title-if-no-parameter-passed.patch
+!samba-4.0.patch
 !libquvi-0.9.patch
 !stream_dvdnav.diff
 !vo_gl_locale_fix.patch
+!use-pkg-config-for-dvdnav_dvdread.patch
diff --git a/0004-use-pkg-config-for-dvdnav.patch b/0004-use-pkg-config-for-dvdnav.patch
deleted file mode 100644
index aea3a7ba3677..000000000000
--- a/0004-use-pkg-config-for-dvdnav.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From aa7445805211b6f616614647159a71ae9df3ab03 Mon Sep 17 00:00:00 2001
-From: Emmanuel Anne <emmanuel.anne@gmail.com>
-Date: Wed, 9 Apr 2014 22:10:55 +0200
-Subject: [PATCH 4/5] use pkg-config for dvdnav
-
----
- configure |   14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index 60fd308..bd09607 100755
---- a/configure
-+++ b/configure
-@@ -543,7 +543,6 @@ _xmms=no
- _vcd=auto
- _bluray=auto
- _dvdnav=auto
--_dvdnavconfig=dvdnav-config
- _dvdreadconfig=dvdread-config
- _dvdread=auto
- _dvdread_internal=auto
-@@ -654,9 +653,6 @@ for ac_option do
-   --with-sdl-config=*)
-     _sdlconfig=$(echo $ac_option | cut -d '=' -f 2)
-     ;;
--  --with-dvdnav-config=*)
--    _dvdnavconfig=$(echo $ac_option | cut -d '=' -f 2)
--    ;;
-   --with-dvdread-config=*)
-     _dvdreadconfig=$(echo $ac_option | cut -d '=' -f 2)
-     ;;
-@@ -5190,13 +5186,13 @@ if test "$_dvdnav" = auto ; then
-     dvdnav_internal=yes
-     res_comment="internal"
-   else
--    $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
-+    pkg-config dvdnavmini --libs >> $TMPLOG 2>&1 || _dvdnav=no
-   fi
- fi
- if test "$_dvdnav" = auto ; then
-   _dvdnav=no
--  _dvdnavdir=$($_dvdnavconfig --cflags)
--  _dvdnavlibs=$($_dvdnavconfig --libs)
-+  _dvdnavdir=$(pkg-config dvdnav --cflags)
-+  _dvdnavlibs=$(pkg-config dvdnav --libs)
-   statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
- fi
- if test "$_dvdnav" = yes ; then
-@@ -5205,8 +5201,8 @@ if test "$_dvdnav" = yes ; then
-     cflags_libdvdnav="-Ilibdvdnav"
-     inputmodules="dvdnav(internal) $inputmodules"
-   else
--    extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
--    extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
-+    extra_cflags="$extra_cflags $(pkg-config dvdnav --cflags)"
-+    extra_ldflags="$extra_ldflags $(pkg-config dvdnavmini --libs)"
-     inputmodules="dvdnav $inputmodules"
-   fi
- else
--- 
-1.7.10.4
-
diff --git a/PKGBUILD b/PKGBUILD
index b8fb69f6a7fc..fc8905df803e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,57 @@
 # Maintainer: Gustavo Alvarez <s1lpkn07@gmail.com>
 
 pkgname=mplayer2-build-git
-pkgver=2.0.728.g2c378c7
-pkgrel=7
+pkgver=2.0.728.g2c378c71a
+pkgrel=1
 pkgdesc="A movie player for linux (uses statically linked libav). (GIT version)"
 arch=('i686' 'x86_64')
-depends=('a52dec' 'desktop-file-utils' 'directfb' 'enca' 'faad2' 'fribidi' 'jack' 'lcms2' 'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libdca' 'libgl' 'libmng'
-         'libdv' 'libdvdnav' 'libdvdcss' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau' 'libxv' 'libxinerama' 'libxss' 'libxxf86vm' 'lirc-utils' 'mpg123'
-         'nut-multimedia-git' 'portaudio' 'rsound' 'smbclient' 'speex' 'ttf-font' 'xvidcore')
+depends=('a52dec'
+         'desktop-file-utils'
+         'directfb'
+         'enca'
+         'faad2'
+         'fribidi'
+         'jack'
+         'lcms2'
+         'libbluray'
+         'libbs2b'
+         'libcaca'
+         'libcdio-paranoia'
+         'libdca'
+         'libgl'
+         'libmng'
+         'libdv'
+         'libdvdnav'
+         'libdvdcss'
+         'libmad'
+         'libpulse'
+         'libquvi'
+         'libtheora'
+         'libvdpau'
+         'libxv'
+         'libxinerama'
+         'libxss'
+         'libxxf86vm'
+         'lirc-utils'
+         'mpg123'
+         'nut-multimedia-git'
+         'portaudio'
+         'rsound'
+         'smbclient'
+         'speex'
+         'ttf-font'
+         'xvidcore'
+         )
 license=('GPL')
 url="http://www.mplayer2.org/"
-makedepends=('git' 'live-media' 'mesa' 'python' 'python-docutils' 'vstream-client' 'yasm')
+makedepends=('git'
+             'live-media'
+             'mesa'
+             'python'
+             'python-docutils'
+             'vstream-client'
+             'yasm'
+             )
 backup=('etc/mplayer/codecs.conf'
         'etc/mplayer/input.conf')
 provides=('mplayer' 'mplayer2')
@@ -22,34 +63,33 @@ source=('https://dl.dropboxusercontent.com/u/6596386/mplayer2/mplayer2-2.0.tar.x
         'git+http://repo.or.cz/mplayer2.git'
         'libav::git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git'
         'git+https://github.com/libass/libass.git'
-        '0004-use-pkg-config-for-dvdnav.patch'
-        '0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch'
+        'use-pkg-config-for-dvdnav_dvdread.patch'
+        'switch_title-switch-to-next-title-if-no-parameter-passed.patch'
         'stream_dvdnav.diff'
-        'giflib-5.0.patch'
-        'giflib-5.1.patch'
         'libquvi-0.9.patch'
-        'include-samba-4.0.patch'
+        'samba-4.0.patch'
         'vo_gl_locale_fix.patch'
         'patch-libmpcodecs-vd_theora.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c?view=co'
         'patch-libmpdemux-demux_ogg.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c?view=co'
+        'patch-libvo_vo_giflib.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libvo_vo_gif89a.c?view=co'
+        'patch-libmpdemux-demux_gif.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c?view=co'
         )
-sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'a073d296dbebfd9caead117eb0edefe317a97fd8'
-          '901d3a80e6c69f1f804c102d1c5b7b294e8d30c9'
-          '0d06ab2bdde0fdabe750ae528b0351149e9640e5'
-          'f8b33a47c4aae10fdd6de246667dd0f7900a3142'
-          '85d54b02f6f59fa9bd785d403c852031dcb517af'
-          '06919a6dc0ae8db9e8ab50b55bb83a26445de51d'
-          '8c2fc1526a413cd821b46fd48ea08364abbf5c4c'
-          '703825cd187fe90c449a299ced54710ced494ed7'
-          'f2b68b21f4cc02546048e2179df88742bd6501d4'
-          '8153505fb503d90f96501577923068af48306f50'
-          )
-install=mplayer2-build-git.install
+sha256sums=('f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'c26893e024d8146be5a94704e0d461547e6e0dff8a28ca53403e3d094e53a222'
+            '3a3831b0fe08e43263a685e342b53dc1c644ce24efc61765226f217f1ada7490'
+            '239dc3a71091bd6bbcad66fbcddc2d53a41477e6b989acd202f9ed6af7fd0fd6'
+            'b20562a1d485a61dbb6411305841ac113311a7021a70f8e13ad118af0cfe4193'
+            'a420455ed4a791ef8514cc88b7f67130a279580447c9178b3066c0826ddc1519'
+            '8cf89faaa442dafa3430a604050e29b20435c7402a29a13d0a385c38f1556c7e'
+            '4117a80e11039d63c93a537901feaa952c275b85a5f5fc84ac56f38d820a25e1'
+            '74894f00d3f9ff20d0721b4a1d04dd9313167c884a983d19dba9c2aa1c237254'
+            '070b10bad1aa84ed78e15f7500788a7ab536c955c60cbbd330ec19dd86743439'
+            '9f98ba01f9450c68c2638f2597158b5eda579d90d6673914c741f1e7dcf52260'
+            )
 noextract=('mplayer2-2.0.tar.xz')
 
 pkgver() {
@@ -59,7 +99,6 @@ pkgver() {
 
 prepare() {
   cd mplayer2-build
-  git submodule init
   git config submodule.mplayer.url "${srcdir}/mplayer2"
   git config submodule.libass.url "${srcdir}/libass"
   git config submodule.libav.url "${srcdir}/libav"
@@ -75,38 +114,45 @@ prepare() {
   cd mplayer
 
   # Patch to use pkg-config method to get libdvdread/libdvdnav libs/headers info instead dvdnav-config/dvdread-config
-  patch -p1 -i "${srcdir}/0004-use-pkg-config-for-dvdnav.patch"
-  patch -p1 -i "${srcdir}/0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch"
+  patch -p1 -i "${srcdir}/use-pkg-config-for-dvdnav_dvdread.patch"
+  patch -p1 -i "${srcdir}/switch_title-switch-to-next-title-if-no-parameter-passed.patch"
 
   # Fix build with libdvdnav-git
   patch -p1 -i "${srcdir}/stream_dvdnav.diff"
 
   # Fix build with giflib 5.1.x
-  patch -p1 -i "${srcdir}/giflib-5.0.patch"
-  patch -p1 -i "${srcdir}/giflib-5.1.patch"
+  patch -p0 -i "${srcdir}/patch-libvo_vo_giflib.patch"
+  patch -p0 -i "${srcdir}/patch-libmpdemux-demux_gif.patch"
 
-  # use libquvi 0.9x series
+  # Use libquvi 0.9x series
   patch -p1 -i "${srcdir}/libquvi-0.9.patch"
 
   # Fix samba includes
-  patch -p1 -i "${srcdir}/include-samba-4.0.patch"
+  patch -p1 -i "${srcdir}/samba-4.0.patch"
 
   # Fix brawbraw (?)
-  patch -p1 -i "${srcdir}/vo_gl_locale_fix.patch"
+  patch -p0 -i "${srcdir}/vo_gl_locale_fix.patch"
 
   # Fix vd_theora
   patch -p0 -i "${srcdir}/patch-libmpcodecs-vd_theora.patch"
   patch -p0 -i "${srcdir}/patch-libmpdemux-demux_ogg.patch"
 
   # Make Mplayer2 build flags
-  echo "--confdir=/etc/mplayer
---enable-translation
---language=all
---prefix=/usr
---enable-joystick
---enable-gif" > ../mplayer_options
-  echo "--disable-demuxer=hls
---disable-protocol=concat,hls"  > ../libav_options
+  _mplayer_flags=(
+    '--confdir=/etc/mplayer'
+    '--enable-translation'
+    '--language=all'
+    '--prefix=/usr'
+    '--enable-joystick'
+    '--enable-gif'
+    )
+  _libav_flags=(
+    '--disable-demuxer=hls'
+    '--disable-protocol=concat,hls'
+    )
+
+  for i in ${_mplayer_flags[@]}; do echo "${i}" >> ../mplayer_options; done
+  for i in ${_libav_flags[@]}; do echo "${i}" >> ../libav_options; done
 
 }
 
diff --git a/giflib-5.0.patch b/giflib-5.0.patch
deleted file mode 100644
index 9eaa6e98e1fc..000000000000
--- a/giflib-5.0.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
-index b808f81..c61d86c 100644
---- a/libvo/vo_gif89a.c
-+++ b/libvo/vo_gif89a.c
-@@ -196,7 +196,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
- 	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n");
- #endif
- 
-+#if GIFLIB_MAJOR > 4
-+	new_gif = EGifOpenFileName(gif_filename, 0, NULL);
-+#else
- 	new_gif = EGifOpenFileName(gif_filename, 0);
-+#endif
- 	if (new_gif == NULL) {
- 		mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename);
- 		return 1;
-@@ -215,7 +219,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
- 		return 1;
- 	}
- 
-+#if GIFLIB_MAJOR > 4
-+	reduce_cmap = GifMakeMapObject(256, NULL);
-+#else
- 	reduce_cmap = MakeMapObject(256, NULL);
-+#endif
- 	if (reduce_cmap == NULL) {
- 		free(slice_data); slice_data = NULL;
- 		free(reduce_data); reduce_data = NULL;
-@@ -267,7 +275,11 @@ static int gif_reduce(int width, int height, uint8_t *src, uint8_t *dst, GifColo
- 	}
- 
- 	R = Ra; G = Ga; B = Ba;
-+#if GIFLIB_MAJOR > 4
-+	return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors);
-+#else
- 	return QuantizeBuffer(width, height, &size, R, G, B, dst, colors);
-+#endif
- }
- 
- static void flip_page(void)
-@@ -365,8 +377,11 @@ static void uninit(void)
- 	free(gif_filename);
- 	free(slice_data);
- 	free(reduce_data);
-+#if GIFLIB_MAJOR > 4
-+	if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap);
-+#else
- 	if (reduce_cmap != NULL) FreeMapObject(reduce_cmap);
--
-+#endif
- 	// set the pointers back to null.
- 	new_gif = NULL;
- 	gif_filename = NULL;
-
-diff --git a/configure b/configure
-index 95a5ae8..d9c826f 100755
---- a/configure
-+++ b/configure
-@@ -3659,6 +3659,7 @@ if test "$_gif" = auto ; then
-   _gif=no
-   for _ld_gif in "-lungif" "-lgif" ; do
-     statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break
-+    statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break
-   done
- fi
-
-diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
-index eee7a85..a764474 100644
---- a/libmpdemux/demux_gif.c
-+++ b/libmpdemux/demux_gif.c
-@@ -44,6 +44,16 @@ typedef struct {
- 
- #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
- 
-+static void PrintGifError(errcode)
-+{
-+  char *Err = GifErrorString(errcode);
-+
-+  if (Err != NULL)
-+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
-+  else
-+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", errcode);
-+}
-+
- #ifndef CONFIG_GIF_TVT_HACK
- // not supported by certain versions of the library
- static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
-@@ -240,6 +250,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer)
-   gif_priv_t *priv = calloc(1, sizeof(gif_priv_t));
-   sh_video_t *sh_video = NULL;
-   GifFileType *gif = NULL;
-+  int GifError;
- 
-   priv->current_pts = 0;
-   demuxer->seekable = 0; // FIXME
-@@ -254,12 +265,12 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer)
-   // not read from the beginning of the file and the command will fail.
-   // with this hack enabled, you will lose the ability to stream a GIF.
-   lseek(demuxer->stream->fd, 0, SEEK_SET);
--  gif = DGifOpenFileHandle(demuxer->stream->fd);
-+  gif = DGifOpenFileHandle(demuxer->stream->fd, &GifError);
- #else
--  gif = DGifOpen(demuxer->stream, my_read_gif);
-+  gif = DGifOpen(demuxer->stream, my_read_gif, &GifError);
- #endif
-   if (!gif) {
--    PrintGifError();
-+    PrintGifError(GifError);
-     free(priv);
-     return NULL;
-   }
diff --git a/giflib-5.1.patch b/giflib-5.1.patch
deleted file mode 100644
index 216c0c026b79..000000000000
--- a/giflib-5.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur mplayer2/libmpdemux/demux_gif.c mplayer2-patched/libmpdemux/demux_gif.c
---- mplayer2/libmpdemux/demux_gif.c	2014-06-15 23:14:22.159745049 +0400
-+++ mplayer2-patched/libmpdemux/demux_gif.c	2014-06-15 23:18:06.329743015 +0400
-@@ -311,7 +311,15 @@
- {
-   gif_priv_t *priv = demuxer->priv;
-   if (!priv) return;
-+#if GIFLIB_MAJOR == 5
-+  #if GIFLIB_MINOR >= 1
-+  if (priv->gif && DGifCloseFile(priv->gif, NULL) == GIF_ERROR)
-+  #else
-+    if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
-+  #endif
-+#else
-   if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
-+#endif
-     PrintGifError();
-   free(priv->refimg);
-   free(priv);
-diff -ur mplayer2/libvo/vo_gif89a.c mplayer2-patched/libvo/vo_gif89a.c
---- mplayer2/libvo/vo_gif89a.c	2014-06-15 23:16:34.426410512 +0400
-+++ mplayer2-patched/libvo/vo_gif89a.c	2014-06-15 23:15:41.833077660 +0400
-@@ -370,7 +370,15 @@
- 			MPLAYER_VERSION, VO_GIF_REVISION,
- 			"joey@nicewarrior.org");
- 		EGifPutComment(new_gif, temp);
-+#if GIFLIB_MAJOR == 5
-+  #if GIFLIB_MINOR >= 1
-+		EGifCloseFile(new_gif, NULL); // also frees gif storage space.
-+  #else
- 		EGifCloseFile(new_gif); // also frees gif storage space.
-+  #endif
-+#else
-+		EGifCloseFile(new_gif); // also frees gif storage space.
-+#endif
- 	}
- 
- 	// free our allocated ram
diff --git a/include-samba-4.0.patch b/include-samba-4.0.patch
deleted file mode 100644
index 2ed272b6a5f3..000000000000
--- a/include-samba-4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 @@
- 
- #include "config.h"
- 
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
- 
- #include "mp_msg.h"
diff --git a/libquvi-0.9.patch b/libquvi-0.9.patch
index 970022987ed1..657e25dc27f5 100644
--- a/libquvi-0.9.patch
+++ b/libquvi-0.9.patch
@@ -1,7 +1,8 @@
-diff -rupN a/configure b/configure
---- a/configure	2014-02-24 19:37:11.154636312 +0100
-+++ b/configure	2014-02-24 19:39:33.979771836 +0100
-@@ -3187,7 +3187,7 @@
+diff --git a/configure b/configure
+index 95a5ae8f7..192576867 100755
+--- a/configure
++++ b/configure
+@@ -3187,7 +3177,7 @@ echores "$_smb"
  echocheck "libquvi support"
  if test "$_libquvi" = auto ; then
      _libquvi=no
@@ -10,9 +11,10 @@ diff -rupN a/configure b/configure
          _libquvi=yes
      fi
  fi
-diff -rupN a/stream/quvi.c b/stream/quvi.c
---- a/stream/quvi.c	2014-02-24 19:37:08.347929591 +0100
-+++ b/stream/quvi.c	2014-02-24 19:40:08.693559705 +0100
+diff --git a/stream/quvi.c b/stream/quvi.c
+index 1dde19258..760980cb3 100644
+--- a/stream/quvi.c
++++ b/stream/quvi.c
 @@ -15,7 +15,7 @@
   * with mplayer2.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -41,13 +43,13 @@ diff -rupN a/stream/quvi.c b/stream/quvi.c
      // The documentation says this will fail on "shortened" URLs.
 -    if (quvi_supported(q, (char *)url) != QUVI_OK) {
 -        quvi_close(&q);
-+    if (quvi_supports(q, (char *) url, QUVI_SUPPORTS_MODE_OFFLINE, 
++    if (quvi_supports(q, (char *) url, QUVI_SUPPORTS_MODE_OFFLINE,
 +                                       QUVI_SUPPORTS_TYPE_ANY) == QUVI_FALSE) {
 +        quvi_free(q);
          return NULL;
      }
  
-@@ -48,13 +46,16 @@
+@@ -48,13 +46,16 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
      // That call requires an extra net access. quvi_next_media_url() doesn't
      // seem to do anything useful. So we can't really do anything useful
      // except pass through the user's format setting.
@@ -71,13 +73,11 @@ diff -rupN a/stream/quvi.c b/stream/quvi.c
          return NULL;
      }
  
-@@ -62,15 +63,17 @@
-         talloc_zero(NULL, struct mp_resolve_result);
+@@ -63,14 +64,16 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
  
      char *val;
--
+ 
 -    if (quvi_getprop(m, QUVIPROP_MEDIAURL, &val) == QUVI_OK)
-+    
 +    quvi_media_get(m, QUVI_MEDIA_STREAM_PROPERTY_URL, &val);
 +    if (quvi_ok(q) == QUVI_TRUE)
          result->url = talloc_strdup(result, val);
@@ -94,4 +94,3 @@ diff -rupN a/stream/quvi.c b/stream/quvi.c
  
      if (!result->url) {
          talloc_free(result);
-
diff --git a/mplayer2-build-git.install b/mplayer2-build-git.install
deleted file mode 100644
index d3289ab64233..000000000000
--- a/mplayer2-build-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/samba-4.0.patch b/samba-4.0.patch
new file mode 100644
index 000000000000..393185d6ec56
--- /dev/null
+++ b/samba-4.0.patch
@@ -0,0 +1,26 @@
+diff --git a/configure b/configure
+index 95a5ae8f7..68219e2c4 100755
+--- a/configure
++++ b/configure
+@@ -3170,7 +3160,7 @@ fi
+ if test "$_smb" = auto; then
+   _smb=no
+   for _ld_tmp in "-lsmbclient" "-lsmbclient $_ld_dl" "-lsmbclient $_ld_dl -lnsl" "-lsmbclient $_ld_dl -lssl -lnsl" ; do
+-    statement_check libsmbclient.h 'smbc_opendir("smb://")' $_ld_tmp &&
++    statement_check samba-4.0/libsmbclient.h 'smbc_opendir("smb://")' $_ld_tmp &&
+       extra_ldflags="$extra_ldflags $_ld_tmp" && _smb=yes && break
+   done
+ fi
+diff --git a/stream/stream_smb.c b/stream/stream_smb.c
+index f176bc751..27f3b00d9 100644
+--- a/stream/stream_smb.c
++++ b/stream/stream_smb.c
+@@ -18,7 +18,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ 
+ #include "mp_msg.h"
diff --git a/stream_dvdnav.diff b/stream_dvdnav.diff
index 9b158c8f2c4b..6420f80df85f 100644
--- a/stream_dvdnav.diff
+++ b/stream_dvdnav.diff
@@ -1,6 +1,8 @@
---- a/stream/stream_dvdnav.c	2014-06-16 22:09:17.518315836 +0200
-+++ b/stream/stream_dvdnav.c	2014-06-16 22:10:26.558605286 +0200
-@@ -715,13 +715,13 @@
+diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
+index 6bdc59d8a..d7237e11c 100644
+--- a/stream/stream_dvdnav.c
++++ b/stream/stream_dvdnav.c
+@@ -715,13 +715,13 @@ static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l
  
    format = dvdnav_audio_stream_format(priv->dvdnav, lg);
    switch(format) {
diff --git a/0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch b/switch_title-switch-to-next-title-if-no-parameter-passed.patch
index 18499dd21019..6d67d44f9426 100644
--- a/0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch
+++ b/switch_title-switch-to-next-title-if-no-parameter-passed.patch
@@ -1,13 +1,3 @@
-From ca92ebbd3f11123719463325f20028b9a3520969 Mon Sep 17 00:00:00 2001
-From: Emmanuel Anne <emmanuel.anne@gmail.com>
-Date: Wed, 9 Apr 2014 23:07:41 +0200
-Subject: [PATCH 5/5] switch_title: switch to next title if no parameter
- passed
-
----
- stream/stream_dvdnav.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
 diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
 index 6bdc59d..1a94249 100644
 --- a/stream/stream_dvdnav.c
@@ -26,6 +16,5 @@ index 6bdc59d..1a94249 100644
    if (title > 0 && title <= titles)
      dvdnav_title_play (priv->dvdnav, title);
  }
--- 
-1.7.10.4
+
 
diff --git a/use-pkg-config-for-dvdnav_dvdread.patch b/use-pkg-config-for-dvdnav_dvdread.patch
new file mode 100644
index 000000000000..023eba5a08fe
--- /dev/null
+++ b/use-pkg-config-for-dvdnav_dvdread.patch
@@ -0,0 +1,74 @@
+diff --git a/configure b/configure
+index 95a5ae8f7..7e982a436 100755
+--- a/configure
++++ b/configure
+@@ -459,8 +459,6 @@ Use these options if autodetection fails:
+   --extra-libs-mplayer=FLAGS  extra linker flags for MPlayer
+ 
+   --with-sdl-config=PATH      path to sdl*-config
+-  --with-dvdnav-config=PATH   path to dvdnav-config
+-  --with-dvdread-config=PATH  path to dvdread-config
+ 
+ This configure script is NOT autoconf-based, even though its output is similar.
+ It will try to autodetect all configuration options. If you --enable an option
+@@ -544,8 +542,6 @@ _xmms=no
+ _vcd=auto
+ _bluray=auto
+ _dvdnav=auto
+-_dvdnavconfig=dvdnav-config
+-_dvdreadconfig=dvdread-config
+ _dvdread=auto
+ _dvdread_internal=auto
+ _libdvdcss_internal=auto
+@@ -656,12 +652,6 @@ for ac_option do
+   --with-sdl-config=*)
+     _sdlconfig=$(echo $ac_option | cut -d '=' -f 2)
+     ;;
+-  --with-dvdnav-config=*)
+-    _dvdnavconfig=$(echo $ac_option | cut -d '=' -f 2)
+-    ;;
+-  --with-dvdread-config=*)
+-    _dvdreadconfig=$(echo $ac_option | cut -d '=' -f 2)
+-    ;;
+ 
+   --extra-cflags=*)
+     extra_cflags="$extra_cflags $(echo $ac_option | cut -d '=' -f 2-)"
+@@ -4263,8 +4254,8 @@ if test "$_dvdread_internal" = auto ; then
+ elif test "$_dvdread" = auto ; then
+   _dvdread=no
+   if test "$_dl" = yes; then
+-    _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
+-    _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
++    _dvdreadcflags=$(pkg-config dvdread --cflags 2> /dev/null)
++    _dvdreadlibs=$(pkg-config dvdread --libs 2> /dev/null)
+     if header_check dvdread/dvd_reader.h $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
+       _dvdread=yes
+       extra_cflags="$extra_cflags $_dvdreadcflags"
+@@ -5208,13 +5199,13 @@ if test "$_dvdnav" = auto ; then
+     dvdnav_internal=yes
+     res_comment="internal"
+   else
+-    $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
++    pkg-config dvdnav --libs >> $TMPLOG 2>&1 || _dvdnav=no
+   fi
+ fi
+ if test "$_dvdnav" = auto ; then
+   _dvdnav=no
+-  _dvdnavdir=$($_dvdnavconfig --cflags)
+-  _dvdnavlibs=$($_dvdnavconfig --libs)
++  _dvdnavdir=$(pkg-config dvdnav --cflags)
++  _dvdnavlibs=$(pkg-config dvdnav --libs)
+   statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
+ fi
+ if test "$_dvdnav" = yes ; then
+@@ -5223,8 +5214,8 @@ if test "$_dvdnav" = yes ; then
+     cflags_libdvdnav="-Ilibdvdnav"
+     inputmodules="dvdnav(internal) $inputmodules"
+   else
+-    extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
+-    extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
++    extra_cflags="$extra_cflags $(pkg-config dvdnav --cflags)"
++    extra_ldflags="$extra_ldflags $(pkg-config dvdnav --libs)"
+     inputmodules="dvdnav $inputmodules"
+   fi
+ else
diff --git a/vo_gl_locale_fix.patch b/vo_gl_locale_fix.patch
index 9489b4ea7633..2e6a4bea6898 100644
--- a/vo_gl_locale_fix.patch
+++ b/vo_gl_locale_fix.patch
@@ -1,9 +1,9 @@
 The generated output may use something other than "." for decimal
 point, which GLSL requires. This is caused by locale. C uses ".", 
 so locale is temporaily set to "C" when sprinting floats. 
-diff -Naur mplayer2.old/libvo/gl_common.c mplayer2/libvo/gl_common.c
---- mplayer2.old/libvo/gl_common.c	2014-02-24 21:57:13.493418840 +0100
-+++ mplayer2/libvo/gl_common.c	2014-02-24 22:00:25.136048921 +0100
+diff -Naur libvo/gl_common.c-orig mplayer2/libvo/gl_common.c
+--- libvo/gl_common.c.orig	2014-02-24 21:57:13.493418840 +0100
++++ libvo/gl_common.c	2014-02-24 22:00:25.136048921 +0100
 @@ -39,6 +39,7 @@
  #include <ctype.h>
  #include <stdbool.h>