[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc4.try1-1-22-g6729499
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 7 17:10:27 UTC 2010
The following commit has been merged in the ubuntu branch:
commit 016bc94e8a5d5d5906d656d2ed440e4342515d83
Merge: 93f4fc6418c496704b700f3d8b535c48b61bffe8 069cff988b812ecbba93ce81df08d31279d5cd79
Author: Reinhard Tartler <siretart at tauware.de>
Date: Thu Jul 29 07:25:03 2010 -0400
Merge branch 'master.experimental' into ubuntu
diff --combined debian/changelog
index 3d67417,c2294c5..9ef3361
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,18 +1,17 @@@
+ mplayer (2:1.0~rc4~try1-1) experimental; urgency=low
+
+ * New Upstream Version, LP: #539315
+ * Build (against) again the System FFmpeg
+ * tighten dependency on FFmpeg 0.6
+ * remove patches merged upstream
+ * remove 22disable-xscreensaver.patch
+ * refresh patches
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 28 Jul 2010 21:04:54 -0400
+
-mplayer (2:1.0~rc3++final-1~exp1) experimental; urgency=low
+mplayer (2:1.0~rc3++final-0ubuntu3) maverick; urgency=low
- * build mplayer against internal ffmpeg to workaround interoperability
- problems with FFmpeg 0.6
+ * readd x264, xvid and mp3lame support, LP: #606125
-- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 18:25:34 +0200
diff --combined debian/control
index b32206f,344e9ee..49bbde8
--- a/debian/control
+++ b/debian/control
@@@ -18,6 -18,10 +18,10 @@@ Build-Depends: debhelper (>= 7)
libaa1-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudio-dev,
+ libavcodec-dev (>= 4:0.6),
+ libavdevice-dev (>= 4:0.6),
+ libavformat-dev (>= 4:0.6),
+ libavutil-dev,
libcaca-dev,
libcdparanoia-dev | libcdparanoia0-dev,
libdirectfb-dev,
@@@ -36,7 -40,6 +40,7 @@@
liblircclient-dev,
liblivemedia-dev,
liblzo2-dev,
+ libmp3lame-dev,
libmpcdec-dev,
libncurses5-dev,
libopenal-dev,
@@@ -53,11 -56,9 +57,11 @@@
libvorbis-dev,
libvorbisidec-dev,
libx11-dev,
+ libx264-dev (>= 2:0.85.1442),
libxext-dev,
libxinerama-dev,
libxv-dev,
+ libxvidcore-dev,
libxvmc-dev,
libxxf86dga-dev,
libxxf86vm-dev,
@@@ -68,56 -69,57 +72,56 @@@
xsltproc,
zlib1g-dev
-# disabled to avoid binary NEW
-# Package: mplayer-gui
-# Architecture: any
-# Suggests: mplayer-doc,
-# ttf-freefont,
-# bzip2,
-# fontconfig
-# Depends: mplayer-skin,
-# mplayer,
-# ${shlibs:Depends},
-# ${misc:Depends}
-# Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
-# mplayer (<< 2:1.0~rc3+svn20090426-2)
-# Description: movie player for Unix-like systems
-# MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
-# ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
-# supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
-# also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
-# .
-# Another big feature of MPlayer is the wide range of supported output
-# drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
-# DirectFB, but also SDL (plus all its drivers) and some
-# low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
-# and Permedia3). Most of them support software or hardware scaling,
-# therefore allowing fullscreen display. MPlayer is also able
-# to use some hardware MPEG decoder boards, such as the DVB
-# and DXR3/Hollywood+.
-# .
-# This package includes the gui variant of mplayer.
+Package: mplayer-gui
+Architecture: any
+Suggests: mplayer-doc,
+ ttf-freefont,
+ bzip2,
+ fontconfig
+Depends: mplayer-skin,
+ mplayer,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
+ mplayer (<< 2:1.0~rc3+svn20090426-2)
+Description: movie player for Unix-like systems
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ Another big feature of MPlayer is the wide range of supported output
+ drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
+ DirectFB, but also SDL (plus all its drivers) and some
+ low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
+ and Permedia3). Most of them support software or hardware scaling,
+ therefore allowing fullscreen display. MPlayer is also able
+ to use some hardware MPEG decoder boards, such as the DVB
+ and DXR3/Hollywood+.
+ .
+ This package includes the gui variant of mplayer.
-# Package: mencoder
-# Architecture: any
-# Suggests: mplayer-doc,
-# ttf-freefont,
-# bzip2,
-# fontconfig
-# Depends: mplayer,
-# ${shlibs:Depends},
-# ${misc:Depends}
-# Description: MPlayer's Movie Encoder
-# MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
-# ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
-# supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
-# also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
-# .
-# This package contains menconder, a simple movie encoder, designed to
-# encode MPlayer-playable movies
-# (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
-# MPlayer-playable formats. It can encode with various codecs, like DivX4
-# (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
-# copying and video resizing abilities.
+Package: mencoder
+Architecture: any
+Suggests: mplayer-doc,
+ ttf-freefont,
+ bzip2,
+ fontconfig
+Depends: mplayer,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: MPlayer's Movie Encoder
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ This package contains menconder, a simple movie encoder, designed to
+ encode MPlayer-playable movies
+ (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
+ MPlayer-playable formats. It can encode with various codecs, like DivX4
+ (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
+ copying and video resizing abilities.
Package: mplayer
Architecture: any
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list