--- vdr-plugin-mp3-0.10.1.orig/debian/vdrmplayer.sh.conf +++ vdr-plugin-mp3-0.10.1/debian/vdrmplayer.sh.conf @@ -0,0 +1,152 @@ +# Config File for mplayer.sh ... +# +# $Id: mplayer.sh.conf,v 1.24.2.3 2007/02/11 15:19:35 juri Exp $ +# +# *** +# *** Mandatory Values +# *** +# +# Where to find mplayer executable ? +# it must be the full path *including* the binary, e.g. +# MPLAYER="/usr/bin/mplayer" +# or just the name of the binary, e.g.: +# MPLAYER="mplayer" +MPLAYER="/usr/bin/mplayer" + +# Video Out Filter lavc or fame - see mplayer DVB docs for details ! +#VOP="lavc=9000" +VOP="lavc=5000" + +# Video out device +# most users will want the default of 'mpegpes', but users with a dxr3 +# need to use 'dxr3', or users using softdevice might need 'dfbmga' +# If the DVB card with the MPEG decoder is not the first device as seen +# by the drivers/VDR, then you have to specify which card it actually is. +# Do so with 'mpegpes:card=X', where X is the card number (see also AO) +#VO="dxr3" +#VO="dfbmga" +#VO="mpegpes:card=1" +VO="mpegpes" + +# Audio output device and possible additional options +# most users will want the default of 'mpegpes', but users with a dxr3 +# need to use 'oss:/dev/em8300_ma-0' +# users using softdevice might want to use 'oss' or 'alsa' +# If the DVB card with the MPEG decoder is not the first device as seen +# by the drivers/VDR, then you have to specify which card it actually is. +# Do so with 'mpegpes:card=X', where X is the card number (see also VO) +#AO="oss:/dev/em8300_ma-0" +#AO="alsa" +#AO="mpegpes:card=1" +AO="mpegpes" + +# X-Resolutions for the DVBs card (smallest value first!) +# +XResPAL=(352 480 528 544 704 720) +XResNTSC=(352 480 512 544 640 704 720) + +# Set the following to 'true' or 'false' according to +# the capabilities of your TV set. +# +# In case of NTSC="false", see also DETC_FILTER below +# +# At least _one_ has to be true! +# If your TV can do both, I strongly recommend to keep both set to "true"! +PAL="true" +NTSC="true" + +# Use mplayer's -speed option for videos with a different +# frames/s value than the selected TV norm +# +# this setting is only used if either PAL or NTSC +# is set to false! +USE_SPEED="true" + +# set to true if you want to use AC3 output +USEAC3="false" + +# how to play AC3 audio? +# for AC3 via sound card (ALSA driver): +#AC3AOUT="-ao alsa9 -ac hwac3" +# for AC3 via DVB (doesn't need AC3overDVB patch); +# needs MPlayer 0.90 final, or newer: +AC3AOUT="-ao mpegpes -ac hwac3" + +# what aspect ratio has your TV set? +# either 4/3 (conventional) or 16/9 (widescreen) +#TV_ASPECT="16/9" +TV_ASPECT="4/3" + +# *** +# *** Optional Setting *** Simply Remove them if they do not fit your needs... +# *** + +# What detelecinig filter should we use to play NTSC material as PAL? +# This is only used if you have set NTSC to false and PAL to true. +# If you use MPlayer versions 1.0 or higher I recommend to use the +# following setting "ivtc=1", but this is not supported by MPlayer 0.9x +#DETC_FILTER="ivtc=1" +DETC_FILTER="detc=dr=2:am=1" + +# What version of MPlayer do you have? +# if you have 0.9x then choose 'false' +# if you have 1.0(pre) then choose 'true' +MPLAYER_V1="true" + +# Cache Option for MPlayer +CACHE="4096" + +# Cache percantage before playback starts +CACHE_MIN=10 + +# Framedrop +FRAMEDROP="true" + +# Lirc RC File +#LIRCRC="/video/.lircrc" + +# do we have a slow CPU? +# if so, reduce the Y resolution to the half of the possible maximum: +# NTSC: 240 +# PAL: 288 +# uncomment the following line if you have a slow CPU: +#SLOW_CPU="true" + +# 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="/var/lib/vdr-plugin-mplayer/DVD-VCD" + +# What is your DVD-ROM device ? +DVD="/dev/hdc" + +# What languages do your DVD's use ? +DVDLANG="de" + +# extra DVD options +#DVDOPTIONS="-af volume=+10" + +# extra VCD options +VCDOPTIONS="" + +# should MPEG files be played directly (without rescaling) if possible? +MPEG_DIRECT="true" + +#Subtitle options +SUBPOS="80" #Vertical position 0-100 +SUBCOLOR="0" #Background color 0=black 255=white +SUBALPHA="30" #Background transparency (0-255) +SUBCP="latin1" #Codepage +SUBSCALE="3" #Text autoscale coefficient, percentage of the screen size + +# Userdefined Options - make sure they do not collide with options +# used in mplayer.sh +# Only for experienced users +# USERDEF="-what -option you ever -like to give -to mplayer" +# 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" + +# End of Options --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.postrm +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.postrm @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +# Remove cache files +if [ "$1" = "purge" ]; then + rm -rf /var/cache/vdr-plugin-mp3/images +fi + +#DEBHELPER# --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mplayer.postinst +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mplayer.postinst @@ -0,0 +1,48 @@ +#! /bin/sh +# postinst script for vdr-plugin-mplayer +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +# source debconf lib +. /usr/share/debconf/confmodule + +case "$1" in + configure) + # ensure that the cache dir is correctly owned + if [ -d /var/lib/vdr-plugin-mplayer ] ; then + chown -R vdr:vdr /var/lib/vdr-plugin-mplayer || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- vdr-plugin-mp3-0.10.1.orig/debian/control +++ vdr-plugin-mp3-0.10.1/debian/control @@ -0,0 +1,26 @@ +Source: vdr-plugin-mp3 +Section: video +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian VDR Team +Uploaders: Thomas Schmidt , Tobias Grimm , Thomas Günther +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.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/ + +Package: vdr-plugin-mp3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, eject +Suggests: mjpegtools (>=1:1.8.0), netpbm +Description: MP3 playback plugin for VDR + This plugin for VDR allows to play back mp3's, ogg-files and + audio-cds. + +Package: vdr-plugin-mplayer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, eject (>=2.0.3-1), mplayer +Description: MPlayer playback plugin for VDR + This plugin for VDR allows to play back any video format supported + by MPLayer. --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mplayer.docs +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mplayer.docs @@ -0,0 +1,3 @@ +README +MANUAL +debian/README.Debian --- vdr-plugin-mp3-0.10.1.orig/debian/compat +++ vdr-plugin-mp3-0.10.1/debian/compat @@ -0,0 +1 @@ +5 --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.dirs +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.dirs @@ -0,0 +1,3 @@ +etc/vdr/plugins/ +usr/share/vdr-plugin-mp3/ +var/cache/vdr-plugin-mp3/images/ --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.install +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.install @@ -0,0 +1 @@ +libvdr-mp3.so.* usr/lib/vdr/plugins --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.examples +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.examples @@ -0,0 +1 @@ +examples/* --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.docs +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.docs @@ -0,0 +1,2 @@ +README +MANUAL --- vdr-plugin-mp3-0.10.1.orig/debian/rules +++ vdr-plugin-mp3-0.10.1/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk + +DEB_INSTALL_CHANGELOGS_ALL = HISTORY + +MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale \ + WITH_OSS_OUTPUT=1 + +common-build-arch:: + $(MAKE) all $(MAKE_OPTIONS) + +clean:: + $(MAKE) -o .dependencies clean $(MAKE_OPTIONS) + rm -f libvdr-*.so.* + rm -rf locale + +common-binary-predeb-arch:: + sh /usr/share/vdr-dev/dependencies.sh + +install/vdr-plugin-mp3:: + install -m 755 $(CURDIR)/debian/mount.sh \ + $(CURDIR)/debian/vdr-plugin-mp3/usr/share/vdr-plugin-mp3/mount + + install -m 755 $(CURDIR)/examples/image_convert.sh.example \ + $(CURDIR)/debian/vdr-plugin-mp3/usr/share/vdr-plugin-mp3/image_convert + + cp $(CURDIR)/examples/mp3sources.conf.example \ + $(CURDIR)/debian/vdr-plugin-mp3/etc/vdr/plugins/mp3sources.conf + + tar -c -f - locale/*/*/vdr-mp3.mo | \ + tar -x -f - -C debian/vdr-plugin-mp3/usr/share + +install/vdr-plugin-mplayer:: + install -m 755 $(CURDIR)/debian/mount.sh \ + $(CURDIR)/debian/vdr-plugin-mplayer/usr/share/vdr-plugin-mplayer/mount + + install -m 755 $(CURDIR)/debian/mplayer.sh \ + $(CURDIR)/debian/vdr-plugin-mplayer/usr/share/vdr-plugin-mplayer/mplayer + + tar -c -f - locale/*/*/vdr-mplayer.mo | \ + tar -x -f - -C debian/vdr-plugin-mplayer/usr/share + --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.postinst +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.postinst @@ -0,0 +1,48 @@ +#! /bin/sh +# postinst script for vdr-plugin-mp3 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +# source debconf lib +. /usr/share/debconf/confmodule + +case "$1" in + configure) + # ensure that the cache dir is correctly owned + if [ -d /var/cache/vdr-plugin-mp3 ] ; then + chown -R vdr:vdr /var/cache/vdr-plugin-mp3 || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mplayer.dirs +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mplayer.dirs @@ -0,0 +1 @@ +usr/share/vdr-plugin-mplayer/ --- vdr-plugin-mp3-0.10.1.orig/debian/copyright +++ vdr-plugin-mp3-0.10.1/debian/copyright @@ -0,0 +1,42 @@ +Upstream Homepage: + http://www.muempf.de/ + +Upstream Author: + Stefan Hülswitt + +Debian Maintainers: + Tobias Grimm + Thomas Günther + Thomas Schmidt + +Copyright: + (C) 2001 - 2007 Stefan Hülswitt + +Copyright for the mplayer script (mplayer.sh, vdrmplayer.sh.conf downloaded from + http://batleth.sapienti-sat.org/projects/VDR): + (C) 2003 - 2007 Juri Haberland + +Copyright (Debian packaging): + (C) 2002 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + The complete text of the GNU General Public License can be found + in /usr/share/common-licenses/GPL-2 on most Debian systems. + +License (Debian packaging): + The Debian packaging is licensed under the GPL, version 2 or any + later version, see /usr/share/common-licenses/GPL-2. --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mplayer.links +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mplayer.links @@ -0,0 +1 @@ +etc/vdr/plugins/mplayersources.conf var/lib/vdr/plugins/mplayersources.conf --- vdr-plugin-mp3-0.10.1.orig/debian/TODO.Debian +++ vdr-plugin-mp3-0.10.1/debian/TODO.Debian @@ -0,0 +1,2 @@ +* Make a more Debian-like mp3sources.conf (maybe pointing to /media/cdrom and + /media/usb - but what about cdfs?) --- vdr-plugin-mp3-0.10.1.orig/debian/mplayersources.conf +++ vdr-plugin-mp3-0.10.1/debian/mplayersources.conf @@ -0,0 +1,2 @@ +/var/lib/vdr-plugin-mplayer/DVD-VCD;DVD oder VCD;0 +/media/cdrom;CDROM;1 --- vdr-plugin-mp3-0.10.1.orig/debian/plugin.mplayer.conf +++ vdr-plugin-mp3-0.10.1/debian/plugin.mplayer.conf @@ -0,0 +1,6 @@ +# +# Command line parameters for vdr-plugin-mplayer +# +# For details see /usr/share/doc/vdr-plugin-mplayer/README and README.Debian +# +--mount /usr/share/vdr-plugin-mplayer/mount --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mplayer.examples +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mplayer.examples @@ -0,0 +1 @@ +debian/mplayersources.conf --- vdr-plugin-mp3-0.10.1.orig/debian/mount.sh +++ vdr-plugin-mp3-0.10.1/debian/mount.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# +# This script is called from VDR to mount/unmount/eject +# the sources for MP3 play and/or image sources, +# +# argument 1: wanted action, one of mount,unmount,eject,status +# argument 2: mountpoint to act on +# +# mount,unmount,eject must return 0 if succeeded, 1 if failed +# status must return 0 if device is mounted, 1 if not +# +# ok -> changed mount to not abort, if eject -t did fail, e.g. for a usb storage device + +action="$1" +path="$2" + +case "$action" in +mount) + eject -t "$path" &>/dev/null # close the tray, but not do/print anything if that fails + mount "$path" || exit 1 # mount it + ;; +unmount) + umount "$path" || exit 1 # unmount it + ;; +eject) + eject "$path" || exit 1 # eject disk + ;; +status) + cat /proc/mounts | grep -q "$path" # check if mounted + if [ $? -ne 0 ]; then # not mounted ... + exit 1 + fi +esac + +exit 0 --- vdr-plugin-mp3-0.10.1.orig/debian/README.source +++ vdr-plugin-mp3-0.10.1/debian/README.source @@ -0,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. --- vdr-plugin-mp3-0.10.1.orig/debian/mplayer.sh +++ vdr-plugin-mp3-0.10.1/debian/mplayer.sh @@ -0,0 +1,611 @@ +#!/bin/bash +# +# $Id: mplayer.sh,v 1.41.2.7 2007/02/11 15:33:29 juri Exp $ +# + +unset LANG +declare VERSION="0.8.7" + +# History (as always in the source code :-) +# 0.8.7 - added 544x480 as valid NTSC resolution (thanks to C.Y.M) +# - removed 688x576 from the valid PAL resolutions; +# - calculate USE_SPEED with 30 fps instead of 29.97 +# - use '-vf' and '-af' instead of '-vop' and '-aop', as the +# latter are deprecated +# +# 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background +# alpha color (thanks to Christian Haider) +# - changed the fps values from rational values to integer ones +# - fixed a typo setting DETC (thanks to Soeren Sonnenburg) +# - disabled the use of -forceidx for RealVideos, because since +# mplayer-1.0pre5 it isn't necessary anymore +# +# 0.8.5 - changed the check for the existence of the video file to check also +# that it can actually be read +# - added a new PAL height: 544 +# - [experimental] use detelicining (detc) filter to play NTSC as PAL; +# thanks to Martin Hoffmann for this one +# - [experimental] make the detelecinig filter configurable via conf-file +# - changed the warning messages about wrong DVD options to be displayed +# only when DEBUG is set to true +# - added a comment to mplayer.sh.conf that the DVD dummy files MUST be +# named DVD/VCD in capital letters +# - removed '-afm 9' from AO defaults, because audio filters by numbers are +# removed from MPlayer (9 meant hwac, it is handeled differently anyway) +# - changed the the use of the -speed parameter: the man pages says one +# should use a value between 0.01 and 100, not something like 25:24 +# +# 0.8.4 - added some more debugging info +# - changed the MPlayer option that is used to play DVDs and VCDs from +# -vcd/-dvd to VCD:// and DVD:// +# - added cuefile support for MPlayer version 1.0x +# - added new config option to distinguish MPlayer versions (0.9x or 1.0) +# important for playing cuefiles +# - fixed bug in detecting empty CACHE option +# - fixed a bug where USE_SPEED is ignored and '-speed' always used +# - added a check for the return value of 'mplayer -identify' +# - added support for AC3 sound when playing a DVD +# - make audio output configurable via config file (e.g. for DXR3) +# +# 0.8.3 - changed the default value of USERDEF from '-really-quiet' to '-quiet', +# because it suppressed the progressbar messages from mplayer +# - added '-dvd 1' to the DVD call to reliably play a DVD +# (though only the first one) +# +# 0.8.2 - changed the way mplayer is called to identify files; +# should prevent the opening of a X window, that happens +# on some systems +# - play mpeg files without any scaling if possible +# - added config line for AC3 out via DVB card (thanks to Christian Jacobsen) +# - added a new config option to choose the video out device; +# intended for dx3 users +# - added config options for subtitles (thanks to Martin Åkerström) +# - fixed a bug when SLOW_CPU is set to "false" instead of being +# just commented out +# - minor code clean-up +# - cleanup some comments and messages +# +# 0.8.1 - fixed a bug when DVDFiles or DVD not set correctly +# - if path to mplayer is incorrect, log an error and exit +# - cue file support; you can now choose a cue file as input; +# after I did this on user request, I asked myself, for what +# do one needs this, as mplayer can play .bin files directly... +# - support for 16/9 TV sets (thanks to Vaclav Janecek) +# +# 0.8.0 - bumped the version number to be more flexible +# - added VCD/DVD support +# +# 0.0.7 - clear LANG variable +# - added support for slow computers: reduces the Y +# resolution to the half of the possible maximum +# - use kind of a window for detecting the frames_per_sec +# +# 0.0.6a-jha +# - fixed a bug that prevented the SLAVE mode from working +# +# 0.0.6-jha +# - major rework +# - added config option to disable either NTSC or PAL support +# - added mplayer's '-speed' option; is disabled by default (see +# config file), because it didn't work as expected for me +# - rudimentary sub titles support: +# if a sub titles file (.sub suffix) with exactly the +# same name as the played video file exists, it is used +# (not really useful yet) +# - changed the was the config file is parsed: +# let's do it the simple way, just source the file +# ================================================= +# ---> IMPORTANT! you MUST use the new config file +# ================================================= +# +# 0.0.5d-jha +# - added AC3 support (thanks to Christian Jacobsen +# ) +# - better support for mplayers SLAVE mode +# - fixed some scaling problems +# - some minor clean-ups +# +# 0.0.5c-jha +# - play videos with 24 or 23.976 fps as NTSC, not PAL +# +# 0.0.5b-jha +# - Improved getvidxy - thanks to new mplayer option '-identify' +# it gets now the correct values for X-/Y-resolution +# and the framerate (if defined in the video file) +# for all media files +# - reworked the scaling calculation to scale only if needed +# and if so, scale as little as possible to save CPU power +# - distinguish between NTSC and PAL files; play them with +# the right TV norm +# +# 0.0.4 Improved getvidxy - No Temp Files needed anymore! +# +# 0.0.3 Seems to work fine - still lacks support for X x 432 Files +# What about MPEG Files ? +# + + +function initialize () { + # source config file + source "$CFGFIL" + + # Debug Mode ? + if test -z "$DEBUG" -o "$DEBUG" != "true"; then DEBUG=false; fi + + # use AC3? + if test -z "$USEAC3" -o "$USEAC3" != "true"; then USEAC3=false; fi + debugvar USEAC3 "$USEAC3" + + # AC3 command line + if test -z "$AC3AOUT"; then + errorcfg AC3AOUT + exit + else + debugvar AC3AOUT "$AC3AOUT" + fi + + # TV aspect ratio + if test -z "$TV_ASPECT"; then errorcfg TV_ASPECT; fi + debugvar TV_ASPECT "$TV_ASPECT" + + # can do PAL? + if test -z "$PAL" -o "$PAL" != "true"; then PAL=false; fi + debugvar PAL "$PAL" + + # can do NTSC? + if test -z "$NTSC" -o "$NTSC" != "true"; then NTSC=false; fi + debugvar NTSC "$NTSC" + + if test $NTSC == "false" -a $PAL == "false"; then + echolog "*** FATAL: Config Options NTSC and PAL both set to false ... Exiting." + exit + fi + + # use speed setting? + SPEED="" + if test -z "$USE_SPEED"; then USE_SPEED=false; fi + debugvar USE_SPEED "$USE_SPEED" + + # which detelecining filter should be used, if configured + # to play NTSC as PAL + if test -z "$DETC_FILTER"; then DETC_FILTER="detc=dr=2:am=1"; fi + debugvar DETC_FILTER "$DETC_FILTER" + + # where is Mplayer + if ! test -x "$MPLAYER" -a -f "$MPLAYER"; then + echolog "*** Option MPLAYER not found in config file or not set correctly" + exit + else + debugvar MPLAYER "$MPLAYER" + fi + + if test -z "$VOP"; then errorcfg VOP; exit; else debugvar VOP "$VOP"; fi + + if test -z "$VO"; then errorcfg VO; exit; else debugvar VO "$VO"; fi + + if test -z "$AO"; then errorcfg AO; exit; else debugvar AO "$AO"; fi + AOUT="-ao $AO" + + if test -z $CACHE; then + echolog "*** Option CACHE not set in config file - calling mplayer without Cache!" + CACHESTR="-nocache" + else + 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 + debugvar FRAMEDROP "$FRAMEDROP" + if $FRAMEDROP; then FDSTR="-framedrop"; fi + debugvar FDSTR "$FDSTR" + + declare LIRCSTR="" # no extra Lirc option! + if ! test -z "$LIRCRC"; then LIRCSTR="-lircconf $LIRCRC"; fi + debugvar LIRCRC "$LIRCRC"; debugvar LIRCSTR "$LIRCSTR" + + if ! test -z "$SUBPOS"; then SUBTITLES=" -subpos $SUBPOS"; fi + if ! test -z "$SUBCOLOR"; then SUBTITLES="$SUBTITLES -sub-bg-color $SUBCOLOR"; fi + if ! test -z "$SUBALPHA"; then SUBTITLES="$SUBTITLES -sub-bg-alpha $SUBALPHA"; fi + if ! test -z "$SUBCP"; then SUBTITLES="$SUBTITLES -subcp $SUBCP"; fi + if ! test -z "$SUBSCALE"; then SUBTITLES="$SUBTITLES -subfont-text-scale $SUBSCALE"; fi + + debugvar SUBTITLE "$SUBTITLES" + + if test "$SLAVE" != "SLAVE"; then + REMOTE="$LIRCSTR" + else + REMOTE="-slave -nolirc" + fi + debugvar REMOTE "$REMOTE" + + if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi + debugvar USERDEF "$USERDEF" + + if test -z $XResPAL; then errorcfg XResPAL; exit; else debugvar XResPAL "${XResPAL[*]}"; fi + if test -z $XResNTSC; then errorcfg XResNTSC; exit; else debugvar XResNTSC "${XResNTSC[*]}"; fi + + # do we run on a slow computer? + if test -z "$SLOW_CPU" -o "$SLOW_CPU" == "false"; then + SLOW_CPU=false + else + XResPAL=(352) + XResNTSC=(352) + debugvar XResPAL "${XResPAL[*]}" + debugvar XResNTSC "${XResNTSC[*]}" + fi + debugvar SLOW_CPU "$SLOW_CPU" + + if ! test -d "$DVDFiles"; then debugmsg "*** Option DVDFiles not set correctly! You will not be able to play VCD/DVD" ""; DVDFiles=""; fi + debugvar DVDFiles "$DVDFiles" + if ! test -b "$DVD"; then debugmsg "*** Option DVD not set correctly! You will not be able to play VCD/DVD" ""; DVD=""; fi + debugvar DVD "$DVD" + if test -z $DVDLANG; then DVDLANG="en"; fi + debugvar DVDLANG "$DVDLANG" + + # extra DVD options + debugvar DVDOPTIONS "$DVDOPTIONS" + + # extra VCD options + debugvar VCDOPTIONS "$VCDOPTIONS" + + # play MPEG files without rescaling? + if test -z "$MPEG_DIRECT" -o "$MPEG_DIRECT" != "false"; then MPEG_DIRECT="true"; fi + debugvar MPEG_DIRECT "$MPEG_DIRECT" + + # get the file extension of the video + SUFFIX=$(echo -e "${FILE:$[${#FILE}-4]:4}" | tr [A-Z] [a-z]) + debugvar SUFFIX $SUFFIX + + if test -z "$MPLAYER_V1"; then + echolog "*** MPLAYER_V1 not set! Setting it to 'false'." + echolog "*** If you cannot play cue-files, then set it to 'true'." + MPLAYER_V1="false" + fi + debugvar MPLAYER_V1 "$MPLAYER_V1" + + return; +} + + +function getvidxy () { + + # call: getvidxy + # determine x and y resolution of the file! + # output: variable ORIG_X and ORIG_Y (global) + + # variable definitions + local TEMP1 MPLAYER_RETURN + ORIG_X=0; ORIG_Y=0 + + TEMP1=`$MPLAYER -identify -vo null -ao null -frames 0 "$FILE" 2>/dev/null | grep -i -e "^ID_"` + MPLAYER_RETURN=$? + debugmsg "OutputFromMPLAYER:" "$TEMP1" + debugmsg "MPLAYER_RETURN: " "$MPLAYER_RETURN" + + if test $MPLAYER_RETURN -ne 0; then + echolog "*** FATAL: something went wrong analyzing the video; mplayer reported an error!" + echolog "*** FATAL: check your mplayer installation. Exiting..." + exit + fi + + ORIG_X=`echo "$TEMP1"|grep ID_VIDEO_WIDTH|cut -d"=" -f2` + debugmsg "parsed output for ORIG_X:" $ORIG_X + + ORIG_Y=`echo "$TEMP1"|grep ID_VIDEO_HEIGHT|cut -d"=" -f2` + debugmsg "parsed output for ORIG_Y:" $ORIG_Y + + ORIG_FPS=`echo "$TEMP1"|grep ID_VIDEO_FPS|cut -d"=" -f2` + debugmsg "parsed output for ORIG_FPS:" $ORIG_FPS + + ORIG_ASPECT=`echo "$TEMP1"|grep ID_VIDEO_ASPECT|cut -d"=" -f2` + debugmsg "parsed output for ORIG_ASPECT:" $ORIG_ASPECT + + VIDEO_FORMAT=`echo "$TEMP1"|grep ID_VIDEO_FORMAT|cut -d"=" -f2` + debugmsg "parsed output for VIDEO_FORMAT:" $VIDEO_FORMAT + + AUDIO_CODEC=`echo "$TEMP1"|grep ID_AUDIO_CODEC|cut -d"=" -f2` + debugmsg "parsed output for AUDIO_CODEC:" $AUDIO_CODEC + + return; +} + + +function calcnewxy () { + local -i MAX_X TEMP_ASPECT +# TEMP_ASPECT=`echo $ORIG_ASPECT|sed 's/\.//'` +# if test $TEMP_ASPECT -eq 0; then TEMP_ASPECT=$((4000/3)); fi + + if test $ORIG_X -gt 352 -o $ORIG_Y -gt $HALF_Y; then + MAX_X=$(($FULL_Y*$TV_ASPECT)) + else + MAX_X=$(($HALF_Y*$TV_ASPECT)) + fi + debugvar MAX_X $MAX_X + + NEW_Y=$(($MAX_X*$ORIG_Y/$ORIG_X)); debugvar NEW_Y $NEW_Y + echolog "*** INFO: For Sqare Pixels we would scale to $MAX_X x $NEW_Y ..." + test $NEW_Y -gt $FULL_Y && NEW_Y=$FULL_Y # force full screen/ ignore aspect ratio! + + return; +} + + +function choosebestx () { + local -i MAX_X INDEX + local XResTEMP + declare repeat=true + INDEX=0 + + if $SLOW_CPU; then + XResTEMP=(352) + else + if test $HALF_Y -eq 240; then + XResTEMP=(${XResNTSC[*]}) + else + if test $HALF_Y -eq 288; then + XResTEMP=(${XResPAL[*]}) + else + echolog "*** FATAL: HALF_Y not set or unknown: \"$HALF_Y\" ... Exiting." + exit + fi + fi + fi + debugvar XResTEMP "${XResTEMP[*]}" + + ANZAHL=${#XResTEMP[*]} + debugvar AnzahlVonXResTEMP $ANZAHL + + until ! $repeat; do + if test ${XResTEMP[$INDEX]} -ge $ORIG_X; then repeat=false; NEW_X=${XResTEMP[$INDEX]}; fi + INDEX=$(($INDEX+1)) + if test $INDEX -ge $ANZAHL; then repeat=false; NEW_X=${XResTEMP[$ANZAHL-1]}; fi + done + debugvar NEW_X $NEW_X + + return; +} + + +function choosebesty () { + if test \( $ORIG_Y -eq $HALF_Y -a $ORIG_X -eq 352 \) -o \( $ORIG_Y -eq $FULL_Y -a ! $SLOW_CPU \); then + REAL_Y=$ORIG_Y + NEW_Y=$ORIG_Y + NEW_X=$ORIG_X + debugmsg "setting NEW = ORIG" + else + if test $ORIG_X -gt 352 -o $ORIG_Y -gt $HALF_Y; then + REAL_Y=$FULL_Y + debugmsg "setting REAL_Y = FULL_Y" + else + REAL_Y=$HALF_Y + debugmsg "setting REAL_Y = HALF_Y" + fi + fi + return; +} + + +function set_ntsc () { + HALF_Y=240 + if $SLOW_CPU; then + FULL_Y=$HALF_Y + else + FULL_Y=480 + fi + NEW_FPS="30" + return; +} + + +function set_pal () { + HALF_Y=288 + if $SLOW_CPU; then + FULL_Y=$HALF_Y + else + FULL_Y=576 + fi + NEW_FPS="25" + return; +} + + +function checkforac3 () { + if test "X$AUDIO_CODEC" == "Xa52" && $USEAC3; then AOUT="$AC3AOUT"; fi + return; +} + + +function checktvnorm () { +local -i TEMP_FPS +TEMP_FPS=`echo $ORIG_FPS|sed 's/\.//'` + if test $TEMP_FPS -ge "23000" -a $TEMP_FPS -le "24499"; then + debugmsg "Film" + if $NTSC; then + set_ntsc + else + set_pal + $USE_SPEED && SPEED="-speed 1.04" # 25/24 = 1.04 + fi + else + if test \( $TEMP_FPS -ge "14000" -a $TEMP_FPS -le "16000" \) -o \( $TEMP_FPS -ge "29000" -a $TEMP_FPS -le "30499" \); then + debugmsg "NTSC" + if $NTSC; then + set_ntsc + else + set_pal + if $USE_SPEED; then + SPEED="-speed 1.04" # 25/24 = 1.04 + DETC=",$DETC_FILTER" + fi + fi + else + debugmsg "PAL or unknown" $ORIG_FPS + if $PAL; then + set_pal + else + set_ntsc + $USE_SPEED && SPEED="-speed 1.20" # 30/25 = 1.20 + fi + fi + fi + return; +} + + +function echolog () { + # prints the string on stdout and into /var/log/messages using logger! + logger -s -- "$1" + return; +} + + +function errorcfg () { + echolog "*** FATAL: Config Option $1 not found in config file ... Exiting." + exit; +} + + +function debugvar () { + if $DEBUG; then echolog "*** DEBUG: Variable $1 has value \"$2\""; fi + return; +} + + +function debugmsg () { + if $DEBUG; then echolog "*** DEBUG: $1 \"$2\""; fi + return; +} + + +# begin main! +# +# +# --------------------------------------------------------------------------- +# +# + +declare -i ORIG_X ORIG_Y +declare -i NEW_X NEW_Y +declare -i HALF_Y FULL_Y +declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC +declare CMDLINE AOUT REMOTE USERDEF SUFFIX +declare FILE="$1" +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 "; 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="/etc/vdr/plugins/vdrmplayer.sh.conf" +debugvar CFGFIL $CFGFIL +if ! test -f $CFGFIL; then echolog "*** FATAL: $CFGFIL not found!!! Exiting." ; exit; fi + +# read config file and initialize the variables +initialize + + +if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then + if test "$FILE" == "$DVDFiles/DVD"; then + $USEAC3 && AOUT="$AC3AOUT" + CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://" + fi + if test "$FILE" == "$DVDFiles/VCD"; then + CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://" + fi + unset FILE +elif test "${SUFFIX}" == ".cue"; then + if $MPLAYER_V1; then + CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2" + unset FILE + else + CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile" + fi +else + # Try to determine the video attributes + if $DEBUG; then echolog "*** DEBUG: Calling getvidxy function to analyze source video stream ..."; fi + getvidxy + echolog "*** INFO: Source Video has Resolution of $ORIG_X x $ORIG_Y ..." + if test $ORIG_X -eq 0 -o $ORIG_Y -eq 0; then echolog "*** FATAL: something went wrong analyzing the video; check your mplayer version ..."; exit; fi + + NEW_FPS=$ORIG_FPS + +# if `echo "$VIDEO_FORMAT"| egrep -q "RV??"`; then +# FORCEIDX="-forceidx" +# else +# FORCEIDX="" +# fi + + checkforac3 + checktvnorm + calcnewxy + choosebestx + choosebesty + if test $NEW_X -eq 0 -o $NEW_Y -eq 0; then echolog "*** FATAL: Illegal Resolution ..."; exit; fi + + if test $MPEG_DIRECT == "true" -a \( $VIDEO_FORMAT == "0x10000001" -o $VIDEO_FORMAT == "0x10000002" \) -a \( \ + \( $PAL -a $NEW_FPS == "25" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "288" \) -o \( $ORIG_Y == "576" -a \ + \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "528" -o $ORIG_X == "544" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) -o \ + \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \ + \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "544" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \ + \) ; then + CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF" + else + CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX" + 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 --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mp3.links +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mp3.links @@ -0,0 +1 @@ +etc/vdr/plugins/mp3sources.conf var/lib/vdr/plugins/mp3sources.conf --- vdr-plugin-mp3-0.10.1.orig/debian/README.Debian +++ vdr-plugin-mp3-0.10.1/debian/README.Debian @@ -0,0 +1,18 @@ +Debian specific default settings +-------------------------------- + +The following default settings have been changed for the Debian package: + +- Image Cache (command line argument -c / --icache): + /var/cache/vdr-plugin-mp3/images + +- Image Convert Script (command line argument -i / --iconv): + /usr/share/vdr-plugin-mp3/image_convert + +- Mount Script (command line argument -m / --mount): + /usr/share/vdr-plugin-mp3/mount + +- Mplayer Script (command line argument -M / --mplayer): + /usr/share/vdr-plugin-mplayer/mplayer + + -- Tobias Grimm , Sat, 30 Sep 2006 15:06:00 +0200 --- vdr-plugin-mp3-0.10.1.orig/debian/vdr-plugin-mplayer.install +++ vdr-plugin-mp3-0.10.1/debian/vdr-plugin-mplayer.install @@ -0,0 +1,7 @@ +libvdr-mplayer.so.* usr/lib/vdr/plugins/ + +debian/plugin.mplayer.conf etc/vdr/plugins/ +debian/vdrmplayer.sh.conf etc/vdr/plugins/ +debian/mplayersources.conf etc/vdr/plugins/ + +debian/DVD-VCD var/lib/vdr-plugin-mplayer/ --- vdr-plugin-mp3-0.10.1.orig/debian/watch +++ vdr-plugin-mp3-0.10.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.muempf.de/down/vdr-mp3-(.*)\.tar\.gz debian uupdate --- vdr-plugin-mp3-0.10.1.orig/debian/changelog +++ vdr-plugin-mp3-0.10.1/debian/changelog @@ -0,0 +1,773 @@ +vdr-plugin-mp3 (0.10.1-14ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - mplayer.sh, vdrmplayer.sh.conf: Add support for subcp and + subfont-text-scale options. + + -- Ilya Barygin Sun, 28 Feb 2010 23:04:02 +0300 + +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 Sun, 08 Nov 2009 23:47:58 +0100 + +vdr-plugin-mp3 (0.10.1-13) unstable; urgency=low + + * Release for vdrdevel 1.7.6 + * Added ${misc:Depends} + * Bumped standards version to 3.8.1 + * Updated debian/copyright + * Changed section to "video" + + -- Thomas Günther Wed, 29 Apr 2009 23:10:58 +0200 + +vdr-plugin-mp3 (0.10.1-12ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - mplayer.sh, vdrmplayer.sh.conf: Add support for subcp and + subfont-text-scale options. + + -- Timo Aaltonen Mon, 22 Sep 2008 10:41:27 +0300 + +vdr-plugin-mp3 (0.10.1-12) unstable; urgency=low + + [ Tobias Grimm ] + * Dropped patchlevel control field + * Build-Depend on vdr-dev (>=1.6.0-5) + * Bumped Standards-Version to 3.8.0 + * Using COMPAT=5 now + + -- Thomas Schmidt Sat, 19 Jul 2008 17:59:50 +0200 + +vdr-plugin-mp3 (0.10.1-11) unstable; urgency=low + + * Upload to unstable + + -- Thomas Schmidt Sun, 08 Jun 2008 23:42:35 +0200 + +vdr-plugin-mp3 (0.10.1-10) experimental; urgency=low + + * Increased package version to force rebuild for vdr 1.6.0-1ctvdr7 + + -- Tobias Grimm Mon, 12 May 2008 13:02:15 +0200 + +vdr-plugin-mp3 (0.10.1-9) experimental; urgency=low + + [ Thomas Schmidt ] + * Build-Depend on vdr-dev (>=1.6.0-1) + * Updated years in debian/copyright + + -- Tobias Grimm Thu, 03 Apr 2008 23:15:40 +0200 + +vdr-plugin-mp3 (0.10.1-8) experimental; urgency=low + + * Force rebuild for vdr 1.5.15 + + -- Tobias Grimm Mon, 18 Feb 2008 21:08:23 +0100 + +vdr-plugin-mp3 (0.10.1-7) experimental; urgency=low + + * Force update for new VDR release + + -- Tobias Grimm Sat, 16 Feb 2008 22:28:55 +0100 + +vdr-plugin-mp3 (0.10.1-6ubuntu3) hardy; urgency=low + + * Build-Depend on vdr-dev (>=1.6.0). + + -- Timo Aaltonen Wed, 09 Apr 2008 00:12:55 +0300 + +vdr-plugin-mp3 (0.10.1-6ubuntu2) hardy; urgency=low + + * rules: Unexport CXXFLAGS and LDFLAGS to fix FTBFS with the new dpkg- + buildpackage. + + -- Timo Aaltonen Fri, 15 Feb 2008 18:26:53 +0200 + +vdr-plugin-mp3 (0.10.1-6ubuntu1) hardy; urgency=low + + * mplayer.sh: Add support for subcp and subfont-text-scale options. + + -- Timo Aaltonen Tue, 12 Feb 2008 01:19:24 +0200 + +vdr-plugin-mp3 (0.10.1-6) unstable; urgency=low + + * Switched Build-System to cdbs, Build-Depend on cdbs + * Added Homepage field to debian/control + * Renamed XS-Vcs-* fields to Vcs-* in debian/control + * Bumped Standards-Version to 3.7.3 + + -- Thomas Schmidt Sat, 29 Dec 2007 18:18:32 +0100 + +vdr-plugin-mp3 (0.10.1-5) unstable; urgency=low + + * Added 04_mplayer.sh-cache-min.dpatch too allow configuration + of the minimum percentage the cache must be filled, before + playback starts + + -- Tobias Grimm Sat, 24 Nov 2007 19:40:28 +0100 + +vdr-plugin-mp3 (0.10.1-4) unstable; urgency=low + + * Release for vdrdevel 1.5.12 + + -- Thomas Günther Tue, 20 Nov 2007 23:46:22 +0100 + +vdr-plugin-mp3 (0.10.1-3) unstable; urgency=low + + * Release for vdrdevel 1.5.11 + + -- Thomas Günther Tue, 6 Nov 2007 23:34:15 +0100 + +vdr-plugin-mp3 (0.10.1-2) unstable; urgency=low + + * Release for vdrdevel 1.5.10 + + -- Thomas Günther Tue, 16 Oct 2007 23:50:56 +0200 + +vdr-plugin-mp3 (0.10.1-1) unstable; urgency=low + + * New upstream release + * Added gettext to Build-Depends + * Added installation of locale files + * Fixed debian-rules-ignores-make-clean-error + * Added full license disclaimer and copyright years to debian/copyright + + -- Thomas Günther Sun, 30 Sep 2007 22:26:16 +0200 + +vdr-plugin-mp3 (0.10.0-4) unstable; urgency=low + + * Release for vdrdevel 1.5.9 + + -- Thomas Günther Tue, 28 Aug 2007 01:01:07 +0200 + +vdr-plugin-mp3 (0.10.0-3) unstable; urgency=low + + * Release for vdrdevel 1.5.8 + + -- Thomas Günther Thu, 23 Aug 2007 01:09:03 +0200 + +vdr-plugin-mp3 (0.10.0-2) unstable; urgency=low + + * Release for vdrdevel 1.5.6 + + -- Thomas Günther Tue, 14 Aug 2007 01:46:16 +0200 + +vdr-plugin-mp3 (0.10.0-1) unstable; urgency=low + + * New upstream release + * Removed 91_mp3-vdr150.dpatch + * Adapted 01_mp3-ogg-conv-utf8.dpatch to VDR >= 1.5.3 + + -- Thomas Günther Thu, 28 Jun 2007 00:01:12 +0200 + +vdr-plugin-mp3 (0.9.15-14) unstable; urgency=low + + * allow webstreams in playlists for mplayer (closes: #427675) + + -- Thomas Schmidt Fri, 15 Jun 2007 19:04:35 +0200 + +vdr-plugin-mp3 (0.9.15-13) unstable; urgency=low + + * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control + * Removed version from Build-Dependancy to dpatch - even Sarge has the + required version + + -- Thomas Schmidt Mon, 28 May 2007 19:46:58 +0200 + +vdr-plugin-mp3 (0.9.15-12) unstable; urgency=low + + * Release for vdrdevel 1.5.2 + + -- Thomas Günther Sat, 28 Apr 2007 00:00:30 +0200 + +vdr-plugin-mp3 (0.9.15-11) unstable; urgency=low + + * Release for vdrdevel 1.5.1 + + -- Thomas Günther Tue, 27 Feb 2007 19:59:16 +0100 + +vdr-plugin-mp3 (0.9.15-10) unstable; urgency=low + + * Added 02_mplayer.sh-mysterix.dpatch from Michael Mauksch, which adds + support for different audio lines (AID) and m3u/pls playlists again + * Extracted modifications to default mplayer.sh configuration into + 11_mplayer.sh.conf-defaults.dpatch + + -- Tobias Grimm Thu, 15 Feb 2007 22:51:28 +0100 + +vdr-plugin-mp3 (0.9.15-9) unstable; urgency=low + + * Fixed location of config file in mplayer.sh + + -- Tobias Grimm Tue, 13 Feb 2007 09:40:12 +0100 + +vdr-plugin-mp3 (0.9.15-8) experimental; urgency=low + + * Upgraded mplayer.sh to version 0.8.7 + + -- Tobias Grimm Tue, 13 Feb 2007 00:50:32 +0100 + +vdr-plugin-mp3 (0.9.15-7) experimental; urgency=low + + * Added 91_mp3-vdr150.dpatch + * Added myself to Uploaders + + -- Thomas Günther Sun, 21 Jan 2007 16:10:28 +0100 + +vdr-plugin-mp3 (0.9.15-6) experimental; urgency=low + + [ Thomas Günther ] + * Replaced VDRdevel adaptions in debian/rules with make-special-vdr + * Adapted call of dependencies.sh and patchlevel.sh to the new location + in /usr/share/vdr-dev/ + + [ Tobias Grimm ] + * Now also compiling vdr-plugin-mplayer as mplayer has officially become + available in Debian + * Build-Depend on vdr-dev (>=1.4.5-1) + + -- Tobias Grimm Sun, 14 Jan 2007 20:15:59 +0100 + +vdr-plugin-mp3 (0.9.15-5) unstable; urgency=low + + * Fixed encoding of Thomas Günther's name in debian/copyright + + -- Thomas Schmidt Sun, 5 Nov 2006 16:00:33 +0100 + +vdr-plugin-mp3 (0.9.15-4) unstable; urgency=low + + [ Thomas Günther ] + * Added 01_mp3-ogg-conv-utf8.dpatch + + [ Tobias Grimm ] + * Added Thomas Günther to list of Debian maintainers + * Moved netpm to Suggests as well, because without mjpegtools you don't need + netpbm + * Edited description + * Build-Depend on vdr-dev (>=1.4.4-1) + + -- Tobias Grimm Sun, 5 Nov 2006 13:48:07 +0100 + +vdr-plugin-mp3 (0.9.15-3) unstable; urgency=medium + + * Urgency medium because it fixes a RC-bug + + * Changed mjpegtools dependancy to Suggests, because mjpegtools is + not an official package and just the cover-art-display of + vdr-plugin-mp3 will not work when mjpegtools is missing + (closes: #391235) + + -- Thomas Schmidt Thu, 5 Oct 2006 21:50:45 +0200 + +vdr-plugin-mp3 (0.9.15-2) unstable; urgency=low + + * Fixed reference to mount script in 10_debian-fhs-defaults.dpatch + * Added README.Debian to document Debian specific default settings + + -- Tobias Grimm Sat, 30 Sep 2006 15:30:03 +0200 + +vdr-plugin-mp3 (0.9.15-1) unstable; urgency=low + + [ Tobias Grimm ] + * New upstream release + * Removed 01_g++4.1-fix.dpatch + * Removed 90_APIVERSION.dpatch + * Renamed 10_mount.sh-path.dpatch to 10_debian-fhs-defaults.dpatch + * Install HISTROY with dh_installchangelogs + * Depend on eject + * Depend on mjpegtools (>=1:1.8.0) and netpbm + * Moved shell scripts to /usr/share/vdr-plugin-mp3 + * Added debian/compat + * Build-Depend on vdr-dev (>=1.4.3-1) + * Shortened debian/copyright and added Debian maintainers + + -- Thomas Schmidt Wed, 27 Sep 2006 08:27:02 +0200 + +vdr-plugin-mp3 (0.9.14-6) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.2-1) + * Bumped Standards-Version to 3.7.2 + * Changed my email-address to the debian one in debian/copyright + + -- Thomas Schmidt Sun, 27 Aug 2006 17:27:33 +0200 + +vdr-plugin-mp3 (0.9.14-5) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.0-1) + + -- Debian VDR Team Sun, 30 Apr 2006 21:21:49 +0200 + +vdr-plugin-mp3 (0.9.14-4) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.48-1) + - Added 90_APIVERSION.dpatch + + -- Debian VDR Team Thu, 27 Apr 2006 08:15:59 +0200 + +vdr-plugin-mp3 (0.9.14-3) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.46-1) + - Added 01_g++4.1-fix.dpatch to fix FTBFS with g++4.1, many thanks + to Martin Michlmayr (closes: #356176) + + -- Debian VDR Team Mon, 10 Apr 2006 08:06:05 +0200 + +vdr-plugin-mp3 (0.9.14-2) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.39-1) + + -- Debian VDR Team Sun, 22 Jan 2006 12:37:51 +0100 + +vdr-plugin-mp3 (0.9.14-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + Removed 01_Makefile-fPIC-fix.dpatch + - Build-Depend on vdr (>=1.3.38-1) + + -- Thomas Schmidt Tue, 10 Jan 2006 18:08:48 +0100 + +vdr-plugin-mp3 (0.9.13-8) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.37-1) + + -- Debian VDR Team Sat, 10 Dec 2005 15:51:41 +0100 + +vdr-plugin-mp3 (0.9.13-7) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.35-1) + - Corrected FSF address in debian/copyright + + -- Debian VDR Team Wed, 2 Nov 2005 16:56:08 +0100 + +vdr-plugin-mp3 (0.9.13-6) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.33-1) + + -- Debian VDR Team Sun, 25 Sep 2005 21:44:21 +0200 + +vdr-plugin-mp3 (0.9.13-5) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.32-1) + + -- Debian VDR Team Sun, 11 Sep 2005 18:48:31 +0200 + +vdr-plugin-mp3 (0.9.13-4) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr (>=1.3.31-1) + - Use dependencies.sh from vdr-dev to set vdr dependencies and + conflicts to the right vdr version when building the package + + -- Debian VDR Team Fri, 2 Sep 2005 18:05:44 +0200 + +vdr-plugin-mp3 (0.9.13-3) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.30-1) + - Conflict with vdr (>=1.3.30.99) + + -- Debian VDR Team Sat, 27 Aug 2005 20:08:30 +0200 + +vdr-plugin-mp3 (0.9.13-2) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.29-1) + - Conflict with vdr (>=1.3.29.99) + + -- Debian VDR Team Mon, 15 Aug 2005 19:26:18 +0200 + +vdr-plugin-mp3 (0.9.13-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + - Depend/Build-Depend on vdr (>=1.3.28-1) + - Conflict with vdr (>=1.3.29) + - Make /usr/lib/vdr-plugin-mp3/mount.sh executable in debian/rules + + -- Debian VDR Team Tue, 9 Aug 2005 22:41:28 +0200 + +vdr-plugin-mp3 (0.9.12-6) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.27-1) + - Conflict with vdr (>=1.3.28) + - Bumped Standards-Version to 3.6.2 + + -- Debian VDR Team Wed, 29 Jun 2005 17:54:31 +0200 + +vdr-plugin-mp3 (0.9.12-5) unstable; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.26-1) + - Conflict with vdr (>=1.3.27) + + -- Debian VDR Team Sun, 12 Jun 2005 17:05:40 +0200 + +vdr-plugin-mp3 (0.9.12-4) experimental; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.25-1) + - Conflict with vdr (>=1.3.26) + + -- Debian VDR Team Tue, 31 May 2005 14:51:03 +0200 + +vdr-plugin-mp3 (0.9.12-3) experimental; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.24-1) + - Conflict with vdr (>=1.3.25) + + -- Debian VDR Team Mon, 9 May 2005 17:24:47 +0200 + +vdr-plugin-mp3 (0.9.12-2) experimental; urgency=low + + * Thomas Schmidt + - Depend/Build-Depend on vdr (>=1.3.23-1) + - Conflict with vdr (>=1.3.24) + - Use updated mount.sh script from the image plugin + - Removed .dependencies from the source tree + - debian/rules: use patchlevel.sh subst instead of the old code + + -- Debian VDR Team Sun, 20 Mar 2005 11:53:36 +0100 + +vdr-plugin-mp3 (0.9.12-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release (hopefully this fixes the FTBFS on + mips and mipsel) + + -- Debian VDR Team Sun, 20 Mar 2005 11:22:55 +0100 + +vdr-plugin-mp3 (0.9.11-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + - Changed my email-address to my debian address + + -- Debian VDR Team Wed, 23 Feb 2005 23:13:49 +0100 + +vdr-plugin-mp3 (0.9.9-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Tue, 11 Jan 2005 22:27:54 +0100 + +vdr-plugin-mp3 (0.9.8-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Sun, 28 Nov 2004 15:46:42 +0100 + +vdr-plugin-mp3 (0.9.7-2) unstable; urgency=low + + * Thomas Schmidt + - Ignore the exitcode of the "make clean"-call in debian/rules + - Build-depend on dpatch (>= 2.0.9) + - Converted existing dpatch-files to the new short format + + -- Debian VDR Team Tue, 26 Oct 2004 11:54:41 +0200 + +vdr-plugin-mp3 (0.9.7-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Sat, 25 Sep 2004 12:07:57 +0200 + +vdr-plugin-mp3 (0.9.6-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Mon, 13 Sep 2004 16:59:38 +0200 + +vdr-plugin-mp3 (0.9.5-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Tue, 7 Sep 2004 18:19:15 +0200 + +vdr-plugin-mp3 (0.9.4-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Sat, 4 Sep 2004 14:37:46 +0200 + +vdr-plugin-mp3 (0.9.3-1) unstable; urgency=low + + * Thomas Schmidt + - New upstream release + + -- Debian VDR Team Mon, 2 Aug 2004 18:12:45 +0200 + +vdr-plugin-mp3 (0.8.3-4) unstable; urgency=low + + * Thomas Schmidt + - Add 01_Makefile-fPIC-fix, to fix FTBFS on hppa + + -- Debian VDR Team Sun, 11 Jul 2004 13:33:02 +0200 + +vdr-plugin-mp3 (0.8.3-3) unstable; urgency=low + + * Thomas Schmidt: + - Changed architecture to any + - First upload to official Debian-archive (closes: Bug#229219) + - Use dh_install + - Changed maintainer to Debian VDR and DVB Packaging Team + + - Added patchlevel-mechanism, to be compatible with c't-vdr + - Added watch-file + - Added /etc/vdr/plugins/mp3sources.conf and link to + /var/lib/vdr/plugins + - Use dpatch, so build-dep on dpatch + + -- Thomas Schmidt Fri, 2 Jul 2004 19:05:53 +0200 + +vdr-plugin-mp3 (0.8.3-2) unstable; urgency=low + + * Don't build mplayer-plugin, because it can't be included into + debian yet. + + -- Thomas Schmidt Fri, 23 Jan 2004 20:55:53 +0100 + +vdr-plugin-mp3 (0.8.3-1) unstable; urgency=low + + * New upstream release + + -- Thomas Schmidt Fri, 23 Jan 2004 20:26:09 +0100 + +vdr-plugin-mp3 (0.8.2-2) unstable; urgency=low + + * Added README, MANUAL and HISTORY files + + -- Thomas Schmidt Fri, 19 Dec 2003 15:19:36 +0100 + +vdr-plugin-mp3 (0.8.2-1) unstable; urgency=low + + * New upstream release + + -- Thomas Schmidt Sat, 22 Nov 2003 13:51:56 +0100 + +vdr-plugin-mp3 (0.8.1-5) unstable; urgency=low + + * Rebuild for vdr 1.2.6 + + -- Thomas Schmidt Sun, 16 Nov 2003 15:02:55 +0100 + +vdr-plugin-mp3 (0.8.1-4) unstable; urgency=low + + * Rebuild for vdr 1.2.5 + + -- Thomas Schmidt Wed, 17 Sep 2003 20:21:18 +0200 + +vdr-plugin-mp3 (0.8.1-3) unstable; urgency=low + + * changed the plugin-dir to /usr/lib/vdr/plugins, to be FHS compliant + Thanks to Henning Glawe for pointing me + to this one + + -- Thomas Schmidt Sun, 14 Sep 2003 16:28:00 +0200 + +vdr-plugin-mp3 (0.8.1-2) unstable; urgency=low + + * Changed debian/rules and debian/control (added debian/control.template), + so that the correct dependancy to vdr is filled out automatically on the + version of vdr-dev, you have installed + * Bump Standards-Version to 3.6.1 + + -- Thomas Schmidt Sun, 7 Sep 2003 21:08:19 +0200 + +vdr-plugin-mp3 (0.8.1-1) unstable; urgency=low + + * New upstream release + * Rebuild for vdr 1.2.2 + * Bump Standards-Version to 3.6.0 + + -- Thomas Schmidt Wed, 13 Aug 2003 08:55:21 +0200 + +vdr-plugin-mp3 (0.8.0-2) unstable; urgency=low + + * Rebuild for new stable vdr 1.2.1 + + -- Thomas Schmidt Mon, 9 Jun 2003 19:04:34 +0200 + +vdr-plugin-mp3 (0.8.0-1) unstable; urgency=low + + * New upstream release (Stable Version) + * Rebuild for new stable vdr 1.2.0 + + -- Thomas Schmidt Sun, 1 Jun 2003 22:06:06 +0200 + +vdr-plugin-mp3 (0.7.13-1) unstable; urgency=low + + * New upstream release + * Rebuild for vdr 1.1.29 + + -- Thomas Schmidt Wed, 30 Apr 2003 17:58:07 +0200 + +vdr-plugin-mp3 (0.7.12-1) unstable; urgency=low + + * New upstream release + * Rebuild for vdr 1.1.28 + * Adds support for ogg-files + * Bump Standards-Version to 3.5.9 + + -- Thomas Schmidt Tue, 22 Apr 2003 12:49:48 +0200 + +vdr-plugin-mp3 (0.7.11-1) unstable; urgency=low + + * New upstream release + * rebuild for vdr 1.1.27 + + -- Thomas Schmidt Sun, 13 Apr 2003 15:41:10 +0200 + +vdr-plugin-mp3 (0.7.10-1) unstable; urgency=low + + * New upstream release + + -- Thomas Schmidt Mon, 3 Feb 2003 20:35:35 +0100 + +vdr-plugin-mp3 (0.7.9-1) unstable; urgency=low + + * New upstream release + + -- Thomas Schmidt Wed, 18 Dec 2002 23:04:28 +0100 + +vdr-plugin-mp3 (0.7.8-6) unstable; urgency=low + + * compiled for vdr 1.1.20 + + -- Thomas Schmidt Sun, 15 Dec 2002 18:53:02 +0100 + +vdr-plugin-mp3 (0.7.8-5) unstable; urgency=low + + * changed debian/rules, so that patching the upstrams makefile is not + necessary anymore + + -- Thomas Schmidt Wed, 11 Dec 2002 22:22:55 +0100 + +vdr-plugin-mp3 (0.7.8-4) unstable; urgency=low + + * compiled for vdr 1.1.19 + + -- Thomas Schmidt Mon, 9 Dec 2002 23:42:39 +0100 + +vdr-plugin-mp3 (0.7.8-3) unstable; urgency=low + + * compiled for vdr 1.1.18 + + -- Thomas Schmidt Mon, 2 Dec 2002 12:47:13 +0100 + +vdr-plugin-mp3 (0.7.8-2) unstable; urgency=low + + * modified debian/rules a little bit (make use of dh_installexamples) + + -- Thomas Schmidt Sun, 1 Dec 2002 14:56:34 +0100 + +vdr-plugin-mp3 (0.7.8-1) unstable; urgency=low + + * New upstream release + + -- Thomas Schmidt Sun, 1 Dec 2002 14:48:35 +0100 + +vdr-plugin-mp3 (0.7.7-1) unstable; urgency=low + + * New upstream release + + -- Thomas Schmidt Tue, 19 Nov 2002 13:07:45 +0100 + +vdr-plugin-mp3 (0.7.6-7) unstable; urgency=low + + * compiled for vdr 1.1.16 + + -- Thomas Schmidt Mon, 11 Nov 2002 11:44:10 +0100 + +vdr-plugin-mp3 (0.7.6-6) unstable; urgency=low + + * compiled for vdr 1.1.15 + + -- Thomas Schmidt Mon, 4 Nov 2002 01:03:22 +0100 + +vdr-plugin-mp3 (0.7.6-5) unstable; urgency=low + + * compiled for vdr 1.1.14 + + -- Thomas Schmidt Tue, 29 Oct 2002 09:34:27 +0100 + +vdr-plugin-mp3 (0.7.6-4) unstable; urgency=low + + * added Dependancy to mplayer|mplayer-i386|mplayer-i686|mplayer-k6 + + -- Thomas Schmidt Thu, 24 Oct 2002 12:14:47 +0200 + +vdr-plugin-mp3 (0.7.6-3) unstable; urgency=low + + * only create /usr/share/vdr/plugins, not /usr/share/vdr/plugins/lib + + -- Thomas Schmidt Sun, 20 Oct 2002 17:31:08 +0200 + +vdr-plugin-mp3 (0.7.6-2) unstable; urgency=low + + * splitted mp3 and mplayer plugins into different debs + + -- Thomas Schmidt Fri, 18 Oct 2002 01:12:28 +0200 + +vdr-plugin-mp3 (0.7.6-1) unstable; urgency=low + + * New upstream version + + -- Thomas Schmidt Wed, 16 Oct 2002 15:13:57 +0200 + +vdr-plugin-mp3 (0.7.3-5) unstable; urgency=low + + * build against vdr 1.1.10 + + -- Thomas Schmidt Wed, 18 Sep 2002 19:19:56 +0200 + +vdr-plugin-mp3 (0.7.3-4) unstable; urgency=low + + * corrected debian/control (Depends, Build-Depends and Description) + + -- Thomas Schmidt Wed, 28 Aug 2002 12:05:15 +0200 + +vdr-plugin-mp3 (0.7.3-3) unstable; urgency=low + + * small changes in debian/rules + + -- Thomas Schmidt Wed, 28 Aug 2002 11:56:00 +0200 + +vdr-plugin-mp3 (0.7.3-2) unstable; urgency=low + + * added the example-files, that came with upstream + + -- Thomas Schmidt Wed, 28 Aug 2002 10:31:33 +0200 + +vdr-plugin-mp3 (0.7.3-1) unstable; urgency=low + + * Initial Release. + + -- Thomas Schmidt Wed, 28 Aug 2002 09:50:37 +0200 + --- vdr-plugin-mp3-0.10.1.orig/debian/patches/00list +++ vdr-plugin-mp3-0.10.1/debian/patches/00list @@ -0,0 +1,3 @@ +01_mp3-ogg-conv-utf8 +10_debian-fhs-defaults +12_gcc-4.4 --- vdr-plugin-mp3-0.10.1.orig/debian/patches/10_debian-fhs-defaults.dpatch +++ vdr-plugin-mp3-0.10.1/debian/patches/10_debian-fhs-defaults.dpatch @@ -0,0 +1,46 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +## 10_debian-fhs-defaults by Thomas Schmidt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change several default-paths for Debian FHS conformance + +@DPATCH@ +diff -urNad vdr-plugin-mp3-0.9.15~/data-mp3.c vdr-plugin-mp3-0.9.15/data-mp3.c +--- vdr-plugin-mp3-0.9.15~/data-mp3.c 2006-04-23 17:41:14.000000000 +0200 ++++ vdr-plugin-mp3-0.9.15/data-mp3.c 2007-02-15 22:25:50.000000000 +0100 +@@ -36,8 +36,8 @@ + #define di(x) ; + #endif + +-const char *imagecache = "/var/cache/images/mp3"; +-const char *imageconv = "image_convert.sh"; ++const char *imagecache = "/var/cache/vdr-plugin-mp3/images"; ++const char *imageconv = "/usr/share/vdr-plugin-mp3/image_convert"; + + // image suffixes to search + const char *img_suff[] = { "jpg","png","gif",0 }; +diff -urNad vdr-plugin-mp3-0.9.15~/data.c vdr-plugin-mp3-0.9.15/data.c +--- vdr-plugin-mp3-0.9.15~/data.c 2006-05-16 19:31:09.000000000 +0200 ++++ vdr-plugin-mp3-0.9.15/data.c 2007-02-15 22:25:50.000000000 +0100 +@@ -38,7 +38,7 @@ + + // ---------------------------------------------------------------- + +-const char *mountscript = "mount.sh"; ++const char *mountscript = "/usr/share/vdr-plugin-mp3/mount"; + + char *Quote(const char *str) + { +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 +@@ -47,7 +47,7 @@ + + #define MPLAYER_VOL_STEP 3.0 + +-const char *MPlayerCmd = "mplayer.sh"; ++const char *MPlayerCmd = "/usr/share/vdr-plugin-mplayer/mplayer"; + int MPlayerAid=-1; + const char *globalResumeDir = 0; + --- vdr-plugin-mp3-0.10.1.orig/debian/patches/12_gcc-4.4.dpatch +++ vdr-plugin-mp3-0.10.1/debian/patches/12_gcc-4.4.dpatch @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_gcc-4.4.dpatch by Tobias Grimm +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 (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 ; icomments ; 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(); --- vdr-plugin-mp3-0.10.1.orig/debian/patches/01_mp3-ogg-conv-utf8.dpatch +++ vdr-plugin-mp3-0.10.1/debian/patches/01_mp3-ogg-conv-utf8.dpatch @@ -0,0 +1,60 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_mp3-ogg-conv-utf8.dpatch by Thomas Günther +## http://toms-cafe.de/vdr/download/mp3-0.10.0-ogg-conv-utf8.diff +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Converts ogginfos from utf8 to the setup charset. + +@DPATCH@ +--- mp3-0.10.0/decoder-ogg.c ++++ mp3-0.10.0/decoder-ogg.c +@@ -28,6 +28,32 @@ + #include "common.h" + #include "decoder-ogg.h" + ++#include ++#include ++#include ++static char *ConvertFromUTF8(const char *text) ++{ ++ if (!text) return NULL; ++ char *buffer = strdup(text); ++#if APIVERSNUM >= 10503 ++ iconv_t ic = iconv_open(cCharSetConv::SystemCharacterTable(), "UTF8"); ++#else ++ iconv_t ic = iconv_open(I18nCharSets()[Setup.OSDLanguage], "UTF8"); ++#endif ++ if (ic >= 0) { ++ char *in = (char *)text; ++ char *out = buffer; ++ size_t inbytesleft = strlen(text); ++ size_t outbytesleft = inbytesleft; ++ if (iconv(ic, &in, &inbytesleft, &out, &outbytesleft) != (size_t)(-1)) ++ *out = 0; ++ else ++ strcpy(buffer, text); ++ iconv_close(ic); ++ } ++ return buffer; ++} ++ + // --- cOggFile ---------------------------------------------------------------- + + cOggFile::cOggFile(const char *Filename) +@@ -166,13 +192,13 @@ + const int len=p-cc; + p++; + if(!strncasecmp(cc,"TITLE",len)) { +- if(!Title) Title=strdup(p); ++ if(!Title) Title=ConvertFromUTF8(p); + } + else if(!strncasecmp(cc,"ARTIST",len)) { +- if(!Artist) Artist=strdup(p); ++ if(!Artist) Artist=ConvertFromUTF8(p); + } + else if(!strncasecmp(cc,"ALBUM",len)) { +- if(!Album) Album=strdup(p); ++ if(!Album) Album=ConvertFromUTF8(p); + } + else if(!strncasecmp(cc,"YEAR",len)) { + if(Year<0) { --- vdr-plugin-mp3-0.10.1.orig/debian/DVD-VCD/VCD +++ vdr-plugin-mp3-0.10.1/debian/DVD-VCD/VCD @@ -0,0 +1 @@ +dummy file for playing a VCD with mplayer.sh --- vdr-plugin-mp3-0.10.1.orig/debian/DVD-VCD/DVD +++ vdr-plugin-mp3-0.10.1/debian/DVD-VCD/DVD @@ -0,0 +1 @@ +dummy file for playing a DVD with mplayer.sh