[SCM] mplayer/master: merge the experimental branch
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Feb 6 19:06:19 UTC 2011
add versioned build depends for all ffmpeg packages
update debian/changelog
clarifications in debian/copyright
remove patches that are applied upstream
new upstream snapshot
Merge commit 'upstream/1.0.rc4.try2.dfsg1' into master.experimental
Imported Upstream version 1.0~rc4~try2.dfsg1
enable joystick at compilation but leave it disable in config (Closes: #592082)
unbreak compilation for eval.h move not yet in 0.6
avoid building the same source twice
update debian/changelog
no longer build mplayer-gui, it doesn't build anymore with shared swscale
prepare new upload
enable dvdnav support, Closes: #582508, #488226, LP: #611749
sort build depends alphabetically
enable mencoder and mplayer-gui
Merge branch 'upstream' into master.experimental
remove unwanted dvdcss
Merge commit 'upstream/1.0.rc4.try1' into master.experimental
Imported Upstream version 1.0~rc4~try1
also clean up in DOCS/xml directory
fix building of documentation
remove libavutil/avcommon.h on clean
update debian/changelog
refresh patches
remove 22disable-xscreensaver.patch
remove patches merged upstream
tighten dependency on FFmpeg 0.6
Revert "build mplayer against internal ffmpeg to workaround interoperability problems with FFmpeg 0.6"
merge new upstream version
Imported Upstream version 1.0rc4~try1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6338f645e635339978313f79a3149606e2b12f5b
X-Git-Newrev: d43259d57b54abf72865a6fc06864aafa39eea63
The following commit has been merged in the master branch:
commit 0fa5906bd421853410a9888f0fbdd2fe1b9fc5c7
Merge: 6338f645e635339978313f79a3149606e2b12f5b 7d28728f8862249159c62e174c073ff5dbc86d71
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Feb 6 17:05:48 2011 +0100
merge the experimental branch
diff --combined debian/changelog
index de6a049,5fcb961..7225a1f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,37 +1,51 @@@
+ mplayer (2:1.0~rc4~try2.dfsg1-1) experimental; urgency=low
+
+ [ steph ]
+ * enable joystick at compilation but leave it disable in config
+ (Closes: #592082, LP: #617986)
+
+ [ Reinhard Tartler ]
+ * new upstream snapshot, remove patches that are applied upstream
+ * minor clarifications in debian/copyright
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 23 Jan 2011 21:59:46 +0100
+
+ 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-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.dfsg1-2) unstable; urgency=low
+
+ * prepare next upload
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 07 Aug 2010 10:20:58 -0400
+
+mplayer (2:1.0~rc3++final.dfsg1-1) unstable; urgency=low
+
+ * upload to unstable
+ * enable mencoder and mplayer-gui package
+ * build again against the system FFmpeg 0.5
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 31 Jul 2010 23:44:52 -0400
+
mplayer (2:1.0~rc3++final-1~exp1) experimental; urgency=low
* build mplayer against internal ffmpeg to workaround interoperability
diff --combined debian/control
index 8f4e662,dd28e8c..8e7b0ab
--- a/debian/control
+++ b/debian/control
@@@ -14,19 -14,20 +14,20 @@@ Build-Depends: debhelper (>= 7)
docbook-xml,
docbook-xsl,
ladspa-sdk,
libaa1-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudio-dev,
- libavcodec-dev (>= 0.svn20080206),
- libavdevice-dev,
- libavformat-dev,
- libavutil-dev,
+ libavcodec-dev (>= 4:0.6),
+ libavdevice-dev (>= 4:0.6),
+ libavformat-dev (>= 4:0.6),
+ libavutil-dev (>= 4:0.6),
libcaca-dev,
libcdparanoia-dev | libcdparanoia0-dev,
libdirectfb-dev,
libdts-dev,
+ libdvdnav-dev,
libdvdread-dev,
+ libenca-dev,
libesd0-dev,
libfaad-dev,
libfontconfig1-dev,
@@@ -34,7 -35,6 +35,6 @@@
libfribidi-dev,
libgif-dev,
libgl1-mesa-dev,
- libgtk2.0-dev,
libjack-dev,
libjpeg62-dev,
liblircclient-dev,
@@@ -44,15 -44,16 +44,16 @@@
libncurses5-dev,
libopenal-dev,
libpng12-dev | libpng-dev,
- libpostproc-dev,
+ libpostproc-dev (>= 4:0.6),
libpulse-dev,
libschroedinger-dev,
libsdl1.2-dev | libsdl1.1-dev,
libsmbclient-dev,
libspeex-dev,
libsvga1-dev [i386 amd64],
- libswscale-dev,
+ libswscale-dev (>= 4:0.6),
libtheora-dev (>= 1.0~beta1),
+ libvdpau-dev [i386 amd64],
libvorbis-dev,
libvorbisidec-dev,
libx11-dev,
@@@ -62,42 -63,12 +63,41 @@@
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 77fd52a,516f353..3118846
--- a/debian/rules
+++ b/debian/rules
@@@ -54,6 -54,7 +54,7 @@@ CONFIGURE_FLAGS =
--disable-libavformat_a \
--disable-libpostproc_a \
--disable-libswscale_a \
+ --enable-joystick \
$(archconf)
ifeq ($(DEB_HOST_ARCH),i386)
@@@ -100,14 -101,6 +101,14 @@@ 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
$(CLEAN_ENV) \
./configure $(CONFIGURE_FLAGS) --disable-gui
$(CLEAN_ENV) \
@@@ -119,19 -112,6 +120,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
- $(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
@@@ -145,7 -125,7 +133,7 @@@ DOCS/HTML/en/index.html
build-indep:
dh_testdir
dh_prep -i
- test ! -f DOCS/HTML/en/index.html || $(MAKE) debian/rules DOCS/HTML/en/index.html
+ test ! -f DOCS/HTML/en/index.html || $(MAKE) -f debian/rules DOCS/HTML/en/index.html
# commands to compile the documentation
install-indep: build-indep
@@@ -159,7 -139,7 +147,7 @@@
clean:
dh_testdir
dh_testroot
- [ ! -f config.mak ] || $(MAKE) distclean
+ [ ! -f config.mak ] || $(MAKE) -C DOCS/xml releaseclean && $(MAKE) distclean
dh_clean snapshot_version
! test -d .git || quilt pop -a || test $$? = 2
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list