[SCM] mpv/experimental-ffmpeg: Merge branch 'master' into experimental-ffmpeg
ghedo at users.alioth.debian.org
ghedo at users.alioth.debian.org
Wed Dec 3 10:08:25 UTC 2014
Finalize changelog
New upstream release
Merge tag 'upstream/0.7.1'
Imported Upstream version 0.7.1
Update changelog
Add Recommends on youtube-dl
Drop libquvi support, replaced by built-in Lua script based on youtube-dl
Update libmpv symbols file
Remove --nocache option from waf invocation
Manually set zsh completion install path
Refresh patches
Update 03_waf.patch to waf 1.8.1
New upstream release
Merge tag 'upstream/0.7.0'
Imported Upstream version 0.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental-ffmpeg
X-Git-Reftype: branch
X-Git-Oldrev: 172133205d5f3a03592bf4f524fe02718ac4c206
X-Git-Newrev: a22cf127ed05a6a5e758bfa7787ce2b945530ff7
The following commit has been merged in the experimental-ffmpeg branch:
commit 07e50a94dde8cb4913c7d18f727b41a4884302e7
Merge: 172133205d5f3a03592bf4f524fe02718ac4c206 e3406b3a28ed29fab26851e0a334662b161ed170
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date: Wed Dec 3 10:56:50 2014 +0100
Merge branch 'master' into experimental-ffmpeg
diff --combined debian/changelog
index 0037b23,e9f5f7d..f6307b7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,28 +1,46 @@@
+ mpv (0.7.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Update 03_waf.patch to waf 1.8.1
+ * Refresh patches
+ * Manually set zsh completion install path
+ * Remove --nocache option from waf invocation
+ * Update libmpv symbols file
+ * Drop libquvi support, replaced by built-in Lua script based on youtube-dl
+ * Add Recommends on youtube-dl
+
+ -- Alessandro Ghedini <ghedo at debian.org> Wed, 03 Dec 2014 10:43:28 +0100
+
+mpv (0.6.2-2+ffmpeg) experimental; urgency=medium
+
+ * Build against ffmpeg
+
+ -- Alessandro Ghedini <ghedo at debian.org> Tue, 28 Oct 2014 16:04:11 +0100
+
mpv (0.6.2-2) unstable; urgency=medium
* Re-enable CDDA support via libcdio (Closes: #766725)
-- Alessandro Ghedini <ghedo at debian.org> Sat, 25 Oct 2014 15:16:57 +0200
+mpv (0.6.2-1+ffmpeg) experimental; urgency=medium
+
+ * Build against ffmpeg
+
+ -- Alessandro Ghedini <ghedo at debian.org> Fri, 24 Oct 2014 21:21:26 +0200
+
mpv (0.6.2-1) unstable; urgency=medium
* New upstream release
-- Alessandro Ghedini <ghedo at debian.org> Fri, 24 Oct 2014 21:16:49 +0200
+mpv (0.6.1-1+ffmpeg) experimental; urgency=medium
+
+ * Build against ffmpeg
+
+ -- Alessandro Ghedini <ghedo at debian.org> Sun, 12 Oct 2014 14:48:59 +0200
+
mpv (0.6.1-1) unstable; urgency=medium
* New upstream release
@@@ -42,12 -37,6 +55,12 @@@
-- Alessandro Ghedini <ghedo at debian.org> Sun, 12 Oct 2014 14:39:57 +0200
+mpv (0.6.0-1+ffmpeg) experimental; urgency=medium
+
+ * Build against ffmpeg (Closes: #763736)
+
+ -- Alessandro Ghedini <ghedo at debian.org> Sat, 04 Oct 2014 17:42:04 +0200
+
mpv (0.6.0-1) unstable; urgency=medium
* New upstream release
diff --combined debian/control
index 703e73a,226da04..1c0151b
--- a/debian/control
+++ b/debian/control
@@@ -8,12 -8,12 +8,12 @@@ Build-Depends: debhelper (>= 9)
ladspa-sdk,
libasound2-dev [linux-any],
libass-dev,
- libavcodec-dev (>= 6:10~),
- libavdevice-dev (>= 6:10~),
- libavfilter-dev (>= 6:10~),
- libavformat-dev (>= 6:10~),
- libavresample-dev (>= 6:10~),
- libavutil-dev (>= 6:10~),
+ libavcodec-ffmpeg-dev,
+ libavdevice-ffmpeg-dev,
+ libavfilter-ffmpeg-dev,
+ libavformat-ffmpeg-dev,
+ libavresample-ffmpeg-dev,
+ libavutil-ffmpeg-dev,
libbluray-dev,
libbs2b-dev,
libcdio-paranoia-dev,
@@@ -30,9 -30,8 +30,8 @@@
liblua5.2-dev,
libmpg123-dev,
libpulse-dev,
- libquvi-dev (>= 0.4.1-2.1),
libsdl2-dev,
- libswscale-dev,
+ libswscale-ffmpeg-dev,
libva-dev,
libvdpau-dev,
libwayland-dev [linux-any],
@@@ -53,6 -52,7 +52,7 @@@ Vcs-Browser: http://anonscm.debian.org/
Package: mpv
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+ Recommends: youtube-dl (>= 2014.11.09)
Multi-Arch: foreign
Description: video player based on MPlayer/mplayer2
mpv is a movie player based on MPlayer and mplayer2. It supports a wide
@@@ -86,6 -86,7 +86,7 @@@ Package: libmpv
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+ Recommends: youtube-dl (>= 2014.11.09)
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: video player based on MPlayer/mplayer2 (client library)
--
mpv packaging
More information about the pkg-multimedia-commits
mailing list