[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090405-1-8-g0a6ab2e
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Jun 2 20:44:03 UTC 2009
The following commit has been merged in the master branch:
commit a43547fc7291da3cae17b890b9fc1c15564d9ccb
Author: fabrice <coutadeurf at gmail.com>
Date: Sun May 31 08:23:41 2009 +0200
reorganise package layout
- rename mplayer -> mplayer-nogui
- introduce new package "mplayer", that ships only gmplayer
and depends on "mplayer-nogui"
- install only english manpage in "mplayer-nogui", other language
are installed in "mplayer-doc"
diff --git a/debian/control b/debian/control
index f04c788..322b291 100644
--- a/debian/control
+++ b/debian/control
@@ -73,6 +73,7 @@ Suggests: mplayer-doc,
fontconfig
Depends: debconf | debconf-2.0,
mplayer-skin,
+ mplayer-nogui,
${shlibs:Depends},
${misc:Depends}
Description: movie player for Unix-like systems
@@ -93,6 +94,37 @@ Description: movie player for Unix-like systems
Not all of the upstream code is distributed in the source tarball.
See the README.Debian and copyright files for details.
+Package: mplayer-nogui
+Architecture: any
+Section: video
+Suggests: mplayer-doc,
+ ttf-freefont,
+ netselect | fping,
+ bzip2,
+ fontconfig
+Depends: debconf | debconf-2.0,
+ ${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,
+ 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.
+ .
+ Version without the GUI in GTK
+
Package: mplayer-dbg
Architecture: any
Section: debug
diff --git a/debian/mplayer.examples b/debian/mplayer-nogui.examples
similarity index 100%
rename from debian/mplayer.examples
rename to debian/mplayer-nogui.examples
diff --git a/debian/mplayer.install b/debian/mplayer-nogui.install
similarity index 100%
rename from debian/mplayer.install
rename to debian/mplayer-nogui.install
diff --git a/debian/mplayer-nogui.mime b/debian/mplayer-nogui.mime
new file mode 100644
index 0000000..556ca9d
--- /dev/null
+++ b/debian/mplayer-nogui.mime
@@ -0,0 +1,21 @@
+application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio"
+application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio"
+audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format"
+audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists"
+audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format"
+audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format"
+audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist"
+audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists"
+audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF"
+video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY"
+video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"
+video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY"
+video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
+video/mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY"
+video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY"
+video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
+video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY"
diff --git a/debian/mplayer.preinst b/debian/mplayer-nogui.preinst
similarity index 100%
rename from debian/mplayer.preinst
rename to debian/mplayer-nogui.preinst
diff --git a/debian/mplayer.dirs b/debian/mplayer.dirs
deleted file mode 100644
index c2d7eef..0000000
--- a/debian/mplayer.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/mplayer
-usr/lib/mplayer
diff --git a/debian/mplayer.docs b/debian/mplayer.docs
deleted file mode 100644
index 4d1541f..0000000
--- a/debian/mplayer.docs
+++ /dev/null
@@ -1 +0,0 @@
-Copyright
diff --git a/debian/mplayer.files b/debian/mplayer.files
deleted file mode 100644
index e6a6064..0000000
--- a/debian/mplayer.files
+++ /dev/null
@@ -1,2 +0,0 @@
-mplayer_1.0-pre-cvs-2003-03-24_i386.deb graphics optional
-mplayer-doc_1.0-pre-cvs-2003-03-24_i386.deb graphics optional
diff --git a/debian/rules b/debian/rules
index cf6e6b6..7974d72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,7 +135,6 @@ COMMON_CONFIGURE_FLAGS = \
--enable-sdl \
--enable-ossaudio \
--enable-lirc \
- --enable-gui \
--enable-freetype \
--enable-menu \
--enable-largefiles
@@ -154,12 +153,13 @@ configure-arch-stamp: $(QUILT_STAMPFN)
touch configure-arch-stamp
# commands to compile the package
-build-arch: build-arch-stamp
-build-arch-stamp: configure-arch-stamp
+build-common:
dh_testdir
+ [ ! -f config.mak ] || $(MAKE) distclean
+ $(CLEAN_ENV) \
+ ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) $(GUI_FLAG)
$(CLEAN_ENV) \
$(MAKE)
- touch build-arch-stamp
###### build-indep
@@ -172,9 +172,6 @@ build-indep-stamp:
$(MAKE) -C DOCS/xml html-chunked
touch build-indep-stamp
-build: build-indep build-arch
-
-
################ clean
clean: clean-real unpatch
@@ -187,23 +184,31 @@ clean-real:
##################### install
-install-arch: build-arch
+install-nogui:
+ $(MAKE) -f debian/rules GUI_FLAG=--disable-gui build-common
+
dh_testdir
dh_prep -a
- $(MAKE) install-gui DESTDIR=$(destdir)
- $(MAKE) install-mplayer-gui-man DESTDIR=$(destdir)
+ $(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer-nogui
+ $(MAKE) install-mplayer-man-en DESTDIR=$(CURDIR)/debian/mplayer-nogui
# scripts
chmod a+x debian/scripts/*
- dh_install
- install -D -m 644 etc/example.conf $(destdir)/etc/mplayer/mplayer.conf
+ install -D -m 644 etc/example.conf $(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
- dh_installdocs -p $(DEB_SOURCE)
- dh_installexamples
+install-gui:
+ $(MAKE) -f debian/rules GUI_FLAG=--enable-gui build-common
+
+ install -D -m 755 mplayer $(CURDIR)/debian/mplayer/usr/bin/gmplayer
+ install -D -m 644 DOCS/man/en/mplayer.1 $(CURDIR)/debian/mplayer/usr/share/man/man1/gmplayer.1
install-indep: build-indep
dh_testdir
dh_prep -i
+ $(MAKE) install-mplayer-gui-man DESTDIR=$(CURDIR)/debian/mplayer-doc
+ # Drop the english manpage, installed in each mplayer package
+ rm -rf $(CURDIR)/debian/mplayer-doc/usr/share/man/mplayer.1
+
dh_installdocs -i
#####################################################
@@ -216,6 +221,7 @@ install-indep: build-indep
binary-common:
dh_testdir
dh_testroot
+ dh_install
dh_installchangelogs
dh_installdocs
dh_installexamples
@@ -259,9 +265,13 @@ binary-indep: install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i THISPACKAGE=mplayer-doc binary-common
# Build architecture-dependent packages using the common target.
-binary-arch: install-arch
+binary-arch: binary-nogui binary-gui
+binary-gui: install-gui
$(MAKE) -f debian/rules DH_OPTIONS=-a THISPACKAGE=mplayer binary-common
+binary-nogui: install-nogui
+ $(MAKE) -f debian/rules DH_OPTIONS=-a THISPACKAGE=mplayer-nogui binary-common
+
binary: binary-indep binary-arch
###############################################
@@ -274,4 +284,4 @@ get-orig-source:
chmod +x debian/strip.sh
sh debian/get-orig-source.sh -d $(SVN_VERSION)
-.PHONY: build clean binary-indep binary-arch binary-common binary install binary binary-arch binary-indep clean checkroot get-orig-source autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig
+.PHONY: build clean binary-indep binary-arch binary-common binary install binary binary-arch binary-indep clean checkroot get-orig-source autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig build-gui build-nogui install-gui install-nogui
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list