r358 - in vdr/vdr-plugin-muggle/trunk: . debian debian/patches
Thomas Günther
pkg-vdr-dvb-changes@lists.alioth.debian.org
Tue, 29 Mar 2005 22:42:36 +0000
Author: tom-guest
Date: 2005-03-29 22:42:35 +0000 (Tue, 29 Mar 2005)
New Revision: 358
Added:
vdr/vdr-plugin-muggle/trunk/debian/
vdr/vdr-plugin-muggle/trunk/debian/changelog
vdr/vdr-plugin-muggle/trunk/debian/compat
vdr/vdr-plugin-muggle/trunk/debian/control
vdr/vdr-plugin-muggle/trunk/debian/copyright
vdr/vdr-plugin-muggle/trunk/debian/docs
vdr/vdr-plugin-muggle/trunk/debian/install
vdr/vdr-plugin-muggle/trunk/debian/patches/
vdr/vdr-plugin-muggle/trunk/debian/patches/00list
vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch
vdr/vdr-plugin-muggle/trunk/debian/patches/02_graphTFT-cover.dpatch
vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf
vdr/vdr-plugin-muggle/trunk/debian/postinst
vdr/vdr-plugin-muggle/trunk/debian/postrm
vdr/vdr-plugin-muggle/trunk/debian/rules
vdr/vdr-plugin-muggle/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-muggle/trunk.
Added: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,100 @@
+vdr-plugin-muggle (0.1.6-1) unstable; urgency=low
+
+ * Not released yet
+
+ * Thomas Günther <tom@toms-cafe.de>
+ - Adapted for vdr 1.2.6
+ - Ignoring make clean error in debian/rules
+ - Changed Maintainer to Debian VDR Team
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Tue, 29 Mar 2005 21:43:20 +0200
+
+vdrdevel-plugin-muggle (0.1.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Embedded server deactivated
+
+ -- Thomas Günther <tom@toms-cafe.de> Mon, 28 Mar 2005 21:19:57 +0200
+
+vdrdevel-plugin-muggle (0.1.5-3) unstable; urgency=low
+
+ * VDR-1.3.23
+
+ -- Thomas Günther <tom@toms-cafe.de> Sun, 20 Mar 2005 23:27:24 +0100
+
+vdrdevel-plugin-muggle (0.1.5-2) unstable; urgency=low
+
+ * VDR-1.3.22
+
+ -- Thomas Günther <tom@toms-cafe.de> Sun, 13 Mar 2005 23:29:09 +0100
+
+vdrdevel-plugin-muggle (0.1.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Added libwrap0-dev to Build-Depends in debian/control
+ * Added graphTFT-cover patch
+ * Changed example in debian/plugin.muggle.conf for embedded mySQL
+ * Removed debian/examples
+
+ -- Thomas Günther <tom@toms-cafe.de> Sun, 13 Mar 2005 20:18:43 +0100
+
+vdrdevel-plugin-muggle (0.1.3-3) unstable; urgency=low
+
+ * VDR-1.3.22-4
+
+ -- Thomas Günther <tom@toms-cafe.de> Thu, 10 Mar 2005 01:49:25 +0100
+
+vdrdevel-plugin-muggle (0.1.3-2) unstable; urgency=low
+
+ * VDR-1.3.22
+
+ -- Thomas Günther <tom@toms-cafe.de> Fri, 4 Mar 2005 01:35:22 +0100
+
+vdrdevel-plugin-muggle (0.1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed disable-flac patch
+ * Set HAVE_VORBISFILE=1 in rules
+
+ -- Thomas Günther <tom@toms-cafe.de> Fri, 4 Mar 2005 00:51:47 +0100
+
+vdrdevel-plugin-muggle (0.1.2-3) unstable; urgency=low
+
+ * VDR-1.3.22
+
+ -- Thomas Günther <tom@toms-cafe.de> Mon, 28 Feb 2005 02:41:59 +0100
+
+vdrdevel-plugin-muggle (0.1.2-2) unstable; urgency=low
+
+ * VDR-1.3.21
+
+ -- Thomas Günther <tom@toms-cafe.de> Tue, 15 Feb 2005 17:37:21 +0100
+
+vdrdevel-plugin-muggle (0.1.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed muggle-1.3.19 patch
+ * Added disable-flac patch
+ * Remove muggle state file in debian/postinst and debian/postrm
+
+ -- Thomas Günther <tom@toms-cafe.de> Tue, 8 Feb 2005 21:23:58 +0100
+
+vdrdevel-plugin-muggle (0.1.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Added 92_muggle-1.3.19 patch
+ * Updated 95_vdrdevel.dpatch to version 0.0.8
+
+ -- Thomas Günther <tom@toms-cafe.de> Tue, 1 Feb 2005 23:26:49 +0100
+
+vdrdevel-plugin-muggle (0.0.8-2) unstable; urgency=low
+
+ * vdrdevel-1.3.17-5: changed patchlevel
+
+ -- Thomas Günther <tom@toms-cafe.de> Mon, 3 Jan 2005 16:28:16 +0100
+
+vdrdevel-plugin-muggle (0.0.8-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Thomas Günther <tom@toms-cafe.de> Tue, 30 Nov 2004 02:02:18 +0100
Added: vdr/vdr-plugin-muggle/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/compat 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/compat 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-muggle/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/control 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,17 @@
+Source: vdr-plugin-muggle
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom@toms-cafe.de>, Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <tg@e-tobi.net>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.2.6-7), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-muggle
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>= 1.2.6-7)
+Suggests: mysql-server, mysql-client
+Conflicts: vdr (>= 1.2.7)
+Description: Media juggle plugin for VDR
+ This plugin allows the management of arbitrary media files via a database
+ using VDR and its OSD.
+XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-muggle/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/copyright 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/copyright 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,11 @@
+This package was debianized by Holger Schvestka <hotzenplotz5@gmx.de> on
+Wed, 24 Nov 2004 00:15:00 +0100.
+
+It was downloaded from http://www.htpc-tech.de/htpc/muggle-dev.htm
+
+Upstream Author: Lars von Wedel <vonwedel@web.de>
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: vdr/vdr-plugin-muggle/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/docs 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/docs 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-muggle/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/install 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/install 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,2 @@
+libvdr-muggle.so.* usr/lib/vdr/plugins/
+debian/plugin.muggle.conf etc/vdr/plugins/
Added: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,2 @@
+01_include-i18n
+02_graphTFT-cover
Added: vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/01_include-i18n.dpatch 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_include-i18n patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add include i18n.h for compatibility with vdr-1.2.6.
+
+@DPATCH@
+--- muggle-0.1.6/vdr_decoder.c
++++ muggle-0.1.6/vdr_decoder.c
+@@ -30,6 +30,7 @@
+ #include "vdr_setup.h"
+ #include "vdr_decoder.h"
+ #include "vdr_decoder_mp3.h"
++#include "i18n.h"
+
+ extern void showmessage(const char *,int duration=0);
+
Added: vdr/vdr-plugin-muggle/trunk/debian/patches/02_graphTFT-cover.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/02_graphTFT-cover.dpatch 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/02_graphTFT-cover.dpatch 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,117 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## graphTFT-cover patch
+##
+## downloaded from ftp://elflamenco13.dyndns.org/software/vdr/patches/
+## original filename 02-muggle-0.1.2-graphTFT-cover.diff
+##
+## changed cover file nam from Cover.jpg to cover.jpg
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Transfer covers to graphTFT plugin.
+
+@DPATCH@
+diff -Nru muggle-0.1.2-orig/vdr_player.c muggle-0.1.2/vdr_player.c
+--- muggle-0.1.2-orig/vdr_player.c 2004-12-03 18:41:22.003575744 +0100
++++ muggle-0.1.2/vdr_player.c 2004-12-03 18:41:13.871811960 +0100
+@@ -17,6 +17,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <vdr/plugin.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+@@ -194,6 +195,9 @@
+ void Play ();
+ void Forward ();
+ void Backward ();
++ char *GetCover(const char *fullname);
++ bool TransferCover(const char *coverName);
++
+
+ void Goto (int Index, bool Still = false);
+ void SkipSeconds (int secs);
+@@ -344,6 +348,55 @@
+ }
+
+
++char * mgPCMPlayer::GetCover(const char *fullname)
++{
++ static char imageFile[1024];
++ char *result = NULL;
++ FILE *fp;
++
++ printf("cov: checking %s for specific cover\n", fullname);
++ strcpy (imageFile, fullname);
++
++ strcpy (strrchr (imageFile, '.'), ".jpg");
++ if ((fp=fopen(imageFile, "rb")))
++ {
++ // found specific cover
++ printf("cov: specific cover file %s found\n", basename(imageFile));
++ fclose (fp);
++ result = imageFile;
++ }
++ else
++ {
++ strcpy (strrchr (imageFile, '/'), "/cover.jpg");
++ if ((fp = fopen (imageFile, "rb")))
++ {
++ fclose (fp);
++ result = imageFile;
++ printf("cov: cover file cover.jpg found\n" );
++ } else {
++ printf("cov: no cover found\n" );
++ }
++ }
++ return result;
++}
++
++bool mgPCMPlayer::TransferCover(const char *coverName)
++{
++ int ret = false;
++
++ cPlugin * graphtft = cPluginManager::GetPlugin("graphtft");
++
++ if( graphtft ) {
++ graphtft->SetupParse("CoverImage", coverName);
++ ret = true;
++
++ } else {
++ ret = false;
++ }
++ return ret;
++}
++
++
+ void
+ mgPCMPlayer::Action (void)
+ {
+@@ -353,6 +406,7 @@
+ struct mad_pcm *pcm = 0;
+ cResample resample[2];
+ unsigned int nsamples[2];
++ const char *coverName=0;
+ const mad_fixed_t *data[2];
+ cScale scale;
+ cLevel level;
+@@ -413,7 +467,17 @@
+ if (m_playing)
+ {
+ std::string filename = m_playing->getSourceFile ();
+- if ((m_decoder = mgDecoders::findDecoder (m_playing))
++ coverName=GetCover(filename.c_str());
++ if(coverName) {
++ // if a cover exist, copy it to the /tmp directory
++ if(TransferCover(coverName)){
++ printf("cov: found and transfered to grapftft: %s \n",coverName );
++ } else {
++ printf("cov: no cover transfered.\n" );
++ }
++ }
++
++ if ((m_decoder = mgDecoders::findDecoder (m_playing))
+ && m_decoder->start ())
+ {
+ levelgood = true;
Added: vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/plugin.muggle.conf 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,56 @@
+#
+# Command line parameters for vdr-plugin-muggle
+#
+# For more details see /usr/share/doc/vdr-plugin-muggle/README.gz
+#
+
+
+# use HOST as database host
+# (default is localhost)
+#
+# -h HOST
+
+
+# use SOCKET_PATH as database socket if host is localhost
+# (default is none)
+#
+# -s SOCKET_PATH
+
+
+# use DATABASE_NAME as database name
+# (default is "GiantDisc", overridden by --giantdisc)
+#
+# -n DATABASE_NAME
+
+
+# use PORT as database server port
+# (default is standard mysql port 3306)
+#
+# -p PORT
+
+
+# use USERNAME as database user
+# (default is none)
+#
+# -u USERNAME
+
+-u root
+
+# use PASSWORD as database password
+# (default is none)
+#
+# -w PASSWORD
+
+
+# use TOPDIR as toplevel directory of music files
+# (default is "/mnt/music")
+#
+# -t TOPDIR
+
+
+# enable full Giantdisc compatibility mode
+# (default is no)
+#
+# -g
+
+-g
Added: vdr/vdr-plugin-muggle/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/postinst 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/postinst 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# Remove old state file
+if [ "$1" = "configure" ]; then
+ /bin/rm -f /var/lib/vdr/plugins/muggle/muggle.state
+fi
+
+#DEBHELPER#
Added: vdr/vdr-plugin-muggle/trunk/debian/postrm
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/postrm 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/postrm 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+# Remove state file
+if [ "$1" = "purge" ]; then
+ /bin/rm -f /var/lib/vdr/plugins/muggle/muggle.state
+fi
+
+#DEBHELPER#
Added: vdr/vdr-plugin-muggle/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,101 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Fix changed timestamps from cvs update to prevent running of gentables
+ touch mg_tables.h
+
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
+ HAVE_ONLY_SERVER=1 HAVE_VORBISFILE=1
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean HAVE_VORBISFILE=1
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-muggle/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-muggle/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/watch 2005-03-29 22:42:19 UTC (rev 357)
+++ vdr/vdr-plugin-muggle/trunk/debian/watch 2005-03-29 22:42:35 UTC (rev 358)
@@ -0,0 +1,2 @@
+version=2
+http://www.htpc-tech.de/htpc/muggle-dev.htm .*/vdr-muggle-([^-]*).*\.tgz