[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu14-16-gda51fea
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Thu Apr 22 18:55:32 UTC 2010
The following commit has been merged in the master branch:
commit 1ea6684d7ee596284084a059c05487063b6f07a9
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Apr 17 18:30:06 2010 +0200
gross hack to avoid building mplayer-nogui and mplayer-gui packages
this patch should be reverted as soon as mplayer gets accepted into
Debian. This is an emergency upload to fix the open RC bugs in the
debian package.
diff --git a/debian/control b/debian/control
index f8c8880..80a3382 100644
--- a/debian/control
+++ b/debian/control
@@ -70,60 +70,62 @@ Build-Depends: debhelper (>= 7),
xsltproc,
zlib1g-dev
-Package: mplayer-gui
-Architecture: any
-Section: video
-Suggests: mplayer-doc,
- ttf-freefont,
- netselect | fping,
- 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+.
- .
- Not all of the upstream code is distributed in the source tarball.
- See the README.Debian and copyright files for details.
+# disabled to avoid binary NEW
+# Package: mplayer-gui
+# Architecture: any
+# Section: video
+# Suggests: mplayer-doc,
+# ttf-freefont,
+# netselect | fping,
+# 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+.
+# .
+# 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: 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.
+# disabled to avoid binary NEW
+# Package: mencoder
+# Architecture: any
+# Section: video
+# 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
@@ -181,10 +183,11 @@ Description: documentation for MPlayer
This package contains the documentation for MPlayer, a movie player for
Unix-like systems.
-Package: mplayer-nogui
-Architecture: all
-Depends: mplayer,
- ${misc:Depends}
-Description: movie player for Unix-like systems (transitional package)
- This is a transitional package to assist with upgrading from older
- versions of mplayer. It can be safely removed.
+# disabled to avoid binary NEW
+# Package: mplayer-nogui
+# Architecture: all
+# Depends: mplayer,
+# ${misc:Depends}
+# Description: movie player for Unix-like systems (transitional package)
+# This is a transitional package to assist with upgrading from older
+# versions of mplayer. It can be safely removed.
diff --git a/debian/rules b/debian/rules
index 678e347..2a4965c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,19 +108,20 @@ install-arch: $(QUILT_STAMPFN)
$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
install -D -m 644 debian/mplayer.conf \
$(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
- #install mencoder
- $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
- # build gui version
- [ ! -f config.mak ] || $(MAKE) distclean
- $(CLEAN_ENV) \
- ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
- $(CLEAN_ENV) \
- $(MAKE)
- install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
- install -D -m 644 etc/mplayer.desktop \
- $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop
- install -D -m 644 etc/mplayer.xpm \
- $(CURDIR)/debian/mplayer-gui/usr/share/pixmaps/mplayer.xpm
+ # don't build/install mencoder and gui variant to skip binary NEW
+ # #install mencoder
+ # $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
+ # # build gui version
+ # [ ! -f config.mak ] || $(MAKE) distclean
+ # $(CLEAN_ENV) \
+ # ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
+ # $(CLEAN_ENV) \
+ # $(MAKE)
+ # install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
+ # install -D -m 644 etc/mplayer.desktop \
+ # $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop
+ # install -D -m 644 etc/mplayer.xpm \
+ # $(CURDIR)/debian/mplayer-gui/usr/share/pixmaps/mplayer.xpm
###### build-indep
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list