[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:11:14 UTC 2010
The following commit has been merged in the ubuntu branch:
commit 1288b678a995478d454507646c540b15b8262ab2
Merge: 50829064f89206c95ea6f63b557019f489a0852c 1f04bbc5ad21917339f55eb52b6dd4ea20473ec8
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 7 12:03:34 2010 -0400
Merge branch 'master.experimental' into ubuntu
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index 5dcbe48,c06a95f..ac17102
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,23 @@@
+ mplayer (2:1.0~rc4~try1.dsfg1-1) experimental; urgency=low
+
+ * enable the mencoder package
+ * sort build depends alphabetically
+ * enable dvdnav support, Closes: #582508, #488226, LP: #611749
+ * prepare new upload
+ * no longer build mplayer-gui, it doesn't build anymore with shared
+ swscale
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 02 Aug 2010 16:30:06 -0400
+
+mplayer (2:1.0~rc4~try1-1ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental, remaining changes:
+ - build depend against, lame, x264, xvid
+ - enable mencoder and mplayer-gui
+ * ensure that quilt patches are actually applied
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 29 Jul 2010 07:25:31 -0400
+
mplayer (2:1.0~rc4~try1-1) experimental; urgency=low
* New Upstream Version, LP: #539315
@@@ -18,9 -20,10 +29,9 @@@
-- 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 49bbde8,24c79ce..8b90f32
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,6 +14,6 @@@ Build-Depends: debhelper (>= 7)
docbook-xml,
docbook-xsl,
ladspa-sdk,
- libenca-dev,
libaa1-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudio-dev,
@@@ -26,7 -25,9 +25,9 @@@
libcdparanoia-dev | libcdparanoia0-dev,
libdirectfb-dev,
libdts-dev,
+ libdvdnav-dev,
libdvdread-dev,
+ libenca-dev,
libesd0-dev,
libfaad-dev,
libfontconfig1-dev,
@@@ -34,13 -35,11 +35,12 @@@
libfribidi-dev,
libgif-dev,
libgl1-mesa-dev,
- libgtk2.0-dev,
libjack-dev,
libjpeg62-dev,
liblircclient-dev,
liblivemedia-dev,
liblzo2-dev,
+ libmp3lame-dev,
libmpcdec-dev,
libncurses5-dev,
libopenal-dev,
@@@ -54,53 -53,22 +54,24 @@@
libsvga1-dev [i386 amd64],
libswscale-dev,
libtheora-dev (>= 1.0~beta1),
+ libvdpau-dev [i386 amd64],
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,
- libvdpau-dev [i386 amd64],
pkg-config,
vstream-client-dev,
x11proto-core-dev,
xsltproc,
zlib1g-dev
- 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,
diff --combined debian/rules
index 2dd1a81,65d99cd..7258a9d
--- a/debian/rules
+++ b/debian/rules
@@@ -49,6 -49,11 +49,6 @@@ CONFIGURE_FLAGS =
--language=all \
--disable-libdvdcss-internal \
--disable-dvdread-internal \
- --disable-libavutil_a \
- --disable-libavcodec_a \
- --disable-libavformat_a \
- --disable-libpostproc_a \
- --disable-libswscale_a \
$(archconf)
ifeq ($(DEB_HOST_ARCH),i386)
@@@ -95,15 -100,6 +95,6 @@@ build: build-arch build-inde
build-arch:
dh_testdir
dh_prep -a
- $(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer
- $(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
- $(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
-
- # build non-gui version
- # & mencoder
- debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
- dh_testdir
- ! test -d .git || quilt push -a
$(CLEAN_ENV) \
./configure $(CONFIGURE_FLAGS) --disable-gui
$(CLEAN_ENV) \
@@@ -115,20 -111,6 +106,6 @@@
install -D -m 644 debian/mplayer.conf \
$(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
- # build gui version
- debian/mplayer-gui/usr/bin/gmplayer:
- dh_testdir
- ! test -d .git || quilt push -a
- $(CLEAN_ENV) \
- ./configure $(CONFIGURE_FLAGS) --enable-gui
- $(CLEAN_ENV) \
- $(MAKE) $(NUMJOBS) mplayer
- 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
-
# binaries already installed via build rules as we have to build several flavors
install-arch: build-arch
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list