Author: thl Update of /cvs/free/rpms/vdr-muggle/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22014 Modified Files: .cvsignore sources Added Files: vdr-muggle-0.1.12-gcc43.patch vdr-muggle.conf vdr-muggle.spec Log Message: initial import from livna vdr-muggle-0.1.12-gcc43.patch: --- NEW FILE vdr-muggle-0.1.12-gcc43.patch --- Index: mugglei.c =================================================================== --- mugglei.c (revision 1137) +++ mugglei.c (working copy) @@ -8,6 +8,7 @@ // #define VERBOSE #include <unistd.h> +#include <cstring> #include <string> #include <stdlib.h> Index: mg_db_gd_sqlite.c =================================================================== --- mg_db_gd_sqlite.c (revision 1137) +++ mg_db_gd_sqlite.c (working copy) @@ -8,6 +8,7 @@ * \author Responsible author: $Author: wolfgang61 $ */ +#include <cstring> #include <string> #include <sys/types.h> #include <sys/stat.h> Index: mg_db.c =================================================================== --- mg_db.c (revision 1137) +++ mg_db.c (working copy) @@ -7,6 +7,7 @@ * \author Responsible author: $Author: wolfgang61 $ */ +#include <cstring> #include <string> #include <assert.h> Index: mg_image_provider.c =================================================================== --- mg_image_provider.c (revision 1137) +++ mg_image_provider.c (working copy) @@ -11,6 +11,7 @@ #include <mpegfile.h> #include <attachedpictureframe.h> +#include <cstring> #include <iostream> #include <stdio.h> #include <dirent.h> Index: mg_incremental_search.c =================================================================== --- mg_incremental_search.c (revision 1137) +++ mg_incremental_search.c (working copy) @@ -10,6 +10,8 @@ */ #include "mg_incremental_search.h" + +#include <cstring> #include <iostream> using namespace std; Index: mg_item.c =================================================================== --- mg_item.c (revision 1137) +++ mg_item.c (working copy) @@ -12,6 +12,7 @@ #include <unistd.h> #include <fcntl.h> #include <errno.h> +#include <cstring> #include "mg_item.h" #include "mg_tools.h" Index: mg_setup.c =================================================================== --- mg_setup.c (revision 1137) +++ mg_setup.c (working copy) @@ -18,7 +18,9 @@ #include "mg_setup.h" #include "mg_tools.h" #include "mg_db.h" + #include <stdio.h> +#include <cstring> #include <string> #include <getopt.h> Index: mg_valmap.c =================================================================== --- mg_valmap.c (revision 1137) +++ mg_valmap.c (working copy) @@ -1,8 +1,10 @@ -#include <stdarg.h> - #include "mg_valmap.h" #include "mg_tools.h" +#include <stdarg.h> +#include <cstdlib> +#include <cstring> + mgValmap::mgValmap(const char *key) { m_key = key; } Index: mg_selection.c =================================================================== --- mg_selection.c (revision 1137) +++ mg_selection.c (working copy) @@ -14,6 +14,7 @@ #include <sys/stat.h> #include <stdio.h> #include <assert.h> +#include <cstring> #include "mg_selection.h" #include "mg_setup.h" Index: vdr_decoder_flac.c =================================================================== --- vdr_decoder_flac.c (revision 1137) +++ vdr_decoder_flac.c (working copy) @@ -10,6 +10,7 @@ #ifdef HAVE_FLAC +#include <cstring> #include <string> #include <stdlib.h> #include <stdio.h> Index: vdr_decoder_mp3.c =================================================================== --- vdr_decoder_mp3.c (revision 1137) +++ vdr_decoder_mp3.c (working copy) @@ -21,6 +21,7 @@ #include <sys/types.h> #include <unistd.h> #include <cmath> +#include <cstring> #include <iostream> #include "vdr_config.h" --- NEW FILE vdr-muggle.conf --- # Configuration snippet for vdr-muggle -*- sh -*- # # Add command line options to pass to the muggle plugin to PLUGIN_OPTIONS. # See /usr/share/doc/vdr-muggle-*/README* for info about available options. dbdir=/var/lib/vdr/muggle musicdir=/srv/audio PLUGIN_OPTIONS="-d $dbdir -t $musicdir" --- NEW FILE vdr-muggle.spec --- # TODO: # - rpmbuild switches for using mysql/postgresql? # - move muggle.state* files away from /etc %define pname muggle %define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR) %define audiodir %(vdr-config --audiodir 2>/dev/null || echo ERROR) %define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) %define cachedir %(vdr-config --cachedir 2>/dev/null || echo ERROR) %define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR) %define vdr_user %(vdr-config --user 2>/dev/null || echo ERROR) %define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) Name: vdr-muggle Version: 0.1.12 Release: 3%{?dist} Summary: Media juggle plugin for VDR Group: Applications/Multimedia License: GPL+ URL: http://www.selbstgetippt.de/selbstgetippt/Muggle.html Source0: http://downloads.sourceforge.net/vdr-muggle/%{name}-%{version}.tgz Source1: %{name}.conf Patch0: %{name}-0.1.12-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: taglib-devel BuildRequires: libmad-devel BuildRequires: flac-devel BuildRequires: libvorbis-devel BuildRequires: libsndfile-devel BuildRequires: sqlite-devel >= 3 BuildRequires: vdr-devel >= 1.3.47 BuildRequires: sed >= 3.95 Requires: vdr(abi) = %{apiver} # For muggle-image-convert: Requires(hint): file Requires(hint): mjpegtools Requires(hint): netpbm-progs %description The media juggle plugin allows the management of arbitrary media files via a database using VDR and its OSD. %prep %setup -q -n %{pname}-%{version} %patch0 sed -i -e 's|"/tmp"|"%{cachedir}/muggle"|' mg_setup.c f=HISTORY ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f sed -e 's|/var/lib/vdr/muggle|%{vardir}/muggle|' \ -e 's|/srv/audio|%{audiodir}|' < %{SOURCE1} > muggle.conf %build make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr MUSICDIR="%{audiodir}" \ HAVE_SQLITE=1 HAVE_VORBISFILE=1 HAVE_FLAC=1 HAVE_SNDFILE=1 %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} install -pm 755 scripts/muggle-image-convert $RPM_BUILD_ROOT%{plugindir}/bin install -Dpm 644 muggle.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf install -Dpm 755 mugglei $RPM_BUILD_ROOT%{_bindir}/mugglei install -dm 755 $RPM_BUILD_ROOT%{vardir}/muggle touch $RPM_BUILD_ROOT%{vardir}/muggle/GiantDisc.sqlite install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/muggle touch $RPM_BUILD_ROOT%{configdir}/plugins/muggle/muggle.state{,.old} install -dm 755 $RPM_BUILD_ROOT%{cachedir}/muggle %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING HISTORY menu.txt README README.sqlite TODO %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf %{_bindir}/mugglei %{plugindir}/libvdr-%{pname}.so.%{apiver} %{plugindir}/bin/muggle-image-convert %defattr(-,%{vdr_user},root,-) %{cachedir}/muggle/ %dir %{vardir}/muggle/ %ghost %{vardir}/muggle/GiantDisc.sqlite %dir %{configdir}/plugins/muggle/ %ghost %{configdir}/plugins/muggle/muggle.state* %changelog * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.12-3 - rebuild * Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.12-2 - Patch to fix build with GCC 4.3's cleaned up C++ headers. - Rebuild for VDR 1.6.0. * Fri Jan 4 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.12-1 - 0.1.12. * Sun Dec 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.11-2 - Patch for FLAC 1.1.3+ compatibility. - License: GPL+ - Update URLs. * Thu May 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.11-1 - 0.1.11. * Sat Apr 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.10-1 - 0.1.10, most patches applied upstream. - Adjust for VDR 1.3.47+, require versioned vdr(abi). * Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info>- 0.1.9-1.lvn.7 - drop 1.lvn from release * Wed Mar 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.7 - Rebuild for VDR 1.3.44. * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sun Feb 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.6 - Rebuild for VDR 1.3.43. * Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.5 - Rebuild for VDR 1.3.42. * Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.4 - Fix button translations with VDR >= 1.3.38. - Rebuild for VDR 1.3.40. * Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.3 - Rebuild for VDR 1.3.39. * Sun Jan 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.2 - Rebuild/patch for VDR 1.3.38. - Fix build with gcc 4.1. * Wed Nov 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-1.lvn.1 - First livna release. * Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-0.4 - Rebuild for VDR 1.3.37. * Sun Nov 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-0.3 - Rebuild for VDR 1.3.36. * Tue Nov 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-0.2 - Rebuild for VDR 1.3.35. * Wed Oct 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.9-0.1 - 0.1.9. * Mon Oct 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.8 - Rebuild for VDR 1.3.34. * Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.7 - Rebuild for VDR 1.3.33. * Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.6 - Rebuild for VDR 1.3.32. * Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.5 - Rebuild for VDR 1.3.31. * Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.4 - Patch to add loading of DeleteStaleReferences from config. * Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.3 - Switch to SQLite backend. * Sun Aug 7 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.2 - Move plugins.d snippet according to VDR 1.3.28 packages. * Sun Jul 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.8-0.1 - 0.1.8. * Thu Jun 9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1.7-0.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vdr-muggle/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:56:36 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:49:33 -0000 1.2 @@ -0,0 +1 @@ +vdr-muggle-0.1.12.tgz Index: sources =================================================================== RCS file: /cvs/free/rpms/vdr-muggle/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:56:36 -0000 1.1 +++ sources 4 Aug 2008 18:49:33 -0000 1.2 @@ -0,0 +1 @@ +3894e2cd4b05f1fae09fc98b01a0a18b vdr-muggle-0.1.12.tgz