packages: mplayer/mplayer.spec, mplayer/mplayer-fontconfig_sub.patch (REMOV...
sparky
sparky at pld-linux.org
Thu Nov 19 22:02:58 CET 2009
Author: sparky Date: Thu Nov 19 21:02:58 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- working config changes
- changes intriduced by mplayer-fontconfig_sub.patch moved to %prep
---- Files affected:
packages/mplayer:
mplayer.spec (1.428 -> 1.429) , mplayer-fontconfig_sub.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mplayer/mplayer.spec
diff -u packages/mplayer/mplayer.spec:1.428 packages/mplayer/mplayer.spec:1.429
--- packages/mplayer/mplayer.spec:1.428 Thu Nov 19 20:39:10 2009
+++ packages/mplayer/mplayer.spec Thu Nov 19 22:02:53 2009
@@ -119,10 +119,9 @@
# goodies:
Patch30: %{name}-cp1250-fontdesc.patch
-Patch31: %{name}-fontconfig_sub.patch
-Patch32: %{name}-350.patch
+Patch31: %{name}-350.patch
# update
-#Patch33: %{name}-gnome-screensaver.patch
+#Patch32: %{name}-gnome-screensaver.patch
Patch100: %{name}-on2flix.patch
@@ -336,9 +335,8 @@
# goodies:
%patch30 -p0
-%patch31 -p0
-%patch32 -p1
-#%{with_gnomess:%patch33 -p1}
+%patch31 -p1
+#%{with_gnomess:%patch32 -p1}
# on2flix
mv mencoder-on2flixenglinux{-*-*-*,}
@@ -356,8 +354,22 @@
cat etc/example.conf > etc/mplayer.conf
cat <<'CONFIGADD' >> etc/mplayer.conf
-# Standard PLD location
-unrarexec = /usr/bin/unrar
+################
+# PLD Defaults #
+################
+[default]
+
+# alternate solution for CP1250-encoded subtitles
+fontconfig = yes
+subcp = cp1250
+
+# ...or if you prefer native bitmap fonts shipped with mplayer
+#fontconfig = no
+#subcp = iso-8859-1
+
+# Standard location
+unrarexec = "%{_bindir}/unrar"
+
CONFIGADD
%if %{with system_ffmpeg}
@@ -621,6 +633,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.429 2009/11/19 21:02:53 sparky
+- working config changes
+- changes intriduced by mplayer-fontconfig_sub.patch moved to %prep
+
Revision 1.428 2009/11/19 19:39:10 sparky
- added missing BRs
- enabled some options
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer.spec?r1=1.428&r2=1.429&f=u
More information about the pld-cvs-commit
mailing list