Merge branch 'stable-0.45' of ssh://scm.sourcemage.org/smgl/grimoire into stable-0.45

4 files changed, 27 insertions, 38 deletions

diff --git a/video/miro/DEPENDS b/video/miro/DEPENDS
index 49b39e0f6d..ed9efa6992 100755
--- a/video/miro/DEPENDS
+++ b/video/miro/DEPENDS
@@ -1,7 +1,6 @@
 depends python &&
-depends gnome-python-extras &&
 depends -sub PYTHON rb-libtorrent
-depends XULRUNNER &&
+depends pywebkitgtk &&
 depends gst-python &&
 depends dbus-python &&
 depends gst-plugins-good &&
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index ffbd554711..1e1fa3b983 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,7 @@
+2010-06-21 Arwed von Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: removed XULRUNNER and gnome-python-extras,
+	  added pywebkitgtk
+
 2010-05-24 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.0.2
 
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index b6fc72e741..e2f00825ef 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -1,24 +1,20 @@
 depends  libcap  &&
 
-if  [ "$MPLAYER_GUI" == "gtk+" ]
-then  depends  gtk+  '--enable-gui  --enable-gtk1' &&
-      depends  mplayer-gui
-elif  [ "$MPLAYER_GUI" == "gtk+2" ]
-then  depends  gtk+2  '--enable-gui'  &&
-      depends  mplayer-gui
+if  [ "$MPLAYER_GUI" == "gtk+" ]; then
+  depends  gtk+  '--enable-gui  --enable-gtk1' &&
+  depends  mplayer-gui
+elif  [ "$MPLAYER_GUI" == "gtk+2" ]; then
+  depends  gtk+2  '--enable-gui'  &&
+  depends  mplayer-gui
 fi  &&
 
 if [ "$MPLAYER_SVN" == "y" ]; then
   depends  subversion  &&
+
   optional_depends  ffmpeg-svn  \
-  "--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libavutil_a"  ""  "to use system ffmpeg instead of internal one"  &&
-  optional_depends  pulseaudio "" "--disable-pulse" "for pulseaudio audio output"
+  "--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libavutil_a"  ""  "to use system ffmpeg instead of internal one"
 else
-  optional_depends  libdvdnav \
-			  "" \
-			  "--disable-dvdnav" \
-			  "support for DVD navigation"               &&
-  optional_depends  polypaudio "" "--disable-polyp" "for polypaudio audio output"
+  optional_depends  libdvdnav "" "--disable-dvdnav" "support for DVD navigation"
 fi  &&
 
 optional_depends  libvorbis "--disable-tremor-internal" "" "to use external libvorbis to play ogg/vorbis audio"  &&
@@ -35,8 +31,8 @@ optional_depends  lame "" "" "to encode files with mp3 audio (mencoder)"  &&
 optional_depends  speex "" "--disable-speex" "support for speex (an open source speech encoder)"  &&
 
 # video codecs
-optional_depends  faac      "" "--disable-faac"   "for faac support"                      &&
-optional_depends  libtheora "" "--disable-theora" "for Theora video support"              &&
+optional_depends  faac          "" "--disable-faac"   "for faac support"                                          &&
+optional_depends  libtheora "" "--disable-theora" "for Theora video support"                          &&
 optional_depends  zlib "" "" "to play movies using losless compression algorithms"  &&
 optional_depends  win32codecs "" "--disable-win32dll" "to use windows codec DLLs for video decoding" "z-rejected"  &&
 
@@ -47,7 +43,7 @@ if ! is_depends_enabled $SPELL win32codecs ; then
 fi  &&
 
 optional_depends  libdv "" "--disable-libdv" "to play files encoded with libdv (used by most digital camcorders)"  &&
-optional_depends  x264        "" "--disable-x264" "for x264 codec"                         &&
+optional_depends  x264                "" "--disable-x264" "for x264 codec"                                                 &&
 optional_depends  xvid "" "--disable-xvid" "for encoding with the xvid codec (distribution in USA and Japan is forbidden)"  &&
 optional_depends  twolame "" "--disable-twolame" "Twolame (MPEG layer 2 audio) support in mencoder"  &&
 
@@ -56,6 +52,7 @@ optional_depends  esound "" "--disable-esd" "for direct esd audio output"  &&
 optional_depends  arts "" "--disable-arts" "for arts audio output"  &&
 optional_depends  alsa-lib "" "--disable-alsa" "for alsa audio output"  &&
 optional_depends  nas "" "--disable-nas" "for NAS audio output"  &&
+optional_depends  pulseaudio "" "--disable-pulse" "for pulseaudio audio output" &&
 
 # video devices
 optional_depends  svgalib "" "--disable-svga" "for svgalib video output"  &&
@@ -91,23 +88,8 @@ optional_depends  lirc "" "--disable-lirc" "for remote-control"  &&
 optional_depends  freetype2 "" "--disable-freetype" "for truetype subtitle font support"  &&
 optional_depends  fontconfig "" "--disable-fontconfig" "for fontconfig font lookup support"  &&
 optional_depends  mplayer-fonts "" "" "for OSD/subtitle fonts (not needed if compiled with freetype2 support" &&
-optional_depends  libdvdread \
-			  "" \
-			  "--disable-dvdread" \
-			  "support for reading scrambled (CSS) DVDs" &&
-optional_depends  fribidi \
-			  "" \
-			  "--disable-fribidi" \
-			  "for locales writing from right to left"   &&
-optional_depends  enca \
-			  "" \
-			  "--disable-enca" \
-			  "for ENCA charset oracle library"          &&
-optional_depends  OPENAL \
-			  "" \
-			  "--disable-openal" \
-			  "for OpenAL sound support"  &&
-optional_depends  samba \
-			  "--enable-smb" \
-			  "" \
-			  "for SMB protocol support"
+optional_depends  libdvdread "" "--disable-dvdread" "support for reading scrambled (CSS) DVDs" &&
+optional_depends  fribidi "" "--disable-fribidi" "for locales writing from right to left" &&
+optional_depends  enca "" "--disable-enca" "for ENCA charset oracle library" &&
+optional_depends  OPENAL "" "--disable-openal" "for OpenAL sound support" &&
+optional_depends  samba "--enable-smb" "" "for SMB protocol support"
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 9e7d3a3053..75df611d0f 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2010-06-03 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: removed polypaudio; pulseaudio isn't SVN anymore; cleaned up;
+	  replaced tabs with spaces
+
 2010-06-02 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.0rc3
 	* PRE_BUILD, *diff, *patch: patches removed