From 0eda6f5545bfd344e19625ed11a0cc20be1d01a9 Mon Sep 17 00:00:00 2001 From: churchyard Date: Mon, 11 Nov 2013 12:38:34 +0000 Subject: [PATCH] =?UTF-8?q?*=20Mon=20Nov=2011=202013=20Miro=20Hron=C4=8Dok?= =?UTF-8?q?=20=20-=200.2.3-3=20-=20Rebased=20config?= =?UTF-8?q?=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mpv-config.patch | 14 +++++++------- mpv.spec | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mpv-config.patch b/mpv-config.patch index 2b8a0cf..fe80751 100644 --- a/mpv-config.patch +++ b/mpv-config.patch @@ -1,5 +1,5 @@ diff --git a/etc/example.conf b/etc/example.conf -index 96c7afa..d9d1aea 100644 +index 7084ab4..abcb4b8 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -1,7 +1,7 @@ @@ -9,19 +9,19 @@ index 96c7afa..d9d1aea 100644 -# Configuration files are read system-wide from /usr/local/etc/mpv.conf +# Configuration files are read system-wide from /etc/mpv/mpv.conf # and per-user from ~/.mpv/config, where per-user settings override - # system-wide settings, all of which are overrriden by the command line. + # system-wide settings, all of which are overridden by the command line. # -@@ -21,6 +21,7 @@ +@@ -28,6 +28,7 @@ - # Specify default video driver (see -vo help for a list). + # Specify default video driver (see --vo=help for a list). #vo=vdpau -+#vo=xv ++vo=opengl # Start in fullscreen mode by default. #fs=yes -@@ -41,6 +42,7 @@ +@@ -51,6 +52,7 @@ - # Specify default audio driver (see -ao help for a list). + # Specify default audio driver (see --ao=help for a list). #ao=alsa +ao=pulse,alsa, diff --git a/mpv.spec b/mpv.spec index 297c7ff..dd5f226 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv3+ URL: http://%{name}.io/ @@ -73,6 +73,9 @@ desktop-file-install %{SOURCE1} %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %changelog +* Mon Nov 11 2013 Miro Hrončok - 0.2.3-3 +- Rebased config patch + * Mon Nov 11 2013 Miro Hrončok - 0.2.3-2 - Proper sources for all branches