r7998 - in /vdr/vdr-plugin-mp3/trunk/debian: ./ patches/
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sun Nov 8 15:26:24 UTC 2009
Author: tiber-guest
Date: Sun Nov 8 15:26:16 2009
New Revision: 7998
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7998
Log:
* Added 12_gcc-4.4.dpatch
* Standards-Version: 3.8.3
* Removed non-standard shebang line from debian/rules (Closes: #552646)
* Added README.source
* Applied 11_mplayer.sh.conf-defaults to debian/mplayer.sh and dropped it
* Applied 02_mplayer.sh-mysterix to debian/mplayer.sh and dropped it
* Applied 03_mplayer.sh-websources to debian/mplayer.sh and dropped it
* Applied 04_mplayer.sh-cache-min to debian/mplayer.sh and dropped it
* Applied 10_debian-fhs-defaults to debian/mplayer.sh and stripped it
Added:
vdr/vdr-plugin-mp3/trunk/debian/README.source
vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch (with props)
Removed:
vdr/vdr-plugin-mp3/trunk/debian/patches/02_mplayer.sh-mysterix.dpatch
vdr/vdr-plugin-mp3/trunk/debian/patches/03_mplayer.sh-websources.dpatch
vdr/vdr-plugin-mp3/trunk/debian/patches/04_mplayer.sh-cache-min.dpatch
vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch
Modified:
vdr/vdr-plugin-mp3/trunk/debian/changelog
vdr/vdr-plugin-mp3/trunk/debian/control
vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh
vdr/vdr-plugin-mp3/trunk/debian/patches/00list
vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
vdr/vdr-plugin-mp3/trunk/debian/rules
vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.postrm
vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf
Added: vdr/vdr-plugin-mp3/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/README.source?rev=7998&op=file
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/README.source (added)
+++ vdr/vdr-plugin-mp3/trunk/debian/README.source Sun Nov 8 15:26:16 2009
@@ -1,0 +1,7 @@
+This package uses the dpatch system to save and apply patches to the
+upstream source code of the software that is packaged. For details
+about how to use dpatch read
+
+ /usr/share/doc/dpatch/README.source.gz
+
+from the dpatch package.
Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/changelog?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog Sun Nov 8 15:26:16 2009
@@ -1,3 +1,17 @@
+vdr-plugin-mp3 (0.10.1-14) unstable; urgency=low
+
+ * Added 12_gcc-4.4.dpatch
+ * Standards-Version: 3.8.3
+ * Removed non-standard shebang line from debian/rules (Closes: #552646)
+ * Added README.source
+ * Applied 11_mplayer.sh.conf-defaults to debian/mplayer.sh and dropped it
+ * Applied 02_mplayer.sh-mysterix to debian/mplayer.sh and dropped it
+ * Applied 03_mplayer.sh-websources to debian/mplayer.sh and dropped it
+ * Applied 04_mplayer.sh-cache-min to debian/mplayer.sh and dropped it
+ * Applied 10_debian-fhs-defaults to debian/mplayer.sh and stripped it
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 08 Nov 2009 13:52:18 +0100
+
vdr-plugin-mp3 (0.10.1-13) unstable; urgency=low
* Release for vdrdevel 1.7.6
Modified: vdr/vdr-plugin-mp3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/control?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/control Sun Nov 8 15:26:16 2009
@@ -2,9 +2,9 @@
Section: video
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
-Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
+Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
Homepage: http://www.muempf.de/
Modified: vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh Sun Nov 8 15:26:16 2009
@@ -190,7 +190,11 @@
echolog "*** Option CACHE not set in config file - calling mplayer without Cache!"
CACHESTR="-nocache"
else
- CACHESTR="-cache $CACHE"; debugvar CACHE "$CACHE"; debugvar CACHESTR "$CACHESTR"
+ CACHESTR="-cache $CACHE"; debugvar CACHE "$CACHE"
+ if test -n $CACHE_MIN; then
+ CACHESTR="$CACHE_STR -cache-min $CACHE_MIN"; debugvar CACHE_MIN "$CACHE_MIN"
+ fi
+ debugvar CACHESTR "$CACHESTR"
fi
if test -z "$FRAMEDROP" -o "$FRAMEDROP" != "true"; then FRAMEDROP=false; fi
@@ -487,22 +491,48 @@
declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
declare CMDLINE AOUT REMOTE USERDEF SUFFIX
declare FILE="$1"
-declare SLAVE="$2"
declare -a XResPAL[0]
declare -a XResNTSC[0]
declare FDSTR=""
declare SUBTITLES=""
declare DETC=""
+
+while shift; do
+ if [ "$1" = "SLAVE" ]; then
+ SLAVE="SLAVE"
+ elif [ "$1" = "AID" ]; then
+ AID="AID"
+ AIDLEVEL="$2"
+ shift
+ fi
+done
+
+
echolog "*** Starting mplayer.sh Version $VERSION"
+# Check if file a Playlist and set neccassary parameter
+case "$FILE" in
+ *.pls | *.m3u)
+ PLS="true"
+ PLSFILE="$FILE"
+ first=`grep -v -m1 "^#" $FILE`
+ WEBSOURCE=`echo $first|egrep "^(mms|mmst|http|http_proxy|rtp|rtsp|ftp|udp|unsv|smb|mpst|tivo)://"`
+ FILE="$first"
+ ;;
+ *)
+ FILE="$FILE"
+ ;;
+esac
+
+
if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
-if ! test -r "$FILE"; then echolog "*** ERROR: Make sure $FILE exists and is readable - otherwise it cannot be played ;-)"; exit; fi
+if test -z "$WEBSOURCE" -a ! test -r "$FILE"; then echolog "*** ERROR: Make sure $FILE exists and is readable - otherwise it cannot be played ;-)"; exit; fi
# Check if config file exists!
-declare CFGFIL="${0}.conf"
+declare CFGFIL="/etc/vdr/plugins/vdrmplayer.sh.conf"
debugvar CFGFIL $CFGFIL
-if ! test -f $CFGFIL; then echolog "*** FATAL: mplayer.sh.conf not found!!! Exiting." ; exit; fi
+if ! test -f $CFGFIL; then echolog "*** FATAL: $CFGFIL not found!!! Exiting." ; exit; fi
# read config file and initialize the variables
initialize
@@ -558,6 +588,22 @@
fi
fi
+
+# Check and Set AID for mplayer to use different Audiolines
+if test "$AID" == "AID";then
+ OPTAID=" -aid $AIDLEVEL"
+ CMDLINE="$CMDLINE $OPTAID"
+fi
+
+# Check for Playlist and add neccessary commandlines
+if test "$PLS" == "true";then
+ OPTPLS=" -playlist "
+ FILE="$PLSFILE"
+ CMDLINE="$CMDLINE $OPTPLS"
+fi
+
+#echolog "$CMDLINE"
+
debugvar CMDLINE "$CMDLINE"
exec $CMDLINE "$FILE"
exit
Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/00list?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list Sun Nov 8 15:26:16 2009
@@ -1,6 +1,3 @@
01_mp3-ogg-conv-utf8
-02_mplayer.sh-mysterix
-03_mplayer.sh-websources
-04_mplayer.sh-cache-min
10_debian-fhs-defaults
-11_mplayer.sh.conf-defaults
+12_gcc-4.4
Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch Sun Nov 8 15:26:16 2009
@@ -32,21 +32,6 @@
char *Quote(const char *str)
{
-diff -urNad vdr-plugin-mp3-0.9.15~/debian/mplayer.sh vdr-plugin-mp3-0.9.15/debian/mplayer.sh
---- vdr-plugin-mp3-0.9.15~/debian/mplayer.sh 2007-02-15 22:25:50.000000000 +0100
-+++ vdr-plugin-mp3-0.9.15/debian/mplayer.sh 2007-02-15 22:26:28.000000000 +0100
-@@ -525,9 +525,9 @@
- if ! test -r "$FILE"; then echolog "*** ERROR: Make sure $FILE exists and is readable - otherwise it cannot be played ;-)"; exit; fi
-
- # Check if config file exists!
--declare CFGFIL="${0}.conf"
-+declare CFGFIL="/etc/vdr/plugins/vdrmplayer.sh.conf"
- debugvar CFGFIL $CFGFIL
--if ! test -f $CFGFIL; then echolog "*** FATAL: mplayer.sh.conf not found!!! Exiting." ; exit; fi
-+if ! test -f $CFGFIL; then echolog "*** FATAL: $CFGFIL not found!!! Exiting." ; exit; fi
-
- # read config file and initialize the variables
- initialize
diff -urNad vdr-plugin-mp3-0.9.15~/player-mplayer.c vdr-plugin-mp3-0.9.15/player-mplayer.c
--- vdr-plugin-mp3-0.9.15~/player-mplayer.c 2006-09-19 20:17:50.000000000 +0200
+++ vdr-plugin-mp3-0.9.15/player-mplayer.c 2007-02-15 22:25:50.000000000 +0100
Added: vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch?rev=7998&op=file
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch (added)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch Sun Nov 8 15:26:16 2009
@@ -1,0 +1,109 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_gcc-4.4.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-mp3-0.10.1~/data.c vdr-plugin-mp3-0.10.1/data.c
+--- vdr-plugin-mp3-0.10.1~/data.c 2009-11-08 13:36:23.000000000 +0100
++++ vdr-plugin-mp3-0.10.1/data.c 2009-11-08 13:36:23.000000000 +0100
+@@ -420,7 +420,7 @@
+ description=strdup(Description);
+ if(Include) {
+ do {
+- char *s=index(Include,'/');
++ char *s=const_cast<char*> (index(Include,'/'));
+ int l=s ? s-Include : strlen(Include);
+ if(l) {
+ char **s=(char **)realloc(include,(incCount+2)*sizeof(char *));
+diff -urNad vdr-plugin-mp3-0.10.1~/decoder-ogg.c vdr-plugin-mp3-0.10.1/decoder-ogg.c
+--- vdr-plugin-mp3-0.10.1~/decoder-ogg.c 2009-11-08 13:36:22.000000000 +0100
++++ vdr-plugin-mp3-0.10.1/decoder-ogg.c 2009-11-08 13:36:39.000000000 +0100
+@@ -187,7 +187,7 @@
+ for(int i=0 ; i<vc->comments ; i++) {
+ const char *cc=vc->user_comments[i];
+ d(printf("ogg: comment%d='%s'\n",i,cc))
+- char *p=strchr(cc,'=');
++ const char *p=strchr(cc,'=');
+ if(p) {
+ const int len=p-cc;
+ p++;
+diff -urNad vdr-plugin-mp3-0.10.1~/decoder-snd.c vdr-plugin-mp3-0.10.1/decoder-snd.c
+--- vdr-plugin-mp3-0.10.1~/decoder-snd.c 2005-11-26 13:08:35.000000000 +0100
++++ vdr-plugin-mp3-0.10.1/decoder-snd.c 2009-11-08 13:36:23.000000000 +0100
+@@ -577,7 +577,7 @@
+ bool cCDDBDisc::Split(const char *source, char div, char * &first, char * &second, bool only3)
+ {
+ int pos=-1, n=0;
+- char *p, l[4]={ ' ',div,' ',0 };
++ const char *p, l[4]={ ' ',div,' ',0 };
+ if ((p=strstr(source,l))) { pos=p-source; n=3; }
+ else if(!only3 && (p=strchr(source,div))) { pos=p-source; n=1; }
+ if(pos>=0) {
+@@ -857,7 +857,7 @@
+ {
+ if(id->Get()) {
+ int tr;
+- char *s=strstr(filename,CDFS_TRACK);
++ const char *s=strstr(filename,CDFS_TRACK);
+ if(s && sscanf(s+strlen(CDFS_TRACK),"%d",&tr)==1) {
+ d(printf("snd: looking up disc id %08x track %d\n",id->discid,tr))
+ return cddb.Lookup(id,tr-1,this);
+diff -urNad vdr-plugin-mp3-0.10.1~/decoder.c vdr-plugin-mp3-0.10.1/decoder.c
+--- vdr-plugin-mp3-0.10.1~/decoder.c 2007-08-27 18:39:53.000000000 +0200
++++ vdr-plugin-mp3-0.10.1/decoder.c 2009-11-08 13:36:23.000000000 +0100
+@@ -99,7 +99,7 @@
+ DecoderID=si->DecoderID;
+ }
+
+-void cSongInfo::FakeTitle(const char *filename, const char *extention)
++void cSongInfo::FakeTitle(char *filename, const char *extention)
+ {
+ // if no title, try to build a reasonable from the filename
+ if(!Title && filename) {
+diff -urNad vdr-plugin-mp3-0.10.1~/decoder.h vdr-plugin-mp3-0.10.1/decoder.h
+--- vdr-plugin-mp3-0.10.1~/decoder.h 2007-08-27 18:39:49.000000000 +0200
++++ vdr-plugin-mp3-0.10.1/decoder.h 2009-11-08 13:36:23.000000000 +0100
+@@ -41,7 +41,7 @@
+ protected:
+ void Clear(void);
+ void Set(cSongInfo *si);
+- void FakeTitle(const char *filename, const char *extention=0);
++ void FakeTitle(char *filename, const char *extention=0);
+ void InfoDone(void) { infoDone=true; }
+ public:
+ cSongInfo(void);
+diff -urNad vdr-plugin-mp3-0.10.1~/stream.c vdr-plugin-mp3-0.10.1/stream.c
+--- vdr-plugin-mp3-0.10.1~/stream.c 2006-05-22 23:03:23.000000000 +0200
++++ vdr-plugin-mp3-0.10.1/stream.c 2009-11-08 13:36:23.000000000 +0100
+@@ -405,7 +405,7 @@
+
+ bool cNetStream::ParseHeader(const char *buff, const char *name, char **value)
+ {
+- char *s=index(buff,':');
++ const char *s=index(buff,':');
+ if(s && !strncasecmp(buff,name,s-buff)) {
+ s=skipspace(s+1);
+ d(printf("netstream: found header '%s' contents '%s'\n",name,s))
+@@ -527,7 +527,7 @@
+ return false;
+ }
+
+-char *cNetStream::ParseMetaString(const char *buff, const char *name, char **value)
++char *cNetStream::ParseMetaString(char *buff, const char *name, char **value)
+ {
+ char *s=index(buff,'=');
+ if(s && !strncasecmp(buff,name,s-buff)) {
+diff -urNad vdr-plugin-mp3-0.10.1~/stream.h vdr-plugin-mp3-0.10.1/stream.h
+--- vdr-plugin-mp3-0.10.1~/stream.h 2006-05-22 22:52:59.000000000 +0200
++++ vdr-plugin-mp3-0.10.1/stream.h 2009-11-08 13:36:23.000000000 +0100
+@@ -114,7 +114,7 @@
+ bool GetHTTPResponse(void);
+ bool ParseHeader(const char *buff, const char *name, char **value);
+ bool ParseMetaData(void);
+- char *ParseMetaString(const char *buff, const char *name, char **value);
++ char *ParseMetaString(char *buff, const char *name, char **value);
+ public:
+ cNetStream(const char *Filename);
+ virtual ~cNetStream();
Propchange: vdr/vdr-plugin-mp3/trunk/debian/patches/12_gcc-4.4.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/rules?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules Sun Nov 8 15:26:16 2009
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
+#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
Modified: vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.postrm
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.postrm?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.postrm (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdr-plugin-mp3.postrm Sun Nov 8 15:26:16 2009
@@ -3,7 +3,7 @@
# Remove cache files
if [ "$1" = "purge" ]; then
- /bin/rm -rf /var/cache/vdr-plugin-mp3/images
+ rm -rf /var/cache/vdr-plugin-mp3/images
fi
#DEBHELPER#
Modified: vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf?rev=7998&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf Sun Nov 8 15:26:16 2009
@@ -11,7 +11,7 @@
# MPLAYER="/usr/bin/mplayer"
# or just the name of the binary, e.g.:
# MPLAYER="mplayer"
-MPLAYER="/usr/local/bin/mplayer"
+MPLAYER="/usr/bin/mplayer"
# Video Out Filter lavc or fame - see mplayer DVB docs for details !
#VOP="lavc=9000"
@@ -67,10 +67,10 @@
# how to play AC3 audio?
# for AC3 via sound card (ALSA driver):
-AC3AOUT="-ao alsa9 -ac hwac3"
+#AC3AOUT="-ao alsa9 -ac hwac3"
# for AC3 via DVB (doesn't need AC3overDVB patch);
# needs MPlayer 0.90 final, or newer:
-#AC3AOUT="-ac hwac3"
+AC3AOUT="-ao mpegpes -ac hwac3"
# what aspect ratio has your TV set?
# either 4/3 (conventional) or 16/9 (widescreen)
@@ -96,11 +96,14 @@
# Cache Option for MPlayer
CACHE="4096"
+# Cache percantage before playback starts
+CACHE_MIN=10
+
# Framedrop
FRAMEDROP="true"
# Lirc RC File
-LIRCRC="/video/.lircrc"
+#LIRCRC="/video/.lircrc"
# do we have a slow CPU?
# if so, reduce the Y resolution to the half of the possible maximum:
@@ -112,7 +115,7 @@
# Where to find DVD/VCD dummy files? (just a fake and empty text file for the plugin)
# Example: create two empty text files (DVD and VCD) in /video/plugins/DVD-VCD/
# !!!The files must be named VCD and DVD (all capital letters)!!!
-DVDFiles="/video/plugins/DVD-VCD"
+DVDFiles="/var/lib/vdr-plugin-mplayer/DVD-VCD"
# What is your DVD-ROM device ?
DVD="/dev/hdc"
@@ -138,8 +141,8 @@
# used in mplayer.sh
# Only for experienced users
# USERDEF="-what -option you ever -like to give -to mplayer"
-USERDEF="-quiet"
-#USERDEF=""
+# Use "-osdlevel 0" to hide the mplayer osd (not recommended for dxr3 output)
+USERDEF="-quiet -osdlevel 0"
# set to true to enable debugging output
#DEBUG="true"
More information about the pkg-vdr-dvb-changes
mailing list