rpms/vdr-mp3/F-9 vdr-mp3-0.10.1-no-debug.patch, NONE, 1.1 vdr-mp3-mediasources.sh, NONE, 1.1 vdr-mp3-mp3.conf, NONE, 1.1 vdr-mp3-mplayer-minimal.sh, NONE, 1.1 vdr-mp3-mplayer.conf, NONE, 1.1 vdr-mp3-mplayer.sh-0.8.7-defaults.patch, NONE, 1.1 vdr-mp3-mplayer.sh-0.8.7-lircrc.patch, NONE, 1.1 vdr-mp3-mplayer.sh-framedrop.patch, NONE, 1.1 vdr-mp3-mplayer.sh-identify.patch, NONE, 1.1 vdr-mp3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-mp3/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27743
Modified Files:
.cvsignore sources
Added Files:
vdr-mp3-0.10.1-no-debug.patch vdr-mp3-mediasources.sh
vdr-mp3-mp3.conf vdr-mp3-mplayer-minimal.sh
vdr-mp3-mplayer.conf vdr-mp3-mplayer.sh-0.8.7-defaults.patch
vdr-mp3-mplayer.sh-0.8.7-lircrc.patch
vdr-mp3-mplayer.sh-framedrop.patch
vdr-mp3-mplayer.sh-identify.patch vdr-mp3.spec
Log Message:
initial import from livna
vdr-mp3-0.10.1-no-debug.patch:
--- NEW FILE vdr-mp3-0.10.1-no-debug.patch ---
diff -up mp3-0.10.1/config.h~ mp3-0.10.1/config.h
--- mp3-0.10.1/config.h~ 2005-11-26 14:37:14.000000000 +0200
+++ mp3-0.10.1/config.h 2008-03-16 13:28:37.000000000 +0200
@@ -32,8 +32,8 @@
// Uncomment to enable generic debugging messages to the console. This may slow
// down operation in some cases.
-#define DEBUG
-//#define NO_DEBUG
+//#define DEBUG
+#define NO_DEBUG
// Defines the filename extention to use for playlist files.
#define PLAYLISTEXT ".m3u"
--- NEW FILE vdr-mp3-mediasources.sh ---
#!/bin/sh
# http://www.pathname.com/fhs/pub/fhs-2.3.html#MEDIAMOUNTPOINT
for file in /media/* ; do
if [ -d "$file" ] ; then
type="`basename $file`"
if [ "$type" = cdrom ] ; then
echo "$file;CD-ROM;1"
elif [ "$type" = cdrecorder ] ; then
echo "$file;CD Writer;1"
elif [ "$type" = zip ] ; then
echo "$file;Zip Drive;1"
fi
fi
done
--- NEW FILE vdr-mp3-mp3.conf ---
# Configuration snippet for vdr-mp3 -*- sh -*-
#
# Add command line options to pass to the mp3 plugin to PLUGIN_OPTIONS.
# See /usr/share/doc/vdr-mp3-*/README for info about available options.
PLUGIN_OPTIONS="-C /var/cache/vdr/mp3"
--- NEW FILE vdr-mp3-mplayer-minimal.sh ---
#!/bin/sh
#
# Minimal script for launching MPlayer from VDR.
#
# Expectations:
# - mplayer is found in $PATH
# - everything is configured properly in mplayer's config files
file="$1"
opts=
case "$file" in
*.pls|*.m3u) opts="$opts -playlist" ;;
esac
while shift ; do
case "$1" in
SLAVE) opts="$opts -slave -quiet -nolirc" ;;
AID) opts="$opts -aid $2" ; shift ;;
esac
done
exec mplayer $opts "$file"
--- NEW FILE vdr-mp3-mplayer.conf ---
# Configuration snippet for vdr-mplayer -*- sh -*-
#
# Add command line options to pass to the mplayer plugin to PLUGIN_OPTIONS.
# See /usr/share/doc/vdr-mplayer-*/README for info about available options.
#
# In particular, you may want to change the script used to launch mplayer.
# The vdr-mplayer package ships two scripts of them; mplayer.sh (the
# default one) is a full featured one including support for playing DVD's,
# and mplayer-minimal.sh is a bare minimum one that you may want to use if
# you don't like the things done by the full one (scaling etc). Set
# "-M mplayer-minimal.sh" to use the minimal one.
PLUGIN_OPTIONS="-R /var/lib/vdr"
vdr-mp3-mplayer.sh-0.8.7-defaults.patch:
--- NEW FILE vdr-mp3-mplayer.sh-0.8.7-defaults.patch ---
diff -up m/mplayer.sh.conf.orig m/mplayer.sh.conf
--- m/mplayer.sh.conf.orig 2007-02-11 17:38:06.000000000 +0200
+++ m/mplayer.sh.conf 2008-03-16 13:46:04.000000000 +0200
@@ -1,4 +1,4 @@
-# Config File for mplayer.sh ...
+# Config File for mplayer.sh ... -*- sh -*-
#
# $Id: mplayer.sh.conf,v 1.24.2.3 2007/02/11 15:19:35 juri Exp $
#
@@ -23,7 +23,9 @@ VOP="lavc=5000"
# 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)
+# More info: http://www.mplayerhq.hu/DOCS/HTML/en/mpeg_decoders.html
#VO="dxr3"
+#VO="dxr3:prebuf"
#VO="dfbmga"
#VO="mpegpes:card=1"
VO="mpegpes"
@@ -67,9 +69,8 @@ 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 alsa -ac hwac3"
+# for AC3 via DVB (doesn't need AC3overDVB patch):
#AC3AOUT="-ac hwac3"
# what aspect ratio has your TV set?
@@ -81,17 +82,10 @@ 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?
+# What detelecining 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"
+DETC_FILTER="ivtc=1"
+#DETC_FILTER="detc=dr=2:am=1"
# Cache Option for MPlayer
CACHE="4096"
@@ -115,10 +109,10 @@ LIRCRC="/video/.lircrc"
DVDFiles="/video/plugins/DVD-VCD"
# What is your DVD-ROM device ?
-DVD="/dev/hdc"
+DVD="/dev/dvd"
# What languages do your DVD's use ?
-DVDLANG="de"
+DVDLANG="en"
# extra DVD options
#DVDOPTIONS="-af volume=+10"
diff -up m/mplayer.sh.orig m/mplayer.sh
--- m/mplayer.sh.orig 2007-02-11 17:34:07.000000000 +0200
+++ m/mplayer.sh 2008-03-16 13:33:07.000000000 +0200
@@ -253,13 +253,6 @@ function initialize () {
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;
}
@@ -518,12 +511,7 @@ if test \( "$FILE" == "$DVDFiles/DVD" -o
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
+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
else
# Try to determine the video attributes
if $DEBUG; then echolog "*** DEBUG: Calling getvidxy function to analyze source video stream ..."; fi
vdr-mp3-mplayer.sh-0.8.7-lircrc.patch:
--- NEW FILE vdr-mp3-mplayer.sh-0.8.7-lircrc.patch ---
--- mplayer.sh.conf~ 2007-02-11 17:38:06.000000000 +0200
+++ mplayer.sh.conf 2007-02-25 13:31:21.000000000 +0200
@@ -100,7 +100,11 @@
FRAMEDROP="true"
# Lirc RC File
-LIRCRC="/video/.lircrc"
+if ldd "$MPLAYER" 2>/dev/null | grep liblirc_client >/dev/null 2>&1 ; then
+ LIRCRC="/etc/vdr/lircrc"
+else
+ LIRCRC=""
+fi
# do we have a slow CPU?
# if so, reduce the Y resolution to the half of the possible maximum:
vdr-mp3-mplayer.sh-framedrop.patch:
--- NEW FILE vdr-mp3-mplayer.sh-framedrop.patch ---
--- mplayer.sh~ 2004-11-06 23:00:00.000000000 +0200
+++ mplayer.sh 2004-12-24 11:58:18.949657706 +0200
@@ -189,7 +189,7 @@
if test -z "$FRAMEDROP" -o "$FRAMEDROP" != "true"; then FRAMEDROP=false; fi
debugvar FRAMEDROP "$FRAMEDROP"
- if $FRAMEDROP; then FDSTR="-framedrop"; fi
+ if $FRAMEDROP; then FDSTR="-framedrop"; else FDSTR="-noframedrop"; fi
debugvar FDSTR "$FDSTR"
declare LIRCSTR="" # no extra Lirc option!
vdr-mp3-mplayer.sh-identify.patch:
--- NEW FILE vdr-mp3-mplayer.sh-identify.patch ---
--- mplayer.sh.orig 2004-11-06 23:00:00.000000000 +0200
+++ mplayer.sh 2005-07-18 20:53:04.000000000 +0300
@@ -268,7 +268,7 @@
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_"`
+ TEMP1=`$MPLAYER -identify -vo null -nosound -frames 0 -cache-min 0 -nolirc -nojoystick "$FILE" 2>/dev/null | grep -i -e "^ID_"`
MPLAYER_RETURN=$?
debugmsg "OutputFromMPLAYER:" "$TEMP1"
debugmsg "MPLAYER_RETURN: " "$MPLAYER_RETURN"
--- NEW FILE vdr-mp3.spec ---
# TODO:
# - mplayer.sh:
# - patch to allow playing audio files (currently insists to find video)
# - audio CD support?
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
%define audiodir %(vdr-config --audiodir 2>/dev/null || echo ERROR)
%define datadir %(vdr-config --datadir 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 apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define vdr_user %(vdr-config --user 2>/dev/null || echo ERROR)
Name: vdr-mp3
Version: 0.10.1
Release: 4%{?dist}
Summary: Sound playback plugin for VDR
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.muempf.de/
Source0: http://www.muempf.de/down/%{name}-%{version}.tar.gz
Source1: http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-0.8.7.ta...
Source2: %{name}-mediasources.sh
Source3: %{name}-mp3.conf
Source4: %{name}-mplayer.conf
Source5: %{name}-mplayer-minimal.sh
Patch0: %{name}-mplayer.sh-0.8.7-lircrc.patch
Patch1: %{name}-mplayer.sh-framedrop.patch
Patch2: %{name}-mplayer.sh-identify.patch
Patch3: %{name}-mplayer.sh-0.8.7-defaults.patch
Patch4: %{name}-0.10.1-no-debug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.4.0
BuildRequires: libsndfile-devel >= 1.0.0
BuildRequires: libvorbis-devel
BuildRequires: %{__perl}
BuildRequires: libmad-devel
BuildRequires: libid3tag-devel
Requires: vdr(abi) = %{apiver}
Requires: netpbm-progs
Requires: mjpegtools >= 1.8.0
Requires: file
%description
The MP3 plugin adds audio playback capability to VDR. Supported audio
formats are those supported by libmad, libsndfile and libvorbis.
%package -n vdr-mplayer
Summary: MPlayer plugin for VDR
Group: Applications/Multimedia
BuildRequires: %{__perl}
Requires: vdr(abi) = %{apiver}
Requires: mplayer >= 1.0-0.lvn.0.19.pre7
%description -n vdr-mplayer
The MPlayer plugin adds the ability to call MPlayer from within VDR,
allowing to replay all video formats supported by MPlayer over VDR's
primary output device.
%prep
%setup -q -n mp3-%{version} -a 1
%patch0
%patch1
%patch2
%patch3 -p1
%patch4 -p1
%{__perl} -pi -e \
's|CFGFIL=.*|CFGFIL="%{configdir}/plugins/mplayer.sh.conf"|' \
mplayer.sh
%{__perl} -pi -e \
's|"/var/cache/images/mp3"|"%{cachedir}/mp3/images"|' \
data-mp3.c README
%{__perl} -pi -e \
's|"/video/plugins/DVD-VCD"|"%{datadir}/DVD-VCD"| ;
s|^MPLAYER=.*|MPLAYER="%{_bindir}/mplayer"|' \
mplayer.sh.conf
for f in HISTORY MANUAL README ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
sed -e 's|/var/lib/vdr|%{vardir}|' %{SOURCE4} > %{name}-mplayer.conf
%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr WITH_OSS_OUTPUT=1 \
libvdr-mp3.so libvdr-mplayer.so
echo "%{audiodir};Local hard drive;0" > mp3sources.conf
echo "%{datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
%install
rm -rf $RPM_BUILD_ROOT
# Common dirs
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
# Common files
install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{plugindir}/bin/mediasources.sh
install -pm 755 examples/mount.sh.example \
$RPM_BUILD_ROOT%{plugindir}/bin/mount.sh
# MP3 files
install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 644 mp3sources.conf $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 examples/image_convert.sh.example \
$RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
%{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
install -dm 755 $RPM_BUILD_ROOT%{cachedir}/mp3/images
i=$RPM_BUILD_ROOT%{cachedir}/mp3/id3info.cache ; > $i ; chmod 644 $i
# MPlayer files
install -pm 755 libvdr-mplayer.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{datadir}/DVD-VCD
touch $RPM_BUILD_ROOT%{datadir}/DVD-VCD/{DVD,VCD}
chmod 644 $RPM_BUILD_ROOT%{datadir}/DVD-VCD/*
install -pm 644 mplayersources.conf mplayer.sh.conf \
$RPM_BUILD_ROOT%{configdir}/plugins
install -pm 755 mplayer.sh $RPM_BUILD_ROOT%{plugindir}/bin/mplayer.sh
install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{plugindir}/bin/mplayer-minimal.sh
install -pm 644 %{name}-mplayer.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
install -dm 755 $RPM_BUILD_ROOT%{vardir}
i=$RPM_BUILD_ROOT%{vardir}/global.mplayer.resume ; > $i ; chmod 644 $i
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ $1 -eq 1 ] ; then
%{plugindir}/bin/mediasources.sh \
>> %{configdir}/plugins/mp3sources.conf || :
else
if ! grep %{audiodir} %{configdir}/plugins/mp3sources.conf &>/dev/null ; then
echo "%{audiodir}" >> %{configdir}/plugins/mp3sources.conf || :
fi
r=global.mplayer.resume
if [ -f %{videodir}/$r -a ! -f %{vardir}/$r ] ; then
mv %{videodir}/$r %{vardir}/$r
fi
fi
%post -n vdr-mplayer
if [ $1 -eq 1 ] ; then
%{plugindir}/bin/mediasources.sh \
>> %{configdir}/plugins/mplayersources.conf || :
fi
%files
%defattr(-,root,root,-)
%doc COPYING HISTORY MANUAL README examples/mount.sh.example
%doc examples/mp3sources.conf.example examples/network.sh.example
%config(noreplace) %{configdir}/plugins/mp3sources.conf
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
%{plugindir}/libvdr-mp3.so.%{apiver}
%{plugindir}/bin/image_convert.sh
%{plugindir}/bin/mediasources.sh
%{plugindir}/bin/mount.sh
%defattr(-,%{vdr_user},root,-)
%dir %{cachedir}/mp3/
%dir %{cachedir}/mp3/images/
%ghost %{cachedir}/mp3/id3info.cache
%files -n vdr-mplayer
%defattr(-,root,root,-)
%doc COPYING HISTORY MANUAL README examples/mplayer.sh.example
%doc examples/mount.sh.example
%config(noreplace) %{configdir}/plugins/mplayer*.conf
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
%{plugindir}/libvdr-mplayer.so.%{apiver}
%{plugindir}/bin/mediasources.sh
%{plugindir}/bin/mount.sh
%{plugindir}/bin/mplayer*.sh
%{datadir}/DVD-VCD/
%defattr(-,%{vdr_user},root,-)
%ghost %{vardir}/global.mplayer.resume
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.10.1-4
- rebuild
* Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-3
- Rebuild for VDR 1.6.0.
* Sun Mar 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-2
- Suppress console debug messages.
- Add dxr3:prebuf example to mplayer.sh.conf.
* Mon Aug 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-1
- 0.10.1.
* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10.0-2
- License: GPLv2+
* Sun Jun 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10.0-1
- 0.10.0.
- Fix path to mplayer in mplayer.sh.conf (full path needed after all).
* Sun Feb 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-5
- Apply upstream patch to check availability of last dir before accessing it.
- Update mplayer.sh to 0.8.7.
* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-4
- Rebuild for VDR 1.4.5.
* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-3
- Rebuild for VDR 1.4.4.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.9.15-2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-1
- 0.9.15, build for VDR 1.4.3.
* Sun Aug 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.6.pre14
- Rebuild for VDR 1.4.1-3.
* Sun Jul 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.5.pre14
- 0.9.15pre14 + Rolf Ahrenberg's Finnish patch.
- Plugin C(XX)FLAGS and zlib patches applied upstream.
- Re-enable MP3 plugin; it supposedly works just fine in most setups
(still not in my vdr-dxr3 one though).
* Mon Jul 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.5.pre10
- Patch to get plugin C(XX)FLAGS properly applied from Make.config.
* Sun Jul 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.4.pre10
- Include accidentally dropped mplayer.sh.conf.
* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.3.pre10
- Rebuild for VDR 1.4.1.
* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.2.pre10
- 0.9.15pre10, build for VDR 1.4.0.
- Move -mplayer global resume file to /var/lib/vdr.
* Sun Apr 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.2.pre6
- Require versioned vdr(abi) also in -mplayer.
* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.15-0.1.pre6
- 0.9.15pre6, i18n fix applied upstream.
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.
* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-8
- Rebuild for VDR 1.3.45.
- Disable mp3 plugin, it doesn't work properly with NPTL (#844).
* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-7
- Get rid of superfluous direct dependency on zlib (#813).
* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.9.14-6
- drop 0.lvn from release
* Wed Mar 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-0.lvn.6
- 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.9.14-0.lvn.5
- Rebuild for VDR 1.3.43.
* Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-0.lvn.4
- Rebuild for VDR 1.3.42.
* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-0.lvn.3
- Fix button translations with VDR >= 1.3.38.
- Add mplayer-minimal.sh, an alternative MPlayer launcher script.
- Rebuild for VDR 1.3.40.
* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-0.lvn.2
- Rebuild for VDR 1.3.39.
* Sun Jan 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.14-0.lvn.1
- 0.9.14.
- Patch to fix build with gcc 4.1.
- Rebuild for VDR 1.3.38.
* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.10
- Rebuild for VDR 1.3.37.
* Sun Nov 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.9
- Rebuild for VDR 1.3.36.
* Tue Nov 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.8
- Rebuild for VDR 1.3.35.
* Mon Oct 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.7
- Rebuild for VDR 1.3.34.
* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.6
- Rebuild for VDR 1.3.33.
* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.5
- Rebuild for VDR 1.3.32.
* Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.4
- Rebuild for VDR 1.3.31.
* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.3
- Rebuild for VDR 1.3.30.
- Add audiodir to mp3sources.conf.
* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.2
- Try to avoid build system problems by not using %%expand with vdr-config.
* Sat Aug 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.13-1.lvn.1
- Improve descriptions, convert docs to UTF-8.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:56:28 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:52:40 -0000 1.2
@@ -0,0 +1,2 @@
+mplayer.sh-0.8.7.tar.gz
+vdr-mp3-0.10.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:56:28 -0000 1.1
+++ sources 4 Aug 2008 19:52:40 -0000 1.2
@@ -0,0 +1,2 @@
+cc2e48d4787b7ee739a0a8bb5b8c9fb2 mplayer.sh-0.8.7.tar.gz
+ca43583a7ccc9491bf24362dd6bebf4b vdr-mp3-0.10.1.tar.gz
16 years, 3 months
- 1
- 0
rpms/vdr-muggle/F-8 vdr-muggle.conf, NONE, 1.1 vdr-muggle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-muggle/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27621
Modified Files:
.cvsignore sources
Added Files:
vdr-muggle.conf vdr-muggle.spec
Log Message:
initial import from livna
--- 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: 2%{?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
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}
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-2
- rebuild
* 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/F-8/.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 19:51:53 -0000 1.2
@@ -0,0 +1 @@
+vdr-muggle-0.1.12.tgz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-muggle/F-8/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 19:51:53 -0000 1.2
@@ -0,0 +1 @@
+3894e2cd4b05f1fae09fc98b01a0a18b vdr-muggle-0.1.12.tgz
16 years, 3 months
- 1
- 0
rpms/vdr-muggle/F-9 vdr-muggle-0.1.12-gcc43.patch, NONE, 1.1 vdr-muggle.conf, NONE, 1.1 vdr-muggle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-muggle/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27496
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/F-9/.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 19:51:02 -0000 1.2
@@ -0,0 +1 @@
+vdr-muggle-0.1.12.tgz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-muggle/F-9/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 19:51:02 -0000 1.2
@@ -0,0 +1 @@
+3894e2cd4b05f1fae09fc98b01a0a18b vdr-muggle-0.1.12.tgz
16 years, 3 months
- 1
- 0
rpms/vdr-dxr3/F-8 vdr-dxr3-0.2.7-new-ffmpeg.patch, NONE, 1.1 vdr-dxr3.conf, NONE, 1.1 vdr-dxr3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-dxr3/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27372
Modified Files:
.cvsignore sources
Added Files:
vdr-dxr3-0.2.7-new-ffmpeg.patch vdr-dxr3.conf vdr-dxr3.spec
Log Message:
initial import from livna
vdr-dxr3-0.2.7-new-ffmpeg.patch:
--- NEW FILE vdr-dxr3-0.2.7-new-ffmpeg.patch ---
Index: dxr3ffmpeg.c
===================================================================
RCS file: /cvsroot/dxr3plugin/dxr3/dxr3ffmpeg.c,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.12
diff -u -r1.2.2.10 -r1.2.2.12
--- dxr3ffmpeg.c 7 Jan 2007 21:59:01 -0000 1.2.2.10
+++ dxr3ffmpeg.c 13 Aug 2007 08:10:04 -0000 1.2.2.12
@@ -28,8 +28,10 @@
cDxr3Ffmpeg::cDxr3Ffmpeg()
{
avcodec_init();
- // Register only codec(s) we'll need.
- register_avcodec(&mp2_decoder);
+ // Only the MP2 decoder would be needed, but individual registration of
+ // codecs bundled with ffmpeg itself does not appear to be really supported
+ // as of ffmpeg 2007-07-xx and later.
+ avcodec_register_all();
}
// ==================================
--- NEW FILE vdr-dxr3.conf ---
# Configuration snippet for vdr-dxr3 -*- sh -*-
#
# Add command line options to pass to the dxr3 plugin to PLUGIN_OPTIONS.
PLUGIN_OPTIONS=""
# If your system does not initialize the DXR3 elsewhere before launching
# VDR, you can do it here (make sure your modprobe.conf is properly set up):
#/sbin/modprobe em8300 || :
--- NEW FILE vdr-dxr3.spec ---
%define pname dxr3
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
Name: vdr-%{pname}
Version: 0.2.7
Release: 3%{?dist}
Summary: Hollywood+/DXR3 output plugin for VDR
Group: Applications/Multimedia
License: GPLv2+
URL: http://sourceforge.net/projects/dxr3plugin
#Source0: http://download.sf.net/dxr3plugin/%{name}-%{version}.tgz
Source0: http://cachalot.mine.nu/src/dxr3/%{name}-%{version}.tgz
Source1: %{name}.conf
Patch0: %{name}-0.2.7-new-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.3.47
BuildRequires: em8300-devel
BuildRequires: ffmpeg-devel
Requires: vdr(abi) = %{apiver}
Requires: em8300-kmod >= 0.15.2
%description
This plugin allows using a Hollywood+/DXR3 MPEG decoder card as VDR's
primary output device.
%prep
%setup -q -n %{pname}-%{version}
%patch0
for f in CONTRIBUTORS HISTORY TROUBLESHOOTING ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
%if 0%{?_without_xine_scaler:1}
sed -i -e /-DUSE_XINE_SCALER/d Makefile
%endif
%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr \
FFMDIR=%{_includedir}/ffmpeg
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc CONTRIBUTORS COPYING HISTORY README TROUBLESHOOTING
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.7-3
- rebuild
* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.7-2
- BuildRequires: gawk for extracting APIVERSION.
- Fix build with > ~2007-07 ffmpeg.
- License: GPLv2+
* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.7-1
- 0.2.7.
* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-7
- Rebuild for VDR 1.4.5.
* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-6
- Rebuild for VDR 1.4.4.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.2.6-5
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-4
- Rebuild for VDR 1.4.3.
* Sun Aug 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-3
- Require em8300-kmod, not kmod-em8300.
- Add "--with ac3" rpmbuild option for building with the AC3 patch applied.
* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-2
- Rebuild for VDR 1.4.1.
* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-1
- 0.2.6, build for VDR 1.4.0.
* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-10
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.
* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-9
- Rebuild for VDR 1.3.45.
* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-8
- Don't use %%bcond_without (#814).
* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.2.5-7
- drop 0.lvn from release
* Wed Mar 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.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.2.5-0.lvn.6
- Rebuild for VDR 1.3.43.
* Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.5
- Rebuild/patch for VDR 1.3.42.
* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.4
- Rebuild for VDR 1.3.40.
* Tue Jan 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.3
- Remove unneeded jpeglib.h inclusion (#733).
* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.2
- Rebuild for VDR 1.3.39.
* Tue Jan 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.1
- 0.2.5.
- Rebuild for VDR 1.3.38.
- Make build with Xine scaler optional (default to on).
* Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.8
- Rebuild against new ffmpeg.
* Thu Nov 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.7
- Adjust firmware location for em8300 >= 0.15.2, require it.
* Sun Nov 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.6
- Rebuild for VDR 1.3.36.
* Tue Nov 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.5
- Rebuild for VDR 1.3.35.
* Mon Oct 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.4
- Rebuild for VDR 1.3.34.
* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.3
- Rebuild for VDR 1.3.33.
* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.2
- Rebuild for VDR 1.3.32.
* Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.1
- 0.2.4.
- Rebuild for VDR 1.3.31.
* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.4
- Rebuild for VDR 1.3.30.
* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.2.3-1.lvn.3
- Bumped release (rebuild against new ffmpeg)
* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.2
- Try to avoid build system problems by not using %%expand with vdr-config.
* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.1
- Convert docs to UTF-8.
- Improve description.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:56:20 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:50:00 -0000 1.2
@@ -0,0 +1 @@
+vdr-dxr3-0.2.7.tgz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:56:20 -0000 1.1
+++ sources 4 Aug 2008 19:50:00 -0000 1.2
@@ -0,0 +1 @@
+2444e0fc5ac7912119df09327b185c47 vdr-dxr3-0.2.7.tgz
16 years, 3 months
- 1
- 0
rpms/vdr-dxr3/F-9 vdr-dxr3.conf, NONE, 1.1 vdr-dxr3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-dxr3/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26948
Modified Files:
.cvsignore sources
Added Files:
vdr-dxr3.conf vdr-dxr3.spec
Log Message:
initial import from livna
--- NEW FILE vdr-dxr3.conf ---
# Configuration snippet for vdr-dxr3 -*- sh -*-
#
# Add command line options to pass to the dxr3 plugin to PLUGIN_OPTIONS.
PLUGIN_OPTIONS=""
# If your system does not initialize the DXR3 elsewhere before launching
# VDR, you can do it here (make sure your modprobe.conf is properly set up):
#/sbin/modprobe em8300 || :
--- NEW FILE vdr-dxr3.spec ---
%define pname dxr3
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
Name: vdr-%{pname}
Version: 0.2.8
Release: 2%{?dist}
Summary: Hollywood+/DXR3 output plugin for VDR
Group: Applications/Multimedia
License: GPLv2+
URL: http://sourceforge.net/projects/dxr3plugin
Source0: http://downloads.sourceforge.net/dxr3plugin/%{name}-%{version}.tgz
Source1: %{name}.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.4.0
BuildRequires: em8300-devel
BuildRequires: ffmpeg-devel
Requires: vdr(abi) = %{apiver}
Requires: em8300-kmod >= 0.15.2
%description
This plugin allows using a Hollywood+/DXR3 MPEG decoder card as VDR's
primary output device.
%prep
%setup -q -n %{pname}-%{version}
for f in CONTRIBUTORS HISTORY TROUBLESHOOTING ; do
iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
%if 0%{?_without_xine_scaler:1}
sed -i -e /-DUSE_XINE_SCALER/d Makefile
%endif
%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr \
FFMDIR=%{_includedir}/ffmpeg
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc CONTRIBUTORS COPYING HISTORY README TROUBLESHOOTING
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.8-2
- rebuild
* Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.2.8-1
- 0.2.8, new ffmpeg patch applied upstream.
- Build for VDR 1.6.0.
* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.7-2
- BuildRequires: gawk for extracting APIVERSION.
- Fix build with > ~2007-07 ffmpeg.
- License: GPLv2+
* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.7-1
- 0.2.7.
* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-7
- Rebuild for VDR 1.4.5.
* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-6
- Rebuild for VDR 1.4.4.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.2.6-5
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-4
- Rebuild for VDR 1.4.3.
* Sun Aug 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-3
- Require em8300-kmod, not kmod-em8300.
- Add "--with ac3" rpmbuild option for building with the AC3 patch applied.
* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-2
- Rebuild for VDR 1.4.1.
* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.6-1
- 0.2.6, build for VDR 1.4.0.
* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-10
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.
* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-9
- Rebuild for VDR 1.3.45.
* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-8
- Don't use %%bcond_without (#814).
* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.2.5-7
- drop 0.lvn from release
* Wed Mar 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.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.2.5-0.lvn.6
- Rebuild for VDR 1.3.43.
* Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.5
- Rebuild/patch for VDR 1.3.42.
* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.4
- Rebuild for VDR 1.3.40.
* Tue Jan 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.3
- Remove unneeded jpeglib.h inclusion (#733).
* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.2
- Rebuild for VDR 1.3.39.
* Tue Jan 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.5-0.lvn.1
- 0.2.5.
- Rebuild for VDR 1.3.38.
- Make build with Xine scaler optional (default to on).
* Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.8
- Rebuild against new ffmpeg.
* Thu Nov 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.7
- Adjust firmware location for em8300 >= 0.15.2, require it.
* Sun Nov 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.6
- Rebuild for VDR 1.3.36.
* Tue Nov 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.5
- Rebuild for VDR 1.3.35.
* Mon Oct 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.4
- Rebuild for VDR 1.3.34.
* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.3
- Rebuild for VDR 1.3.33.
* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.2
- Rebuild for VDR 1.3.32.
* Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-0.lvn.1
- 0.2.4.
- Rebuild for VDR 1.3.31.
* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.4
- Rebuild for VDR 1.3.30.
* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.2.3-1.lvn.3
- Bumped release (rebuild against new ffmpeg)
* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.2
- Try to avoid build system problems by not using %%expand with vdr-config.
* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.2.3-1.lvn.1
- Convert docs to UTF-8.
- Improve description.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-dxr3/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:56:20 -0000 1.1
+++ sources 4 Aug 2008 19:49:07 -0000 1.2
@@ -0,0 +1 @@
+3c88aa0478a9aeaed765ec5a5f2d6a35 vdr-dxr3-0.2.8.tgz
16 years, 3 months
- 1
- 0
rpms/vdr-burn/F-8 vdr-burn-0.1.0-pre21-config.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-finnish.patch, NONE, 1.1 vdr-burn.conf, NONE, 1.1 vdr-burn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-burn/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26822
Modified Files:
.cvsignore sources
Added Files:
vdr-burn-0.1.0-pre21-config.patch
vdr-burn-0.1.0-pre21-finnish.patch vdr-burn.conf vdr-burn.spec
Log Message:
initial import from livna
vdr-burn-0.1.0-pre21-config.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-config.patch ---
Index: Makefile
===================================================================
RCS file: /var/cvsroot/burn/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 1 Oct 2006 21:26:44 -0000 1.23
+++ Makefile 12 Dec 2006 20:31:14 -0000
@@ -81,11 +81,11 @@
endif
ifndef DVDDEV
-DVDDEV=/dev/dvd
+DVDDEV=/dev/dvdrw
endif
ifndef ISODIR
-ISODIR=/pub/export
+ISODIR=$(shell vdr-config --videodir)
endif
DEFINES += -DTMPDIR='"$(TMPDIR)"' -DDVDDEV='"$(DVDDEV)"' -DISODIR='"$(ISODIR)"'
Index: README
===================================================================
RCS file: /var/cvsroot/burn/README,v
retrieving revision 1.11
diff -u -r1.11 README
--- README 16 Sep 2006 19:37:54 -0000 1.11
+++ README 12 Dec 2006 20:31:14 -0000
@@ -92,7 +92,7 @@
3b.(optional) Change the default temporary folder, the default DVD writer device
and the default ISO directory with TMPDIR (default: /tmp),
- DVDDEV (default: /dev/dvd) and ISODIR (default: /pub/export)
+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
vdr-1.4.2 # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
Index: chain-archive.c
===================================================================
RCS file: /var/cvsroot/burn/chain-archive.c,v
retrieving revision 1.13
diff -u -r1.13 chain-archive.c
--- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13
+++ chain-archive.c 12 Dec 2006 20:31:14 -0000
@@ -64,7 +64,7 @@
bind( &recording::get_graft_point, _2 ),
" "
)));
- graftPoints = format("{0} /dvd.vdr={1}/counters/standard") % graftPoints % plugin::get_config_path();
+ graftPoints = format("{0} /dvd.vdr=/var/lib/vdr/burn/counters/standard") % graftPoints;
switch (get_job().get_store_mode()) {
case storemode_create:
Index: jobs.c
===================================================================
RCS file: /var/cvsroot/burn/jobs.c,v
retrieving revision 1.35
diff -u -r1.35 jobs.c
--- jobs.c 1 Oct 2006 21:22:27 -0000 1.35
+++ jobs.c 12 Dec 2006 20:31:14 -0000
@@ -389,7 +389,7 @@
std::string job::get_archive_id()
{
std::string archive_id = "";
- std::string counter_path = format("{0}/counters/standard") % plugin::get_config_path();
+ std::string counter_path = "/var/lib/vdr/burn/counters/standard";
std::ifstream f(counter_path.c_str());
if (!f) {
proctools::logger::error(proctools::format("couldn't read {0}") % counter_path);
Index: vdrburn-archive.sh
===================================================================
RCS file: /var/cvsroot/burn/vdrburn-archive.sh,v
retrieving revision 1.5
diff -u -r1.5 vdrburn-archive.sh
--- vdrburn-archive.sh 24 Oct 2006 17:46:27 -0000 1.5
+++ vdrburn-archive.sh 12 Dec 2006 20:31:14 -0000
@@ -43,12 +43,12 @@
;;
recordingmark)
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr"
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr"
;;
archivemark)
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
*)
Index: vdrburn-dvd.sh
===================================================================
RCS file: /var/cvsroot/burn/vdrburn-dvd.sh,v
retrieving revision 1.23
diff -u -r1.23 vdrburn-dvd.sh
--- vdrburn-dvd.sh 24 Oct 2006 17:46:27 -0000 1.23
+++ vdrburn-dvd.sh 12 Dec 2006 20:31:14 -0000
@@ -29,11 +29,11 @@
# as $MPEG_TMP_PATH)
if [ -z $JAVA_HOME ]; then
- export JAVA_HOME=/opt/j2re1.4.2
+ export JAVA_HOME=/usr/lib/jvm/jre
fi
if [ -z $PROJECTX_HOME ]; then
- export PROJECTX_HOME=/opt/ProjectX
+ export PROJECTX_HOME=/usr/share/java
fi
# Some versions of growisofs refuse to start when run with sudo, and may
@@ -61,7 +61,7 @@
CUT="-cut"
fi
- vdrsync.pl -o "$MPEG_TMP_PATH" \
+ vdrsync -o "$MPEG_TMP_PATH" \
-v-filter "burn-buffers" \
-a-filter "burn-buffers" \
-ac3-filter "burn-buffers" \
@@ -197,15 +197,15 @@
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating $RECORDING_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr"
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr"
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_PATH/dvd.vdr"
;;
archivemark)
echo "Creating $DVDAUTHOR_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
mkiso)
vdr-burn-0.1.0-pre21-finnish.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-finnish.patch ---
Index: i18n.c
===================================================================
RCS file: /var/cvsroot/burn/i18n.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- i18n.c 16 Sep 2006 18:33:36 -0000 1.38
+++ i18n.c 16 Sep 2006 22:08:38 -0000 1.39
@@ -2,7 +2,7 @@
* See the files COPYING and README for copyright information and how to reach
* the author.
*
- * $Id: i18n.c,v 1.38 2006/09/16 18:33:36 lordjaxom Exp $
+ * $Id: i18n.c,v 1.39 2006/09/16 22:08:38 lordjaxom Exp $
*/
#include "i18n.h"
@@ -322,7 +322,7 @@
"",
"",
"",
- "",
+ "(joudutaan pienentämään)",
"",
"",
"",
@@ -3260,7 +3260,7 @@
"",
"",
"",
- "Ohita tyhjä päävalikko",
+ "Ohita tyhjä nimikevalikko",
"",
"",
"",
@@ -3286,7 +3286,7 @@
"",
"",
"",
- "Tarjoa päävalikon ohitusta",
+ "Tarjoa nimikevalikon ohitusta",
"",
"",
"",
@@ -3312,7 +3312,7 @@
"",
"",
"",
- "",
+ "Tehtävän asetukset",
"",
"",
"",
@@ -3338,7 +3338,7 @@
"",
"",
"",
- "",
+ "Ohita lyhyt päävalikko",
"",
"",
"",
@@ -3364,7 +3364,7 @@
"",
"",
"",
- "",
+ "Tarjoa päävalikon ohitusta",
"",
"",
"",
--- NEW FILE vdr-burn.conf ---
# Configuration snippet for vdr-burn -*- sh -*-
#
# Add command line options to pass to the burn plugin to PLUGIN_OPTIONS.
# See /usr/share/doc/vdr-burn-*/README and "vdr --help" for info about
# available options for this plugin.
PLUGIN_OPTIONS="-d /tmp"
--- NEW FILE vdr-burn.spec ---
# TODO: disksize 4420? 4462 was too big sometimes with 0.0.x
%define pname burn
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR)
%define vdruser %(vdr-config --user 2>/dev/null || echo ERROR)
%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define pre pre21
%define gver 0.1.3
Name: vdr-%{pname}
Version: 0.1.0
Release: 0.9.%{pre}%{?dist}.2
Summary: DVD writing plugin for VDR
Group: Applications/Multimedia
# genindex is GPLv2+, rest GPL+
License: GPL+ and GPLv2+
URL: http://www.xeatre.tv/community/burn/
Source0: http://linux.kompiliert.net/contrib/%{name}-%{version}-%{pre}.tgz
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
Patch0: %{name}-%{version}-pre21-config.patch
Patch1: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-burn-cvs-subpicture-id...
Patch2: %{name}-%{version}-pre21-finnish.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.3.47
BuildRequires: boost-devel
BuildRequires: gd-devel >= 2.0.33-9.3
Requires: vdr(abi) = %{apiver}
Requires: vdrsync
Requires: m2vrequantiser
Requires: dvdauthor
Requires: mjpegtools
Requires: dvd+rw-tools
Requires: dejavu-lgc-fonts
%description
This plugin enables VDR to write compliant DVDs from VDR recordings
while being able to control the process and to watch progress from
inside VDRs on-screen-display. If the selected recordings don't fit
the DVD, the video tracks are requantized (shrinked) automatically.
The created menus support multipage descriptions (in case the
recording summary exceeds one page).
%prep
%setup -q -c -a 2
cd burn
find -name CVS | xargs rm -rf
chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
%patch0
%patch1
%patch2
sed -i -e 's|/var/lib/vdr/|%{vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
cd ../genindex-%{gver}
sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile
f=README ; iconv -f iso-8859-1 -t utf-8 -o ../README.genindex $f
cd ..
%build
make -C burn %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
make -C genindex-%{gver} %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
install -pm 755 burn/libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 755 burn/*.sh burn/burn-buffers genindex-%{gver}/genindex \
$RPM_BUILD_ROOT%{plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/burn/skins
cp -pR burn/burn/* $RPM_BUILD_ROOT%{configdir}/plugins/burn
rm -rf $RPM_BUILD_ROOT%{configdir}/plugins/burn/{counters,fonts/*}
ln -s %{_datadir}/fonts/dejavu-lgc/DejaVuLGCSans.ttf \
$RPM_BUILD_ROOT%{configdir}/plugins/burn/fonts/
install -Dpm 644 burn/burn/counters/standard \
$RPM_BUILD_ROOT%{vardir}/burn/counters/standard
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
%{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \
%{configdir}/reccmds.conf >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)
%doc burn/COPYING burn/HISTORY burn/README README.genindex
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%config(noreplace) %{configdir}/plugins/%{pname}/
%{plugindir}/bin/burn-buffers
%{plugindir}/bin/genindex
%{plugindir}/bin/vdrburn-archive.sh
%{plugindir}/bin/vdrburn-dvd.sh
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%defattr(-,%{vdruser},root)
%config(noreplace) %{vardir}/burn/
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.0-0.9.pre21.2
- rebuild
* Sat Dec 1 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.8.pre21.2
- Use /dev/dvdrw as the default writer device, udev >= 115 no longer creates
/dev/dvdwriter.
- Drop old gd-devel missing dependency workaround.
* Wed Aug 22 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.8.pre21
- Use DejaVu LGC fonts instead of Bitstream Vera.
- Improve comments in burn.conf.
- License: GPL+ and GPLv2+
* Sun Jan 7 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.7.pre21
- Rebuild for VDR 1.4.5.
* Tue Dec 12 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.6.pre21
- 0.1.0-pre21, include private copy of genindex (0.1.3) for now.
* Sat Nov 4 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-16
- Rebuild for VDR 1.4.4.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sat Sep 23 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-14
- Rebuild for VDR 1.4.3.
* Sun Aug 6 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-13
- Rebuild for VDR 1.4.1-3.
* Sun Jun 11 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-12
- Rebuild for VDR 1.4.1.
* Sun Apr 30 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-11
- Rebuild for VDR 1.4.0.
* Mon Apr 17 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-10
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.
* Sun Mar 26 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-9
- Rebuild for VDR 1.3.45.
* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.0.009-8
- drop 0.lvn
* Wed Mar 1 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.8
- Decrease default DVD size to 4420 to accommodate more requant inaccuracy.
- 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.0.009-0.lvn.7
- Rebuild for VDR 1.3.43.
* Sun Feb 5 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.6
- Rebuild for VDR 1.3.42.
* Sun Jan 22 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.5
- Rebuild for VDR 1.3.40.
* Sun Jan 15 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.4
- Rebuild for VDR 1.3.39.
* Sun Jan 8 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.3
- Rebuild for VDR 1.3.38.
* Sat Dec 31 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.2
- Q'n'd fix for ISO creation with recordings whose title contain "/".
- Fix storing of the "clean up after # jobs" configuration option.
- Don't chmod everything in results to 0777 in author only mode.
- Use tcmplex-panteltje by default again.
- Translation improvements.
- Fix up some paths in README.
- Ship TODO.
* Sun Nov 13 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.1
- 0.0.009 + Finnish translations from Rolf Ahrenberg, config patch
applied upstream.
* Sat Nov 12 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.007-0.lvn.1
- 0.0.007, endstatus and burndefault patches applied/obsoleted upstream.
* Sun Nov 6 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6k-0.lvn.2
- Rebuild for VDR 1.3.36.
* Tue Nov 1 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6k-0.lvn.1
- 0.0.6k, commands and VDR >= 1.3.25 patches applied upstream.
- Improve default burn settings.
- Fix burn status at end when not verifying.
* Mon Oct 3 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.8.pre3
- Rebuild for VDR 1.3.34.
* Sun Sep 25 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.7.pre3
- Rebuild for VDR 1.3.33.
* Sun Sep 11 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3
- Rebuild for VDR 1.3.32.
* Tue Aug 30 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3
- Rebuild for VDR 1.3.31.
* Sun Aug 21 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.4.pre3
- Rebuild for VDR 1.3.30.
* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.0.6g-1.lvn.3.pre3
- Redirected vdr-config invocation standard error to /dev/null
* Tue Aug 16 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.2.pre3
- Try to avoid build system problems by not using %%expand with vdr-config.
* Fri Aug 12 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3
- Update URLs.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:56:12 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:48:24 -0000 1.2
@@ -0,0 +1,3 @@
+vdr-burn-0.1.0-pre21.tgz
+genindex-0.1.3.tar.gz
+vdr-burn-cvs-subpicture-id.diff.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:56:12 -0000 1.1
+++ sources 4 Aug 2008 19:48:24 -0000 1.2
@@ -0,0 +1,3 @@
+11217a15e753b7affaf663a0446e22bb vdr-burn-0.1.0-pre21.tgz
+da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz
+18a484732c6eade746852642d882ed66 vdr-burn-cvs-subpicture-id.diff.gz
16 years, 3 months
- 1
- 0
rpms/vdr-burn/F-9 vdr-burn-0.1.0-pre21-config.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-finnish.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-gcc43.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-no-subtitles.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-utf8.patch, NONE, 1.1 vdr-burn.conf, NONE, 1.1 vdr-burn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/vdr-burn/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26661
Modified Files:
.cvsignore sources
Added Files:
vdr-burn-0.1.0-pre21-config.patch
vdr-burn-0.1.0-pre21-finnish.patch
vdr-burn-0.1.0-pre21-gcc43.patch
vdr-burn-0.1.0-pre21-no-subtitles.patch
vdr-burn-0.1.0-pre21-utf8.patch vdr-burn.conf vdr-burn.spec
Log Message:
initial import from livna
vdr-burn-0.1.0-pre21-config.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-config.patch ---
Index: Makefile
===================================================================
RCS file: /var/cvsroot/burn/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 1 Oct 2006 21:26:44 -0000 1.23
+++ Makefile 12 Dec 2006 20:31:14 -0000
@@ -81,11 +81,11 @@
endif
ifndef DVDDEV
-DVDDEV=/dev/dvd
+DVDDEV=/dev/dvdrw
endif
ifndef ISODIR
-ISODIR=/pub/export
+ISODIR=$(shell vdr-config --videodir)
endif
DEFINES += -DTMPDIR='"$(TMPDIR)"' -DDVDDEV='"$(DVDDEV)"' -DISODIR='"$(ISODIR)"'
Index: README
===================================================================
RCS file: /var/cvsroot/burn/README,v
retrieving revision 1.11
diff -u -r1.11 README
--- README 16 Sep 2006 19:37:54 -0000 1.11
+++ README 12 Dec 2006 20:31:14 -0000
@@ -92,7 +92,7 @@
3b.(optional) Change the default temporary folder, the default DVD writer device
and the default ISO directory with TMPDIR (default: /tmp),
- DVDDEV (default: /dev/dvd) and ISODIR (default: /pub/export)
+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
vdr-1.4.2 # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
Index: chain-archive.c
===================================================================
RCS file: /var/cvsroot/burn/chain-archive.c,v
retrieving revision 1.13
diff -u -r1.13 chain-archive.c
--- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13
+++ chain-archive.c 12 Dec 2006 20:31:14 -0000
@@ -64,7 +64,7 @@
bind( &recording::get_graft_point, _2 ),
" "
)));
- graftPoints = format("{0} /dvd.vdr={1}/counters/standard") % graftPoints % plugin::get_config_path();
+ graftPoints = format("{0} /dvd.vdr=/var/lib/vdr/burn/counters/standard") % graftPoints;
switch (get_job().get_store_mode()) {
case storemode_create:
Index: jobs.c
===================================================================
RCS file: /var/cvsroot/burn/jobs.c,v
retrieving revision 1.35
diff -u -r1.35 jobs.c
--- jobs.c 1 Oct 2006 21:22:27 -0000 1.35
+++ jobs.c 12 Dec 2006 20:31:14 -0000
@@ -389,7 +389,7 @@
std::string job::get_archive_id()
{
std::string archive_id = "";
- std::string counter_path = format("{0}/counters/standard") % plugin::get_config_path();
+ std::string counter_path = "/var/lib/vdr/burn/counters/standard";
std::ifstream f(counter_path.c_str());
if (!f) {
proctools::logger::error(proctools::format("couldn't read {0}") % counter_path);
Index: vdrburn-archive.sh
===================================================================
RCS file: /var/cvsroot/burn/vdrburn-archive.sh,v
retrieving revision 1.5
diff -u -r1.5 vdrburn-archive.sh
--- vdrburn-archive.sh 24 Oct 2006 17:46:27 -0000 1.5
+++ vdrburn-archive.sh 12 Dec 2006 20:31:14 -0000
@@ -43,12 +43,12 @@
;;
recordingmark)
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr"
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr"
;;
archivemark)
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
*)
Index: vdrburn-dvd.sh
===================================================================
RCS file: /var/cvsroot/burn/vdrburn-dvd.sh,v
retrieving revision 1.23
diff -u -r1.23 vdrburn-dvd.sh
--- vdrburn-dvd.sh 24 Oct 2006 17:46:27 -0000 1.23
+++ vdrburn-dvd.sh 12 Dec 2006 20:31:14 -0000
@@ -29,11 +29,11 @@
# as $MPEG_TMP_PATH)
if [ -z $JAVA_HOME ]; then
- export JAVA_HOME=/opt/j2re1.4.2
+ export JAVA_HOME=/usr/lib/jvm/jre
fi
if [ -z $PROJECTX_HOME ]; then
- export PROJECTX_HOME=/opt/ProjectX
+ export PROJECTX_HOME=/usr/share/java
fi
# Some versions of growisofs refuse to start when run with sudo, and may
@@ -61,7 +61,7 @@
CUT="-cut"
fi
- vdrsync.pl -o "$MPEG_TMP_PATH" \
+ vdrsync -o "$MPEG_TMP_PATH" \
-v-filter "burn-buffers" \
-a-filter "burn-buffers" \
-ac3-filter "burn-buffers" \
@@ -197,15 +197,15 @@
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating $RECORDING_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr"
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr"
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_PATH/dvd.vdr"
;;
archivemark)
echo "Creating $DVDAUTHOR_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
mkiso)
vdr-burn-0.1.0-pre21-finnish.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-finnish.patch ---
Index: i18n.c
===================================================================
RCS file: /var/cvsroot/burn/i18n.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- i18n.c 16 Sep 2006 18:33:36 -0000 1.38
+++ i18n.c 16 Sep 2006 22:08:38 -0000 1.39
@@ -2,7 +2,7 @@
* See the files COPYING and README for copyright information and how to reach
* the author.
*
- * $Id: i18n.c,v 1.38 2006/09/16 18:33:36 lordjaxom Exp $
+ * $Id: i18n.c,v 1.39 2006/09/16 22:08:38 lordjaxom Exp $
*/
#include "i18n.h"
@@ -322,7 +322,7 @@
"",
"",
"",
- "",
+ "(joudutaan pienentämään)",
"",
"",
"",
@@ -3260,7 +3260,7 @@
"",
"",
"",
- "Ohita tyhjä päävalikko",
+ "Ohita tyhjä nimikevalikko",
"",
"",
"",
@@ -3286,7 +3286,7 @@
"",
"",
"",
- "Tarjoa päävalikon ohitusta",
+ "Tarjoa nimikevalikon ohitusta",
"",
"",
"",
@@ -3312,7 +3312,7 @@
"",
"",
"",
- "",
+ "Tehtävän asetukset",
"",
"",
"",
@@ -3338,7 +3338,7 @@
"",
"",
"",
- "",
+ "Ohita lyhyt päävalikko",
"",
"",
"",
@@ -3364,7 +3364,7 @@
"",
"",
"",
- "",
+ "Tarjoa päävalikon ohitusta",
"",
"",
"",
vdr-burn-0.1.0-pre21-gcc43.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-gcc43.patch ---
Index: adaptor.h
===================================================================
RCS file: /var/cvsroot/burn/adaptor.h,v
retrieving revision 1.4
diff -u -r1.4 adaptor.h
--- adaptor.h 16 Sep 2006 18:33:36 -0000 1.4
+++ adaptor.h 8 Apr 2008 18:40:42 -0000
@@ -8,6 +8,7 @@
#ifndef VDR_BURN_ADAPTOR_H
#define VDR_BURN_ADAPTOR_H
+#include <algorithm>
#include <iterator>
#include <vdr/epg.h>
#include <vdr/tools.h>
Index: filter.h
===================================================================
RCS file: /var/cvsroot/burn/filter.h,v
retrieving revision 1.5
diff -u -r1.5 filter.h
--- filter.h 16 Sep 2006 18:33:36 -0000 1.5
+++ filter.h 8 Apr 2008 18:40:42 -0000
@@ -9,6 +9,7 @@
#define VDR_BURN_FILTER_H
#include "common.h"
+#include <algorithm>
#include <iterator>
namespace vdr_burn
Index: iconvwrapper.c
===================================================================
RCS file: /var/cvsroot/burn/iconvwrapper.c,v
retrieving revision 1.3
diff -u -r1.3 iconvwrapper.c
--- iconvwrapper.c 16 Sep 2006 18:33:36 -0000 1.3
+++ iconvwrapper.c 8 Apr 2008 18:40:42 -0000
@@ -7,6 +7,8 @@
#include "iconvwrapper.h"
#include <cerrno>
+#include <cstdlib>
+#include <cstring>
#include <sstream>
namespace iconvwrapper
Index: menuitems.h
===================================================================
RCS file: /var/cvsroot/burn/menuitems.h,v
retrieving revision 1.15
diff -u -r1.15 menuitems.h
--- menuitems.h 19 Sep 2006 18:51:35 -0000 1.15
+++ menuitems.h 8 Apr 2008 18:40:42 -0000
@@ -14,6 +14,7 @@
#include "tracks.h"
#include <algorithm>
#include <iterator>
+#include <limits>
#include <numeric>
#include <memory>
#include <string>
Index: proctools/logger.cc
===================================================================
RCS file: /var/cvsroot/burn/proctools/logger.cc,v
retrieving revision 1.3
diff -u -r1.3 logger.cc
--- proctools/logger.cc 16 Sep 2006 18:33:38 -0000 1.3
+++ proctools/logger.cc 8 Apr 2008 18:40:42 -0000
@@ -6,6 +6,7 @@
#include <sstream>
#include <algorithm>
#include <cerrno>
+#include <cstring>
namespace proctools
{
vdr-burn-0.1.0-pre21-no-subtitles.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-no-subtitles.patch ---
diff -up burn-0.1.0-pre21/burn/ProjectX.ini~ burn-0.1.0-pre21/burn/ProjectX.ini
--- burn-0.1.0-pre21/burn/ProjectX.ini~ 2006-08-18 23:27:52.000000000 +0300
+++ burn-0.1.0-pre21/burn/ProjectX.ini 2008-04-22 20:10:59.000000000 +0300
@@ -1,3 +1,6 @@
+# ExportPanel
+ExportPanel.Streamtype.Subpicture=0
+
# ExternPanel
ExternPanel.renameAudio=1
ExternPanel.renameVideo=1
vdr-burn-0.1.0-pre21-utf8.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-utf8.patch ---
diff -up burn-0.1.0-pre21/burn.c~ burn-0.1.0-pre21/burn.c
--- burn-0.1.0-pre21/burn.c~ 2006-09-16 21:33:36.000000000 +0300
+++ burn-0.1.0-pre21/burn.c 2008-04-22 21:38:55.000000000 +0300
@@ -45,8 +45,8 @@ namespace vdr_burn
string plugin::get_character_encoding()
{
-#ifdef UTF8PATCH
- return "utf8";
+#if VDRVERSNUM >= 10510 || defined(UTF8PATCH)
+ return "utf-8";
#else
return tr("iso8859-15");
#endif
--- NEW FILE vdr-burn.conf ---
# Configuration snippet for vdr-burn -*- sh -*-
#
# Add command line options to pass to the burn plugin to PLUGIN_OPTIONS.
# See /usr/share/doc/vdr-burn-*/README and "vdr --help" for info about
# available options for this plugin.
PLUGIN_OPTIONS="-d /tmp"
--- NEW FILE vdr-burn.spec ---
# TODO: disksize 4420? 4462 was too big sometimes with 0.0.x
%define pname burn
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR)
%define vdruser %(vdr-config --user 2>/dev/null || echo ERROR)
%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define pre pre21
%define gver 0.1.3
Name: vdr-%{pname}
Version: 0.1.0
Release: 0.14.%{pre}%{?dist}
Summary: DVD writing plugin for VDR
Group: Applications/Multimedia
# genindex is GPLv2+, rest GPL+
License: GPL+ and GPLv2+
URL: http://www.xeatre.tv/community/burn/
Source0: http://linux.kompiliert.net/contrib/%{name}-%{version}-%{pre}.tgz
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
Patch0: %{name}-0.1.0-pre21-config.patch
Patch1: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-burn-cvs-subpicture-id...
Patch2: %{name}-0.1.0-pre21-finnish.patch
Patch3: %{name}-0.1.0-pre21-gcc43.patch
Patch4: %{name}-0.1.0-pre21-no-subtitles.patch
Patch5: %{name}-0.1.0-pre21-utf8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.3.47
BuildRequires: boost-devel
BuildRequires: gd-devel >= 2.0.33-9.3
Requires: vdr(abi) = %{apiver}
Requires: vdrsync
Requires: m2vrequantiser
Requires: dvdauthor
Requires: mjpegtools
Requires: dvd+rw-tools
Requires: dejavu-lgc-fonts >= 2.21
%description
This plugin enables VDR to write compliant DVDs from VDR recordings
while being able to control the process and to watch progress from
inside VDRs on-screen-display. If the selected recordings don't fit
the DVD, the video tracks are requantized (shrinked) automatically.
The created menus support multipage descriptions (in case the
recording summary exceeds one page).
%prep
%setup -q -c -a 2
cd burn
find -name CVS | xargs rm -rf
chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
%patch0
%patch1
%patch2
%patch3 -p0
if pkg-config --atleast-version 1.5.10 vdr ; then
# Disable subtitles by default for now with 1.6.x, demux problems
%patch4 -p1
fi
%patch5 -p1
sed -i -e 's|/var/lib/vdr/|%{vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
cd ../genindex-%{gver}
sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile
f=README ; iconv -f iso-8859-1 -t utf-8 -o ../README.genindex $f
cd ..
%build
make -C burn %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
make -C genindex-%{gver} %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
install -pm 755 burn/libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 755 burn/*.sh burn/burn-buffers genindex-%{gver}/genindex \
$RPM_BUILD_ROOT%{plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/burn/skins
cp -pR burn/burn/* $RPM_BUILD_ROOT%{configdir}/plugins/burn
rm -rf $RPM_BUILD_ROOT%{configdir}/plugins/burn/{counters,fonts/*}
ln -s %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf \
$RPM_BUILD_ROOT%{configdir}/plugins/burn/fonts/
install -Dpm 644 burn/burn/counters/standard \
$RPM_BUILD_ROOT%{vardir}/burn/counters/standard
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
%{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \
%{configdir}/reccmds.conf >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)
%doc burn/COPYING burn/HISTORY burn/README README.genindex
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%config(noreplace) %{configdir}/plugins/%{pname}/
%{plugindir}/bin/burn-buffers
%{plugindir}/bin/genindex
%{plugindir}/bin/vdrburn-archive.sh
%{plugindir}/bin/vdrburn-dvd.sh
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%defattr(-,%{vdruser},root)
%config(noreplace) %{vardir}/burn/
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.0-0.14.pre21
- rebuild
* Tue Apr 22 2008 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.13.pre21
- Use UTF-8 with VDR 1.6.x.
- Disable subtitles with VDR 1.6.x and ProjectX by default (demux problems).
* Tue Apr 8 2008 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.12.pre21
- Patch to fix build with GCC 4.3's cleaned up C++ headers.
* Tue Apr 8 2008 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.11.pre21
- Rebuild for VDR 1.6.0.
* Sat Dec 1 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.10.pre21
- Use /dev/dvdrw as the default writer device, udev >= 115 no longer creates
/dev/dvdwriter.
* Sun Nov 18 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.9.pre21
- Adjust font paths for dejavu-lgc-fonts 2.21+.
- Drop old gd-devel missing dependency workaround.
* Wed Aug 22 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.8.pre21
- Use DejaVu LGC fonts instead of Bitstream Vera.
- Improve comments in burn.conf.
- License: GPL+ and GPLv2+
* Sun Jan 7 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.7.pre21
- Rebuild for VDR 1.4.5.
* Tue Dec 12 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.6.pre21
- 0.1.0-pre21, include private copy of genindex (0.1.3) for now.
* Sat Nov 4 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-16
- Rebuild for VDR 1.4.4.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sat Sep 23 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-14
- Rebuild for VDR 1.4.3.
* Sun Aug 6 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-13
- Rebuild for VDR 1.4.1-3.
* Sun Jun 11 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-12
- Rebuild for VDR 1.4.1.
* Sun Apr 30 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-11
- Rebuild for VDR 1.4.0.
* Mon Apr 17 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-10
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.
* Sun Mar 26 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-9
- Rebuild for VDR 1.3.45.
* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.0.009-8
- drop 0.lvn
* Wed Mar 1 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.8
- Decrease default DVD size to 4420 to accommodate more requant inaccuracy.
- 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.0.009-0.lvn.7
- Rebuild for VDR 1.3.43.
* Sun Feb 5 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.6
- Rebuild for VDR 1.3.42.
* Sun Jan 22 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.5
- Rebuild for VDR 1.3.40.
* Sun Jan 15 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.4
- Rebuild for VDR 1.3.39.
* Sun Jan 8 2006 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.3
- Rebuild for VDR 1.3.38.
* Sat Dec 31 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.2
- Q'n'd fix for ISO creation with recordings whose title contain "/".
- Fix storing of the "clean up after # jobs" configuration option.
- Don't chmod everything in results to 0777 in author only mode.
- Use tcmplex-panteltje by default again.
- Translation improvements.
- Fix up some paths in README.
- Ship TODO.
* Sun Nov 13 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.009-0.lvn.1
- 0.0.009 + Finnish translations from Rolf Ahrenberg, config patch
applied upstream.
* Sat Nov 12 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.007-0.lvn.1
- 0.0.007, endstatus and burndefault patches applied/obsoleted upstream.
* Sun Nov 6 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6k-0.lvn.2
- Rebuild for VDR 1.3.36.
* Tue Nov 1 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6k-0.lvn.1
- 0.0.6k, commands and VDR >= 1.3.25 patches applied upstream.
- Improve default burn settings.
- Fix burn status at end when not verifying.
* Mon Oct 3 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.8.pre3
- Rebuild for VDR 1.3.34.
* Sun Sep 25 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.7.pre3
- Rebuild for VDR 1.3.33.
* Sun Sep 11 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3
- Rebuild for VDR 1.3.32.
* Tue Aug 30 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3
- Rebuild for VDR 1.3.31.
* Sun Aug 21 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.4.pre3
- Rebuild for VDR 1.3.30.
* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.0.6g-1.lvn.3.pre3
- Redirected vdr-config invocation standard error to /dev/null
* Tue Aug 16 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.2.pre3
- Try to avoid build system problems by not using %%expand with vdr-config.
* Fri Aug 12 2005 Ville SkyttÀ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3
- Update URLs.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:56:12 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:47:10 -0000 1.2
@@ -0,0 +1,3 @@
+genindex-0.1.3.tar.gz
+vdr-burn-0.1.0-pre21.tgz
+vdr-burn-cvs-subpicture-id.diff.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:56:12 -0000 1.1
+++ sources 4 Aug 2008 19:47:10 -0000 1.2
@@ -0,0 +1,3 @@
+da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz
+11217a15e753b7affaf663a0446e22bb vdr-burn-0.1.0-pre21.tgz
+18a484732c6eade746852642d882ed66 vdr-burn-cvs-subpicture-id.diff.gz
16 years, 3 months
- 1
- 0
rpms/xrick/devel xrick-rpmoptflags-makefile.patch, NONE, 1.1 xrick.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/xrick/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26509
Modified Files:
.cvsignore sources
Added Files:
xrick-rpmoptflags-makefile.patch xrick.spec
Log Message:
initial import from livna
xrick-rpmoptflags-makefile.patch:
--- NEW FILE xrick-rpmoptflags-makefile.patch ---
diff -Naur xrick-021212-orig/Makefile xrick-021212/Makefile
--- xrick-021212-orig/Makefile 2002-12-24 17:58:26.000000000 +0100
+++ xrick-021212/Makefile 2003-05-13 17:53:14.000000000 +0200
@@ -71,7 +71,7 @@
all:
@echo "ROOTDIR=$(ROOTDIR)" > Makefile.global
@echo "XOBJ=$(XOBJ)" >> Makefile.global
- @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global
+ @echo "CFLAGS=$(RPM_OPT_FLAGS) -ansi -pedantic -Wall -W -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global
@echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global
@echo "CC=gcc" >> Makefile.global
@echo "CPP=gcc -E" >> Makefile.global
--- NEW FILE xrick.spec ---
%define tarversion 021212
Summary: A clone of the game Rick Dangerous
Name: xrick
Version: 0.0
Release: 0.7.%{tarversion}%{?dist}
License: Distributable
Group: Amusements/Games
URL: http://www.bigorno.net/xrick/
Source0: http://www.bigorno.net/xrick/%{name}-%{tarversion}.tgz
Patch1: xrick-rpmoptflags-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel zlib-devel desktop-file-utils ImageMagick
Requires: hicolor-icon-theme
#---------------------------------------------------------------------
%description
xrick is a clone of Rick Dangerous. Written entirely in C, it relies
on the Simple DirectMedia Layer library and has been ported to Linux
(its primary target). Way before Lara Croft, back in the 1980's and
early 1990's, Rick Dangerous was the Indiana Jones of computer games,
running away from rolling rocks and avoiding traps in places from
South America to a futuristic missile base via Egypt and the
Schwarzendumpf castle.
#---------------------------------------------------------------------
%prep
%setup -q -n %{name}-%{tarversion}
%patch1 -p1
sed -i 's:data.zip:%{_datadir}/%{name}/data.zip:g' src/xrick.c
# make xrick manpage UTF8
gunzip xrick.6.gz
iconv -f ISO-8859-1 -t UTF8 xrick.6 > xrick.6.tmp
mv xrick.6.tmp xrick.6
#---------------------------------------------------------------------
%build
make %{?_smp_mflags}
convert src/xrickST.ico xrickST.png
#---------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6
install -m 0755 xrick $RPM_BUILD_ROOT/%{_bindir}
install -m 0644 data.zip $RPM_BUILD_ROOT/%{_datadir}/%{name}
install -m 0644 xrick.6 $RPM_BUILD_ROOT/%{_mandir}/man6
cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=X Rick
Comment=A "Rick Dangerous" Clone.
Exec=%{name} -fullscreen
Icon=xrickST.png
Terminal=false
Type=Application
Categories=Game;ActionGame;
EOF
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 xrickST.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
#---------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
#---------------------------------------------------------------------
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
#---------------------------------------------------------------------
%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_datadir}/icons/hicolor/32x32/apps/xrickST.png
#---------------------------------------------------------------------
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.0-0.7.021212
- rebuild
* Fri Sep 28 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.0-0.6.021212
- install data files under /usr/share/xrick instead of /usr/share/games/xrick
- install icon into the fdo /usr/share/icons dir instead of /usr/share/pixmap
- make the manpage UTF-8
- start fullscreen
* Sat Mar 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.0-0.5.021212
- fix release
- remove epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Aug 5 2003 Dams <anvil[AT]livna.org> 0:0.0-0.fdr.4.021212
- using convert at build time to do ico->png conversion
* Thu Jul 17 2003 Dams <anvil[AT]livna.org> 0:0.0-0.fdr.3.021212
- Added icon for menu
* Wed Jun 18 2003 Dams <anvil[AT]livna.org> 0:0.0-0.fdr.2.0212120
- Desktop entry : oops !! Sorry.
* Tue Jun 17 2003 Dams <anvil[AT]livna.org> 0:0.0-0.fdr.1.0212120
- Modified Summary
- Package now own datadir/games/xrick directory
* Mon May 19 2003 Dams <anvil[AT]livna.org> 0:021212-0.fdr.4
- Added a desktop entry. BuildRequires desktop-file-utils.
- Modified the patch to keep ansi/pedantic and other gcc warning flags
* Tue May 13 2003 Dams <anvil[AT]livna.org> 0:021212-0.fdr.3
- Patch to accept RPM_OPT_FLAGS from Michael Schwendt
* Tue May 13 2003 Dams <anvil[AT]livna.org> 0:021212-0.fdr.2
- buildroot -> RPM_BUILD_ROOT
- Modified Source0
* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xrick/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:41:29 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:44:21 -0000 1.2
@@ -0,0 +1 @@
+xrick-021212.tgz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xrick/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:41:29 -0000 1.1
+++ sources 4 Aug 2008 19:44:21 -0000 1.2
@@ -0,0 +1 @@
+615190051481266710cb43ecd1fe930c xrick-021212.tgz
16 years, 3 months
- 1
- 0
rpms/Cg/devel Cg.spec,NONE,1.1 .cvsignore,1.1,1.2 sources,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/Cg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26050
Modified Files:
.cvsignore sources
Added Files:
Cg.spec
Log Message:
initial import from livna
--- NEW FILE Cg.spec ---
%define maj_version 2.0
%define min_version 0015
%define date May2008
# No debuginfo
%define debug_package %{nil}
%ifarch x86_64
%define priority 10
%else
%define priority 5
%endif
Summary: NVIDIA Cg Toolkit
Name: Cg
Version: %{maj_version}.%{min_version}
Release: 2
URL: http://developer.nvidia.com/object/cg_toolkit.html
Group: Development/Languages
Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
License: Redistributable, no modification permitted
ExclusiveArch: i386 x86_64
Requires: lib%{name}(%{_target_cpu}) = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
%description
The Cg Toolkit provides a compiler for the Cg language, runtime
libraries for use with both leading graphics APIs, runtime libraries for
CgFX, example applications, and extensive documentation. Supporting over
20 different OpenGL and DirectX profile targets, Cg will allow you to
incorporate stunning interactive effects into your 3D applications.
%package docs
Summary: NVIDIA Cg Toolkit documentation
Group: Documentation
%description docs
NVIDIA Cg Toolkit documentation.
%package -n lib%{name}
Summary: NVIDIA Cg Toolkit shared support library
Group: System Environment/Libraries
Provides: lib%{name}(%{_target_cpu}) = %{version}-%{release}
%description -n lib%{name}
This package contains Cg shared support library.
%prep
%ifarch i386
%setup -q -c %{name}-%{version}
%endif
%ifarch x86_64
%setup -q -c %{name}-%{version} -D -T -a 1
%endif
# Tweak to have debuginfo - part 2/2
%if "%fedora" > "7"
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
%build
# Nothing to build
echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_mandir}}
cp -pr usr/bin/* $RPM_BUILD_ROOT%{_bindir}/
cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir}/
cp -pr .%{_libdir}/* $RPM_BUILD_ROOT%{_libdir}/
cp -pr usr/share/man/* $RPM_BUILD_ROOT%{_mandir}/
mv $RPM_BUILD_ROOT%{_bindir}/cgc $RPM_BUILD_ROOT%{_bindir}/cgc-%{_lib}
# Owernship of the alternative provides
touch $RPM_BUILD_ROOT%{_bindir}/cgc
%clean
rm -rf $RPM_BUILD_ROOT
%post
/usr/sbin/alternatives --install %{_bindir}/cgc cgc %{_bindir}/cgc-%{_lib} %{priority} || :
%preun
if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove cgc %{_bindir}/cgc-%{_lib} || :
fi
%post -n libCg -p /sbin/ldconfig
%postun -n libCg -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
%doc usr/local/Cg/docs/Cg_Redist_License.pdf
%ghost %{_bindir}/cgc
%attr(755,root,root) %{_bindir}/cgc-%{_lib}
%{_includedir}/Cg/
%{_mandir}/man*/*
%files docs
%defattr(644,root,root,755)
%doc usr/local/Cg/docs usr/local/Cg/examples usr/local/Cg/include
%files -n libCg
%{_libdir}/*.so
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.0.0015-2
- rebuild
* Sun May 18 2008 kwizart < kwizart at gmail.com > - 2.0.0015-1
- Update to 2.0.0015 (May2008)
- No debuginfo anymore
* Sat May 10 2008 kwizart < kwizart at gmail.com > - 2.0.0012-2
- Ghost to have the owenrship of the alternative provides.
* Sat Feb 16 2008 kwizart < kwizart at gmail.com > - 2.0.0012-1
- Update to Jan2008
- Tweak to have debuginfo
- Add alternatives to choose between cgc x86 or x86_64
* Thu Jan 3 2008 kwizart < kwizart at gmail.com > - 2.0.0010-1
- Update to 2.0.0010 (Dec2007)
* Thu Nov 29 2007 kwizart < kwizart at gmail.com > - 1.5.0023-1
- Update to 1.5.0023 (Sep2007)
* Tue Jul 24 2007 Dominik Mierzejewski <rpm(a)greysector.net> 1.5-1
- updated to 1.5
- split off docs
- call ldconfig for libCg
- per-arch Requires:
* Mon May 22 2006 Dominik Mierzejewski <rpm(a)greysector.net> 1.4.1-1
- initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 May 2008 17:52:27 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:40:37 -0000 1.2
@@ -0,0 +1,2 @@
+Cg-2.0_May2008_x86_64.tgz
+Cg-2.0_May2008_x86.tgz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 May 2008 17:52:27 -0000 1.1
+++ sources 4 Aug 2008 19:40:37 -0000 1.2
@@ -0,0 +1,2 @@
+f0923e9fe9c0e0f1b1f49e9069c59815 Cg-2.0_May2008_x86_64.tgz
+311069e73186b3a7837d35df08b714c8 Cg-2.0_May2008_x86.tgz
16 years, 3 months
- 1
- 0
rpms/mp3gain/devel README.method, NONE, 1.1 mp3gain-cflags.patch, NONE, 1.1 mp3gain-exit.patch, NONE, 1.1 mp3gain-tempfile-default.patch, NONE, 1.1 mp3gain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/mp3gain/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24325
Modified Files:
.cvsignore sources
Added Files:
README.method mp3gain-cflags.patch mp3gain-exit.patch
mp3gain-tempfile-default.patch mp3gain.spec
Log Message:
initial import from livna
--- NEW FILE README.method ---
Q: What dB value does mp3gain normalize to? How does this compare with
normalize-audio?
A: mp3gain and normalize-audio use different methods to determine the
perceived volume of a file, so the numbers are not comparable. As I understand
it, normalize-audio applies a smoothing filter and then sets the maximum to
-12dBFS. mp3gain sorts the volume and then uses the value at 95% (i.e. 5% of
the file are louder, 95% are quieter). This value is set to -20dBFS. I have
tried a few files and found the difference in the recomended values to vary
between 3dB and 6dB.
The method mp3gain uses to determine the perceived volume is described at
http://www.replaygain.org/.
Q: Why are the files not exactly at the same volume?
A: Since mp3gain changes the global gain value in every mp3 frame, it can only
use 1.5dB steps for adjusting the volume. It will however write replaygain
values to tags with finer accuracy than these 1.5dB steps.
mp3gain-cflags.patch:
--- NEW FILE mp3gain-cflags.patch ---
diff -ur mp3gain-1_4_6-src.zip_FILES.OLD/Makefile mp3gain-1_4_6-src.zip_FILES/Makefile
--- mp3gain-1_4_6-src.zip_FILES.OLD/Makefile 2004-04-03 02:24:36.000000000 -0500
+++ mp3gain-1_4_6-src.zip_FILES/Makefile 2006-11-26 13:10:09.000000000 -0500
@@ -6,7 +6,7 @@
CC= gcc
-CFLAGS= -Wall -O3 -DHAVE_MEMCPY
+CFLAGS= $(RPM_OPT_FLAGS) -DHAVE_MEMCPY
ifneq ($(OSTYPE),beos)
INSTALL_PATH= /usr/local/bin
mp3gain-exit.patch:
--- NEW FILE mp3gain-exit.patch ---
diff -ur mp3gain-1_4_6-src.zip_FILES.OLD/gain_analysis.c mp3gain-1_4_6-src.zip_FILES/gain_analysis.c
--- mp3gain-1_4_6-src.zip_FILES.OLD/gain_analysis.c 2004-04-03 02:24:36.000000000 -0500
+++ mp3gain-1_4_6-src.zip_FILES/gain_analysis.c 2006-11-20 17:10:06.000000000 -0500
@@ -111,7 +111,7 @@
#define MAX_dB 120. // Table entries for 0...MAX_dB (normal max. values are 70...80 dB)
#define MAX_ORDER (BUTTER_ORDER > YULE_ORDER ? BUTTER_ORDER : YULE_ORDER)
-#define MAX_SAMPLES_PER_WINDOW (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME) // max. Samples per Time slice
+#define MAX_SAMPLES_PER_WINDOW (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME +1) // max. Samples per Time slice
#define PINK_REF 64.82 //298640883795 // calibration value
Float_t linprebuf [MAX_ORDER * 2];
diff -ur mp3gain-1_4_6-src.zip_FILES.OLD/mpglibDBL/common.c mp3gain-1_4_6-src.zip_FILES/mpglibDBL/common.c
--- mp3gain-1_4_6-src.zip_FILES.OLD/mpglibDBL/common.c 2003-08-11 17:02:56.000000000 -0400
+++ mp3gain-1_4_6-src.zip_FILES/mpglibDBL/common.c 2006-11-20 17:12:10.000000000 -0500
@@ -160,7 +160,7 @@
fprintf(stderr,"Stream error\n");
fclose(stdout);
fclose(stderr);
- exit(0);
+ exit(EXIT_FAILURE);
}
if(fr->mpeg25) {
fr->sampling_frequency = 6 + ((newhead>>10)&0x3);
diff -ur mp3gain-1_4_6-src.zip_FILES.OLD/mpglibDBL/interface.c mp3gain-1_4_6-src.zip_FILES/mpglibDBL/interface.c
--- mp3gain-1_4_6-src.zip_FILES.OLD/mpglibDBL/interface.c 2004-03-22 14:29:16.000000000 -0500
+++ mp3gain-1_4_6-src.zip_FILES/mpglibDBL/interface.c 2006-11-20 17:11:35.000000000 -0500
@@ -137,7 +137,7 @@
fprintf(stderr,"Fatal error! tried to read past mp buffer\n");
fclose(stdout);
fclose(stderr);
- exit(0);
+ exit(EXIT_FAILURE);
}
pos = mp->tail->pos;
}
mp3gain-tempfile-default.patch:
--- NEW FILE mp3gain-tempfile-default.patch ---
diff -ur mp3gain-1_4_6-src.zip_FILES.OLD/mp3gain.c mp3gain-1_4_6-src.zip_FILES/mp3gain.c
--- mp3gain-1_4_6-src.zip_FILES.OLD/mp3gain.c 2004-12-23 15:47:04.000000000 -0500
+++ mp3gain-1_4_6-src.zip_FILES/mp3gain.c 2006-11-20 17:14:03.000000000 -0500
@@ -42,7 +42,11 @@
* out there will have come up with superior versions already...
*
* So have fun dissecting.
- */
+ */
+
+/* stf: make -t the default
+ * -T restores old behaviour
+ */
#include <stdio.h>
#include <stdlib.h>
@@ -117,8 +121,8 @@
unsigned char buffer[BUFFERSIZE];
int writeself = 0;
-int QuietMode = 0;
-int UsingTemp = 0;
+int QuietMode = 0;
+int UsingTemp = 1;
int NowWriting = 0;
double lastfreq = -1.0;
@@ -701,7 +705,8 @@
fclose(inf);
inf = NULL;
passError(MP3GAIN_UNSPECIFED_ERROR, 3,
- "\nCan't open ", outfilename, " for temp writing\n");
+ "\nCan't open ", outfilename, " for temp writing\n");
+ NowWriting = 0;
return M3G_ERR_CANT_MAKE_TMP;
}
@@ -715,7 +720,8 @@
if (UsingTemp && (outf != NULL))
fclose(outf);
passError( MP3GAIN_UNSPECIFED_ERROR, 3,
- "\nCan't open ", filename, " for modifying\n");
+ "\nCan't open ", filename, " for modifying\n");
+ NowWriting = 0;
return M3G_ERR_CANT_MODIFY_FILE;
}
else {
@@ -926,7 +932,8 @@
passError(MP3GAIN_CANCELLED,3,"Cancelled processing.\n", filename, " is probably corrupted now.");
}
if (saveTime)
- fileTime(filename, setStoredTime);
+ fileTime(filename, setStoredTime);
+ NowWriting = 0;
return;
}
#endif
@@ -995,8 +1002,9 @@
if (outlength != inlength) {
deleteFile(outfilename);
passError( MP3GAIN_UNSPECIFED_ERROR, 3,
- "Not enough temp space on disk to modify ", filename,
- "\nEither free some space, or do not use \"temp file\" option\n");
+ "Not enough temp space on disk to modify ", filename,
+ "\nEither free some space, or switch off \"temp file\" option with -T\n");
+ NowWriting = 0;
return M3G_ERR_NOT_ENOUGH_TMP_SPACE;
}
else {
@@ -1004,7 +1012,8 @@
if (deleteFile(filename)) {
deleteFile(outfilename); //try to delete tmp file
passError( MP3GAIN_UNSPECIFED_ERROR, 3,
- "Can't open ", filename, " for modifying\n");
+ "Can't open ", filename, " for modifying\n");
+ NowWriting = 0;
return M3G_ERR_CANT_MODIFY_FILE;
}
if (moveFile(outfilename, filename)) {
@@ -1012,7 +1021,8 @@
"Problem re-naming ", outfilename, " to ", filename,
"\nThe mp3 was correctly modified, but you will need to re-name ",
outfilename, " to ", filename,
- " yourself.\n");
+ " yourself.\n");
+ NowWriting = 0;
return M3G_ERR_RENAME_TMP;
};
if (saveTime)
@@ -1214,9 +1224,10 @@
fprintf(stderr,"\t%cm <i> - modify suggested MP3 gain by integer i\n",SWITCH_CHAR);
fprintf(stderr,"\t%cd <n> - modify suggested dB gain by floating-point n\n",SWITCH_CHAR);
fprintf(stderr,"\t%cc - ignore clipping warning when applying gain\n",SWITCH_CHAR);
- fprintf(stderr,"\t%co - output is a database-friendly tab-delimited list\n",SWITCH_CHAR);
- fprintf(stderr,"\t%ct - mp3gain writes modified mp3 to temp file, then deletes original\n",SWITCH_CHAR);
- fprintf(stderr,"\t instead of modifying bytes in original file\n");
+ fprintf(stderr,"\t%co - output is a database-friendly tab-delimited list\n",SWITCH_CHAR);
+ fprintf(stderr,"\t%ct - mp3gain writes modified mp3 to temp file, then deletes original \n",SWITCH_CHAR);
++ fprintf(stderr,"\t instead of modifying bytes in original file (default)\n");
++ fprintf(stderr,"\t%cT - mp3gain directly modifies mp3 file (opposite of %ct)\n",SWITCH_CHAR,SWITCH_CHAR);
fprintf(stderr,"\t%cq - Quiet mode: no status messages\n",SWITCH_CHAR);
fprintf(stderr,"\t%cp - Preserve original file timestamp\n",SWITCH_CHAR);
fprintf(stderr,"\t%cx - Only find max. amplitude of mp3\n",SWITCH_CHAR);
@@ -1505,9 +1516,12 @@
break;
- case 't':
- case 'T':
+ case 't':
UsingTemp = !0;
+ break;
+
+ case 'T':
+ UsingTemp = 0;
break;
case 'u':
--- NEW FILE mp3gain.spec ---
%define tarball_version 1_4_6
Name: mp3gain
Version: 1.4.6
Release: 5%{?dist}
Summary: Lossless MP3 volume adjustment tool
Group: Applications/Multimedia
License: LGPL
URL: http://mp3gain.sourceforge.net
Source0: http://osdn.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{tarball_vers...
Source1: %{name}.1.gz
Source2: README.method
Patch0: %{name}-tempfile-default.patch
Patch1: %{name}-exit.patch
Patch2: %{name}-cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
MP3Gain analyzes and adjusts mp3 files so that they have the same
volume. It does not just do peak normalization, as many normalizers
do. Instead, it does some statistical analysis to determine how loud
the file actually sounds to the human ear. Also, the changes MP3Gain
makes are completely lossless. There is no quality lost in the change
because the program adjusts the mp3 file directly, without decoding
and re-encoding.
%prep
%setup -q -c %{name}-%{tarball_version}
%patch0 -p1 -b .tempfile
%patch1 -p1 -b .exit
%patch2 -p1 -b .cflags
install -p -m 644 %{SOURCE2} .
%{__sed} -i 's/\r//' lgpl.txt
%build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
install -Dp -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1.gz
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc lgpl.txt README.method
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.4.6-5
- rebuild
* Tue Nov 28 2006 Brian Pepple <bpepple(a)fedoraproject.org> - 1.4.6-4
- Bump.
* Sun Nov 26 2006 Brian Pepple <bpepple(a)fedoraproject.org> - 1.4.6-3
- D'Oh! Add HAVE_MEMCPY back to cflag patch.
* Sun Nov 26 2006 Brian Pepple <bpepple(a)fedoraproject.org> - 1.4.6-2
- Update cflags patch to use RPM_OPT_FLAGS.
* Mon Nov 20 2006 Brian Pepple <bpepple(a)fedoraproject.org> - 1.4.6-1
- Initial Livna spec.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mp3gain/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:53:32 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:09:54 -0000 1.2
@@ -0,0 +1,2 @@
+mp3gain-1_4_6-src.zip
+mp3gain.1.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mp3gain/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:53:32 -0000 1.1
+++ sources 4 Aug 2008 19:09:54 -0000 1.2
@@ -0,0 +1,2 @@
+4327167375dce5bce97625729a95fdb9 mp3gain-1_4_6-src.zip
+be6cfa62f64a2f4c2818de9b93411525 mp3gain.1.gz
16 years, 3 months
- 1
- 0