From 2f40f6c9d7a6e14b84299570c58d55bd28b0ddaf Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Tue, 15 May 2007 12:51:41 +0000 Subject: Changed default sources-file to refer /var/vdr/video. Moved 0.9.15 patches to own subdir. Add support for mplay-sh. (Portage version: 2.1.2.7) --- media-plugins/vdr-mplayer/ChangeLog | 15 +++++- .../vdr-mplayer/files/0.9.15/01_gentoo.diff | 36 +++++++++++++ .../files/0.9.15/02_slave_mode_default.diff | 16 ++++++ .../vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff | 63 ++++++++++++++++++++++ media-plugins/vdr-mplayer/files/0.9.15/series | 3 ++ media-plugins/vdr-mplayer/files/confd-0.9.15.sh | 11 ++++ .../vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1 | 3 ++ .../vdr-mplayer/files/mplayersources.conf | 2 +- media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh | 23 ++++++++ .../files/vdr-mplayer-0.9.15-gentoo.diff | 36 ------------- .../vdr-mplayer-0.9.15-slave-mode-default.diff | 16 ------ .../files/vdr-mplayer-0.9.15-vdr-1.5.1.patch | 63 ---------------------- .../vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild | 59 ++++++++++++++++++++ .../vdr-mplayer/vdr-mplayer-0.9.15.ebuild | 9 ++-- 14 files changed, 234 insertions(+), 121 deletions(-) create mode 100644 media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff create mode 100644 media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff create mode 100644 media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff create mode 100644 media-plugins/vdr-mplayer/files/0.9.15/series create mode 100644 media-plugins/vdr-mplayer/files/confd-0.9.15.sh create mode 100644 media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1 create mode 100644 media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh delete mode 100644 media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff delete mode 100644 media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff delete mode 100644 media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-vdr-1.5.1.patch create mode 100644 media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild (limited to 'media-plugins') diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog index d0838443fbf7..f7cc329560fc 100644 --- a/media-plugins/vdr-mplayer/ChangeLog +++ b/media-plugins/vdr-mplayer/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for media-plugins/vdr-mplayer # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.16 2007/04/17 12:50:07 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.17 2007/05/15 12:51:41 zzam Exp $ + +*vdr-mplayer-0.9.15-r1 (15 May 2007) + + 15 May 2007; Matthias Schwarzott + -files/vdr-mplayer-0.9.15-gentoo.diff, + -files/vdr-mplayer-0.9.15-slave-mode-default.diff, +files/confd-0.9.15.sh, + +files/rc-addon-0.9.15.sh, +files/0.9.15/03_vdr-1.5.1.diff, + +files/0.9.15/01_gentoo.diff, +files/0.9.15/series, + -files/vdr-mplayer-0.9.15-vdr-1.5.1.patch, + +files/0.9.15/02_slave_mode_default.diff, files/mplayersources.conf, + vdr-mplayer-0.9.15.ebuild, +vdr-mplayer-0.9.15-r1.ebuild: + Changed default sources-file to refer /var/vdr/video. Moved 0.9.15 patches + to own subdir. Add support for mplay-sh. 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: Removed bash specific stuff. diff --git a/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff b/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff new file mode 100644 index 000000000000..ae52fe7c71f1 --- /dev/null +++ b/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff @@ -0,0 +1,36 @@ +fix some path for gentoo install + +Joerg Bornkessel +diff -Naur mp3-0.9.15.orig/Makefile mp3-0.9.15/Makefile +--- mp3-0.9.15.orig/Makefile 2006-09-22 20:02:06.484888703 +0200 ++++ mp3-0.9.15/Makefile 2006-09-22 20:03:09.732841453 +0200 +@@ -24,14 +24,14 @@ + # in the VDR directory an set them there. + + ### uncomment one of these lines, if you don't want one of the plugins +-#WITHOUT_MP3=1 ++WITHOUT_MP3=1 + #WITHOUT_MPLAYER=1 + + ### uncomment the following line, if you don't have libsndfile installed +-#WITHOUT_LIBSNDFILE=1 ++WITHOUT_LIBSNDFILE=1 + + ### uncomment the following line, if you don't have libvorbisfile installed +-#WITHOUT_LIBVORBISFILE=1 ++WITHOUT_LIBVORBISFILE=1 + + ### uncomment the following line, if you want OSS sound output + #WITH_OSS_OUTPUT=1 +diff -Naur mp3-0.9.15.orig/mplayer.c mp3-0.9.15/mplayer.c +--- mp3-0.9.15.orig/mplayer.c 2006-09-22 20:02:06.504889953 +0200 ++++ mp3-0.9.15/mplayer.c 2006-09-22 20:06:46.998419703 +0200 +@@ -814,7 +814,7 @@ + { + if(!CheckVDRVersion(1,1,16,"mplayer")) return false; + i18n_name=Name(); +- MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf")); ++ MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayer/mplayersources.conf")); + if(MPlaySources.Count()<1) { + esyslog("ERROR: you must have defined at least one source in mplayersources.conf"); + fprintf(stderr,"No source(s) defined in mplayersources.conf\n"); diff --git a/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff b/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff new file mode 100644 index 000000000000..54a6c523b11c --- /dev/null +++ b/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff @@ -0,0 +1,16 @@ +set slave mode on OSD to default + +Joerg Bornkessel + +diff -ru mp3-0.9.14-orig/setup-mplayer.c mp3-0.9.14/setup-mplayer.c +--- mp3-0.9.14-orig/setup-mplayer.c 2006-07-07 09:56:27.000000000 +0200 ++++ mp3-0.9.14/setup-mplayer.c 2006-07-07 09:56:35.000000000 +0200 +@@ -30,7 +30,7 @@ + + cMPlayerSetup::cMPlayerSetup(void) + { +- SlaveMode = 0; ++ SlaveMode = 1; + ResumeMode = 2; + HideMainMenu = 0; + OsdPos = 0; diff --git a/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff b/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff new file mode 100644 index 000000000000..50a14f47756b --- /dev/null +++ b/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff @@ -0,0 +1,63 @@ +http://www.vdr-portal.de/board/thread.php?postid=565407#post565407 +diff -urN mp3-0.9.15/mp3.c mp3-unstable/mp3.c +--- mp3-0.9.15/mp3.c 2006-08-30 17:39:24.000000000 +0200 ++++ mp3-unstable/mp3.c 2007-01-15 18:33:56.000000000 +0100 +@@ -342,7 +342,12 @@ + #else + Interface->Close(); + #endif +- needsFastResponse=visible=bigwin=false; ++ visible=bigwin=false; ++#if APIVERSNUM >= 10500 ++ SetNeedsFastResponse(false); ++#else ++ needsFastResponse=false; ++#endif + } + } + +@@ -502,7 +507,12 @@ + #endif + ShowStatus(true); + bigwin=bigWin; +- needsFastResponse=visible=true; ++ visible=true; ++#if APIVERSNUM >= 10500 ++ SetNeedsFastResponse(true); ++#else ++ needsFastResponse=true; ++#endif + fliptime=listtime=0; flipint=0; flip=-1; top=lastTop=-1; lastIndex=lastTotal=-1; + delete lastMode; lastMode=0; + } +diff -urN mp3-0.9.15/mplayer.c mp3-unstable/mplayer.c +--- mp3-0.9.15/mplayer.c 2006-09-19 20:18:13.000000000 +0200 ++++ mp3-unstable/mplayer.c 2007-01-15 18:33:56.000000000 +0100 +@@ -232,7 +233,12 @@ + #else + Interface->Close(); + #endif +- needsFastResponse=visible=modeOnly=false; ++ visible=modeOnly=false; ++#if APIVERSNUM >= 10500 ++ SetNeedsFastResponse(false); ++#else ++ needsFastResponse=false; ++#endif + } + } + +@@ -303,7 +309,12 @@ + Interface->Clear(); + if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent); + #endif +- needsFastResponse=visible=true; modeOnly=false; ++ visible=true; modeOnly=false; ++#if APIVERSNUM >= 10500 ++ SetNeedsFastResponse(true); ++#else ++ needsFastResponse=true; ++#endif + lastCurrent=lastTotal=-1; + flush=true; + } diff --git a/media-plugins/vdr-mplayer/files/0.9.15/series b/media-plugins/vdr-mplayer/files/0.9.15/series new file mode 100644 index 000000000000..7860a20767b2 --- /dev/null +++ b/media-plugins/vdr-mplayer/files/0.9.15/series @@ -0,0 +1,3 @@ +01_gentoo.diff +02_slave_mode_default.diff +03_vdr-1.5.1.diff diff --git a/media-plugins/vdr-mplayer/files/confd-0.9.15.sh b/media-plugins/vdr-mplayer/files/confd-0.9.15.sh new file mode 100644 index 000000000000..b336c5b9e5a1 --- /dev/null +++ b/media-plugins/vdr-mplayer/files/confd-0.9.15.sh @@ -0,0 +1,11 @@ +# Global config file for vdr mplayer plugin +# +# Restart of VDR is needed after changes + + +# Selected the script to call mplayer +# +# allowed value: mplay.sh mplayer.sh +# default value: prefer the first installed from the listed possibilities +# +#MPLAYER_PLUGIN_CALL="mplay.sh" diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1 new file mode 100644 index 000000000000..efcf6709e518 --- /dev/null +++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1 @@ -0,0 +1,3 @@ +MD5 e1c78a10d65f6422555b4755f2f634de vdr-mp3-0.9.15.tar.gz 123718 +RMD160 5ab5404a3c2df45df45588d33cde5ae11a433998 vdr-mp3-0.9.15.tar.gz 123718 +SHA256 1c3ae584c46d41661dd320f76938fe05fd1801f53537d7e08479a13243eca3c4 vdr-mp3-0.9.15.tar.gz 123718 diff --git a/media-plugins/vdr-mplayer/files/mplayersources.conf b/media-plugins/vdr-mplayer/files/mplayersources.conf index 9ef16317c264..96858a41f028 100644 --- a/media-plugins/vdr-mplayer/files/mplayersources.conf +++ b/media-plugins/vdr-mplayer/files/mplayersources.conf @@ -1,3 +1,3 @@ -/video;Festplatte;0 +/var/vdr/video;Video-Verzeichnis;0 /mnt/cdrom;CDRom;1 diff --git a/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh b/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh new file mode 100644 index 000000000000..e1bea4676ee4 --- /dev/null +++ b/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh @@ -0,0 +1,23 @@ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh,v 1.1 2007/05/15 12:51:41 zzam Exp $ +# +# rc-addon plugin-startup-skript for vdr-mplayer +# + +: ${MPLAYER_PLUGIN_CALL:=mplay.sh} +: ${MPLAYER_PLUGIN_MOUNT:=mount-mplayer.sh} + +plugin_pre_vdr_start() { + local P=/usr/share/vdr/mplayer/bin + local CALL="" + if [ -f $P/${MPLAYER_PLUGIN_CALL} ]; then + CALL=${MPLAYER_PLUGIN_CALL} + elif [ -f $P/mplay.sh ]; then + CALL=mplay.sh + elif [ -f $P/mplayer.sh ]; then + CALL=mplayer.sh + else + eerror "vdr-mplayer: No mplayer-script found" + fi + add_plugin_param "-m ${P}/${MPLAYER_PLUGIN_MOUNT}" + add_plugin_param "-M ${P}/${CALL}" +} diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff deleted file mode 100644 index ae52fe7c71f1..000000000000 --- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff +++ /dev/null @@ -1,36 +0,0 @@ -fix some path for gentoo install - -Joerg Bornkessel -diff -Naur mp3-0.9.15.orig/Makefile mp3-0.9.15/Makefile ---- mp3-0.9.15.orig/Makefile 2006-09-22 20:02:06.484888703 +0200 -+++ mp3-0.9.15/Makefile 2006-09-22 20:03:09.732841453 +0200 -@@ -24,14 +24,14 @@ - # in the VDR directory an set them there. - - ### uncomment one of these lines, if you don't want one of the plugins --#WITHOUT_MP3=1 -+WITHOUT_MP3=1 - #WITHOUT_MPLAYER=1 - - ### uncomment the following line, if you don't have libsndfile installed --#WITHOUT_LIBSNDFILE=1 -+WITHOUT_LIBSNDFILE=1 - - ### uncomment the following line, if you don't have libvorbisfile installed --#WITHOUT_LIBVORBISFILE=1 -+WITHOUT_LIBVORBISFILE=1 - - ### uncomment the following line, if you want OSS sound output - #WITH_OSS_OUTPUT=1 -diff -Naur mp3-0.9.15.orig/mplayer.c mp3-0.9.15/mplayer.c ---- mp3-0.9.15.orig/mplayer.c 2006-09-22 20:02:06.504889953 +0200 -+++ mp3-0.9.15/mplayer.c 2006-09-22 20:06:46.998419703 +0200 -@@ -814,7 +814,7 @@ - { - if(!CheckVDRVersion(1,1,16,"mplayer")) return false; - i18n_name=Name(); -- MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf")); -+ MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayer/mplayersources.conf")); - if(MPlaySources.Count()<1) { - esyslog("ERROR: you must have defined at least one source in mplayersources.conf"); - fprintf(stderr,"No source(s) defined in mplayersources.conf\n"); diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff deleted file mode 100644 index 54a6c523b11c..000000000000 --- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff +++ /dev/null @@ -1,16 +0,0 @@ -set slave mode on OSD to default - -Joerg Bornkessel - -diff -ru mp3-0.9.14-orig/setup-mplayer.c mp3-0.9.14/setup-mplayer.c ---- mp3-0.9.14-orig/setup-mplayer.c 2006-07-07 09:56:27.000000000 +0200 -+++ mp3-0.9.14/setup-mplayer.c 2006-07-07 09:56:35.000000000 +0200 -@@ -30,7 +30,7 @@ - - cMPlayerSetup::cMPlayerSetup(void) - { -- SlaveMode = 0; -+ SlaveMode = 1; - ResumeMode = 2; - HideMainMenu = 0; - OsdPos = 0; diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-vdr-1.5.1.patch b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-vdr-1.5.1.patch deleted file mode 100644 index 50a14f47756b..000000000000 --- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-vdr-1.5.1.patch +++ /dev/null @@ -1,63 +0,0 @@ -http://www.vdr-portal.de/board/thread.php?postid=565407#post565407 -diff -urN mp3-0.9.15/mp3.c mp3-unstable/mp3.c ---- mp3-0.9.15/mp3.c 2006-08-30 17:39:24.000000000 +0200 -+++ mp3-unstable/mp3.c 2007-01-15 18:33:56.000000000 +0100 -@@ -342,7 +342,12 @@ - #else - Interface->Close(); - #endif -- needsFastResponse=visible=bigwin=false; -+ visible=bigwin=false; -+#if APIVERSNUM >= 10500 -+ SetNeedsFastResponse(false); -+#else -+ needsFastResponse=false; -+#endif - } - } - -@@ -502,7 +507,12 @@ - #endif - ShowStatus(true); - bigwin=bigWin; -- needsFastResponse=visible=true; -+ visible=true; -+#if APIVERSNUM >= 10500 -+ SetNeedsFastResponse(true); -+#else -+ needsFastResponse=true; -+#endif - fliptime=listtime=0; flipint=0; flip=-1; top=lastTop=-1; lastIndex=lastTotal=-1; - delete lastMode; lastMode=0; - } -diff -urN mp3-0.9.15/mplayer.c mp3-unstable/mplayer.c ---- mp3-0.9.15/mplayer.c 2006-09-19 20:18:13.000000000 +0200 -+++ mp3-unstable/mplayer.c 2007-01-15 18:33:56.000000000 +0100 -@@ -232,7 +233,12 @@ - #else - Interface->Close(); - #endif -- needsFastResponse=visible=modeOnly=false; -+ visible=modeOnly=false; -+#if APIVERSNUM >= 10500 -+ SetNeedsFastResponse(false); -+#else -+ needsFastResponse=false; -+#endif - } - } - -@@ -303,7 +309,12 @@ - Interface->Clear(); - if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent); - #endif -- needsFastResponse=visible=true; modeOnly=false; -+ visible=true; modeOnly=false; -+#if APIVERSNUM >= 10500 -+ SetNeedsFastResponse(true); -+#else -+ needsFastResponse=true; -+#endif - lastCurrent=lastTotal=-1; - flush=true; - } diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild new file mode 100644 index 000000000000..97718227813e --- /dev/null +++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild,v 1.1 2007/05/15 12:51:41 zzam Exp $ + +inherit vdr-plugin eutils + +DESCRIPTION="Video Disk Recorder Mplayer Plugin" +HOMEPAGE="http://www.muempf.de/" +SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-1.4.2" + +RDEPEND="${DEPEND} + || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) + || ( sys-apps/eject sys-block/unieject )" + +S=${WORKDIR}/mp3-${PV} + +PATCHES=" + ${FILESDIR}/${PV}/01_gentoo.diff + ${FILESDIR}/${PV}/02_slave_mode_default.diff + ${FILESDIR}/${PV}/03_vdr-1.5.1.diff" + +VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh +VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh + +src_install() { + + vdr-plugin_src_install + + insinto /etc/vdr/plugins/mplayer + doins ${FILESDIR}/mplayersources.conf + + into /usr/share/vdr/mplayer + newbin examples/mount.sh.example mount-mplayer.sh + + dodoc HISTORY MANUAL README examples/{image_convert,network}.sh.example +} + +pkg_postinst() { + + vdr-plugin_pkg_postinst + + echo + elog "Edit all config's /etc/vdr/plugins/mplayer" + echo + + if ! has_version "media-plugins/vdr-mp3ng" ; then + elog "Splitted ebuild!, no support for Audio files" + elog "To play mp3, ogg and wav files," + elog "emerge media-plugins/vdr-mp3ng -pv" + echo + fi +} diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild index a17f555dae68..f74f2905eefc 100644 --- a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild +++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild,v 1.7 2007/03/25 17:41:40 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild,v 1.8 2007/05/15 12:51:41 zzam Exp $ inherit vdr-plugin eutils @@ -21,9 +21,10 @@ RDEPEND="${DEPEND} S=${WORKDIR}/mp3-${PV} -PATCHES="${FILESDIR}/${P}-gentoo.diff - ${FILESDIR}/${P}-slave-mode-default.diff - ${FILESDIR}/${P}-vdr-1.5.1.patch" +PATCHES=" + ${FILESDIR}/${PV}/01_gentoo.diff + ${FILESDIR}/${PV}/02_slave_mode_default.diff + ${FILESDIR}/${PV}/03_vdr-1.5.1.diff" src_install() { -- cgit v1.2.3-65-gdbad