[SCM] mplayer packaging branch, karmic, updated. debian/1.0.rc3+svn20090426-1ubuntu6
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Thu Sep 24 21:18:51 UTC 2009
The following commit has been merged in the karmic branch:
commit f853530e74caeaa77ca580d74ba7abc806d5d482
Merge: 35b1a5ad3ccc93299c7f52f0e588866817e1aef9 20c354983574c61b38537bf9b3ee06c172e78f34
Author: Reinhard Tartler <siretart at tauware.de>
Date: Thu Sep 24 21:45:03 2009 +0200
merge from master
diff --combined debian/control
index aa5f81f,cece8e4..0ad18a1
--- a/debian/control
+++ b/debian/control
@@@ -1,10 -1,11 +1,12 @@@
Source: mplayer
Section: video
Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: A Mennucc1 <mennucc1 at debian.org>,
- Reinhard Tartler <siretart at tauware.de>
+ Reinhard Tartler <siretart at tauware.de>,
+ Andres Mejia <mcitadel at gmail.com>
+ DM-Upload-Allowed: yes
Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer.git;a=summary
@@@ -25,8 -26,6 +27,8 @@@ Build-Depends: debhelper (>= 7)
libdts-dev,
libdvdread-dev,
libesd0-dev,
+ libfaac-dev,
+ libfaad-dev,
libfontconfig1-dev,
libfreetype6-dev,
libfribidi-dev,
@@@ -38,7 -37,6 +40,6 @@@
liblircclient-dev,
liblivemedia-dev,
liblzo2-dev,
- libmp3lame-dev,
libncurses5-dev,
libopenal-dev,
libpng12-dev | libpng-dev,
@@@ -52,12 -50,11 +53,13 @@@
libswscale-dev,
libtheora-dev (>= 1.0~beta1),
libvorbis-dev,
+ libvorbisidec-dev,
libx11-dev,
+ libx264-dev,
libxext-dev,
libxinerama-dev,
libxv-dev,
+ libxvidcore4-dev,
libxvmc-dev,
libxxf86dga-dev,
libxxf86vm-dev,
@@@ -73,15 -70,15 +75,15 @@@ Package: mplaye
Architecture: any
Section: video
Suggests: mplayer-doc,
- ttf-freefont,
- netselect | fping,
- bzip2,
- fontconfig
+ ttf-freefont,
+ netselect | fping,
+ bzip2,
+ fontconfig
Depends: debconf | debconf-2.0,
- mplayer-skin,
- mplayer-nogui,
- ${shlibs:Depends},
- ${misc:Depends}
+ mplayer-skin,
+ mplayer-nogui,
+ ${shlibs:Depends},
+ ${misc:Depends}
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,
@@@ -95,48 -92,25 +97,49 @@@
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+.
+ and DXR3/Hollywood+.
.
Not all of the upstream code is distributed in the source tarball.
See the README.Debian and copyright files for details.
+Package: mencoder
+Architecture: any
+Section: video
+Suggests: mplayer-doc,
+ ttf-freefont,
+ bzip2,
+ fontconfig
+Depends: debconf | debconf-2.0,
+ mplayer-nogui,
+ ${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-nogui
Architecture: any
Section: video
Suggests: mplayer-doc,
- ttf-freefont,
- netselect | fping,
- bzip2,
- fontconfig
+ ttf-freefont,
+ netselect | fping,
+ bzip2,
+ fontconfig,
+ nvidia-libvdpau1 | nvidia-libvdpau
Depends: debconf | debconf-2.0,
- ${shlibs:Depends},
- ${misc:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
-Replaces: mplayer (<< 1.0~rc3+svn20090426-1),
+Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1),
- mplayer-doc (<< 2:1.0~rc3+svn20090426-1)
+ mplayer-doc (<< 1.0~rc3+svn20090426-1)
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,
@@@ -150,7 -124,7 +153,7 @@@
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+.
+ and DXR3/Hollywood+.
.
Not all of the upstream code is distributed in the source tarball.
See the README.Debian and copyright files for details.
@@@ -173,7 -147,7 +176,7 @@@ Architecture: al
Section: doc
Recommends: mplayer
Depends: ${misc:Depends}
-Replaces: mplayer (<< 1.0~rc3+svn20090426-1)
+Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1)
Description: documentation for MPlayer
This package contains the documentation for MPlayer, a movie player for
Unix-like systems.
diff --combined debian/patches/series
index 78cc204,e482463..23aeca0
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,5 +1,7 @@@
11configure-mktemp.patch
+ 22disable-xscreensaver.patch
23mplayer-debug-printf.patch
+ 24_enable_fontconfig_by_default.diff
30_add_gmplayer_man_rules.diff
+40_improve_desktop_file.patch
+41_use_fontconfig_by_default.patch
diff --combined debian/rules
index ff964e8,6e61b39..b304dbe
--- a/debian/rules
+++ b/debian/rules
@@@ -44,11 -44,7 +44,11 @@@ DEB_BUILD_CONFIGURE =
--disable-libavformat_a \
--disable-libpostproc_a \
--disable-libswscale_a \
- --enable-faad \
+ --enable-faac-lavc \
+ --enable-x264-lavc \
+ --enable-mp3lame-lavc \
+ --enable-libdirac-lavc \
+ --enable-libschroedinger-lavc \
$(archconf)
# Choose whether we want binary codec support (default on unknown archs: no).
@@@ -99,7 -95,7 +99,7 @@@ els
endif
ifeq ($(DEB_SOURCE),mplayer)
-DEB_BUILD_CONFIGURE += --disable-libdvdcss-internal --enable-dvdread --disable-mencoder
+DEB_BUILD_CONFIGURE += --disable-libdvdcss-internal --enable-dvdread
endif
# generate debugging symbols for mplayer-dbg for all archs but mipsen,
@@@ -131,12 -127,16 +131,16 @@@ COMMON_CONFIGURE_FLAGS =
--datadir=/usr/share/mplayer \
--codecsdir=/usr/lib/codecs \
--enable-xvmc \
+ --enable-vdpau \
--enable-sdl \
--enable-ossaudio \
--enable-lirc \
--enable-freetype \
--enable-menu \
- --enable-largefiles
+ --enable-largefiles
+
+ # We add vdpau headers ourselves so mplayer can stay in main
+ COMMON_CONFIGURE_FLAGS += --extra-cflags="-I$(CURDIR)/debian/include"
# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282 and
# https://wiki.ubuntu.com/DistCompilerFlags
@@@ -168,22 -168,14 +172,22 @@@ install-arch
$(MAKE) install-mplayer-man-en DESTDIR=$(CURDIR)/debian/mplayer-nogui
install -D -m 644 etc/example.conf \
$(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
+ #install mencoder
+ $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
+ dh_link -p mencoder usr/share/man/man1/mplayer.1.gz usr/share/man/man1/mencoder.1.gz
# build gui version
[ ! -f config.mak ] || $(MAKE) distclean
$(CLEAN_ENV) \
./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
$(CLEAN_ENV) \
$(MAKE)
- # install mplayer binary with gui support as ./usr/bin/gmplayer
install -D -m 755 mplayer $(CURDIR)/debian/mplayer/usr/bin/gmplayer
+ install -D -m 655 etc/mplayer.desktop \
+ $(CURDIR)/debian/mplayer/usr/share/applications/mplayer.desktop
+ install -D -m 655 etc/mplayer.xpm \
+ $(CURDIR)/debian/mplayer/usr/share/pixmaps/mplayer.xpm
+ install -D -m 644 DOCS/man/en/mplayer.1 \
+ $(CURDIR)/debian/mplayer/usr/share/man/man1/gmplayer.1
###### build-indep
@@@ -196,10 -188,8 +200,10 @@@ install-indep-stamp: configure-arch-sta
$(MAKE) -C DOCS/xml html-chunked
dh_prep -i
$(MAKE) install-mplayer-gui-man DESTDIR=$(CURDIR)/debian/mplayer-doc
+ $(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer-doc
# Drop the english manpage, installed in each mplayer package
rm -v $(CURDIR)/debian/mplayer-doc/usr/share/man/man1/mplayer.1
+ rm -v $(CURDIR)/debian/mplayer-doc/usr/share/man/man1/mencoder.1
dh_installdocs -i
touch $@
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list