Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at Mon Jun 8 01:55:00 CEST 2009. -------- --- vdr/vdr.changes 2008-08-19 14:12:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr/vdr.changes 2009-06-03 15:39:39.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Jun 3 15:21:32 CEST 2009 - lnussel@suse.de + +- fix build with gcc 4.4 +- add vdr maintenance patches 1 and 2 +- Provide 'vdr(abi)' instead of 'vdrapi' as Fedora does + +------------------------------------------------------------------- +Mon Mar 9 15:34:18 CET 2009 - lnussel@suse.de + +- fix build with kernel 2.6.29 + +------------------------------------------------------------------- +Fri Dec 5 12:02:52 CET 2008 - lnussel@suse.de + +- split off devel package +- create rpm macros file to simplify plugin packages + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vdr-1.6.0-1.diff vdr-1.6.0-2.diff vdr-1.6.0-const.diff vdr-1.6.0-kernel-2.6.29.diff vdr.macros ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.Y32686/_old 2009-06-08 01:54:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Y32686/_new 2009-06-08 01:54:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vdr (Version 1.6.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,13 +25,21 @@ %else BuildRequires: libcap %endif -%define vdrapiversion 1.6.0 +# +%define vdrname vdr +%define vdr_apiversion 1.6.0 +%define vdr_localedir %{_datadir}/vdr/locale +%define vdr_libdir %{_libdir}/vdr/ +%define vdr_includedir %{_includedir}/vdr +%define vdr_videodir /var/spool/video +%define vdr_sysconfdir /etc/vdr +# Url: http://www.cadsoft.de/people/kls/vdr/ License: GPL v2 or later Group: Hardware/TV PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq Version: 1.6.0 -Release: 33 +Release: 45 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr @@ -43,6 +51,7 @@ Source7: vdr-genindex.c Source8: channels.conf Source9: remote.conf +Source10: vdr.macros # generated from wiki page Source90: README.SuSE-vdr.txt Source91: README.SuSE-vdr.html @@ -50,13 +59,23 @@ Source93: vdr-fetchwikipage Source94: vdr-renderwikipage Source95: vdr-doc.desktop -Patch0: vdr-1.6.0-ncurses.diff +Patch0: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-1.diff +Patch1: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff +Patch20: vdr-1.6.0-ncurses.diff +Patch21: vdr-1.6.0-kernel-2.6.29.diff +Patch22: vdr-1.6.0-const.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: vdrapi = %vdrapiversion +Provides: vdr(abi) = %vdr_apiversion Provides: vdr-devel Requires: xorg-x11-fonts-scalable Recommends: vdr-plugins dvb +%package devel +License: GPL v2 or later +Summary: Video Disk Recorder +Group: Hardware/TV +PreReq: vdr = %version + %description Video Disk Recorder (VDR) is a digital satellite (DVB) receiver program. It can record MPEG2 streams, as well as output the stream to @@ -88,6 +107,37 @@ Benjamin Reichardt <reichard@math.uni-goettingen.de> Henning Holtschneider <hh@holtschneider.com> +%description devel +Video Disk Recorder (VDR) is a digital satellite (DVB) receiver +program. It can record MPEG2 streams, as well as output the stream to +TV. + + + +Authors: +-------- + Klaus Schmidinger <kls@cadsoft.de> + Carsten Koch <Carsten.Koch@icem.de> + Plamen Ganev <pganev@com-it.net> + Heino Goldenstein <heino.goldenstein@microplex.de> + Guido Fiala <gfiala@s.netic.de> + Robert Schneider <Robert.Schneider@lotus.com> + Niels de Carpentier <niels@casema.net> + Martin Hammerschmid <martin@hammerschmid.com> + Bastian Guse <bastian@nocopy.de> + Matthias Schniedermeyer <ms@citd.de> + Miha Setina <mihasetina@softhome.net> + Alberto Carraro <bertocar@tin.it> + Deti Fliegl <deti@fliegl.de> + Dave Chapman <dave@dchapman.com> + Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de> + Peter Hofmann <software@pxh.de> + Axel Gruber <axel@agm.de> + Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com> + J�rgen Sauer <jojo@automatix.de> + Benjamin Reichardt <reichard@math.uni-goettingen.de> + Henning Holtschneider <hh@holtschneider.com> + %prep %setup -n vdr-%{version} cp %{SOURCE1} . @@ -101,20 +151,24 @@ ### The directory environment: MANDIR = %{_mandir} BINDIR = %{_bindir} -LOCDIR = %{_datadir}/vdr/locale -VIDEODIR = /var/spool/video +LOCDIR = %{vdr_localedir} +VIDEODIR = %{vdr_videodir} REMOTE = LIRC -PLUGINLIBDIR = %{_libdir}/vdr/ +PLUGINLIBDIR = %{vdr_libdir} VDR_USER = vdr WITH_CAPABILITIES = 1 EOF # APIVERSION=`sed -ne '/define APIVERSION/s/^.*"(.*)".*$/\1/p' config.h` -if [ "%vdrapiversion" != "$APIVERSION" ]; then +if [ "%vdr_apiversion" != "$APIVERSION" ]; then echo "*** APIVERSION must be $APIVERSION, fix definition!" false fi -%patch0 +%patch0 -p1 +%patch1 -p1 +%patch20 +%patch21 -p1 +%patch22 -p1 %build #cp %{SOURCE5} README.SuSE @@ -128,34 +182,30 @@ install -d -m 755 %{buildroot}%{_mandir}/man{1,5} install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_bindir} -install -d -m 755 %{buildroot}/etc/vdr -install -d -m 755 %{buildroot}/etc/vdr/plugins -install -d -m 755 %{buildroot}/var/spool/video -install -d -m 755 %{buildroot}%{_libdir}/vdr/ -install -d -m 755 %{buildroot}%{_includedir}/vdr -install -d -m 755 %{buildroot}%{_includedir}/vdr/libsi +install -d -m 755 %{buildroot}%{vdr_sysconfdir} +install -d -m 755 %{buildroot}%{vdr_sysconfdir}/plugins +install -d -m 755 %{buildroot}%{vdr_videodir} +install -d -m 755 %{buildroot}%{vdr_libdir} +install -d -m 755 %{buildroot}%{vdr_includedir} +install -d -m 755 %{buildroot}%{vdr_includedir}/libsi make MANDIR=%{buildroot}%{_mandir} \ BINDIR=%{buildroot}%{_sbindir} \ - VIDEODIR=%{buildroot}/var/spool/video \ - PLUGINLIBDIR=%{buildroot}%{_libdir}/vdr \ - LOCDIR=%{buildroot}%{_datadir}/vdr/locale \ + VIDEODIR=%{buildroot}%{vdr_videodir} \ + PLUGINLIBDIR=%{buildroot}%{vdr_libdir} \ + LOCDIR=%{buildroot}%{vdr_localedir} \ install -#mv %{buildroot}%{_sbindir}/vdr %{buildroot}%{_sbindir}/vdr15 -#for i in %{buildroot}%{_mandir}/*/*; do -# r=${i##*/vdr}; -# mv $i ${i%%/*}/vdr15$r -#done -install -m 644 *.conf %{buildroot}/etc/vdr +# +install -m 644 *.conf %{buildroot}%{vdr_sysconfdir} for i in epg2html.pl svdrpsend.pl PLUGINS/src/sky/getskyepg.pl; do install -m 755 $i %{buildroot}%{_bindir}/${i##*/} done -install -m 644 *.h %{buildroot}%{_includedir}/vdr -install -m 644 libsi/*.h %{buildroot}%{_includedir}/vdr/libsi -install -m 644 Make.config %{buildroot}%{_includedir}/vdr -ln -s . %{buildroot}%{_includedir}/vdr/vdr -ln -s . %{buildroot}%{_includedir}/vdr/include -install -m 755 PLUGINS/lib/* %{buildroot}%{_libdir}/vdr/ -install -m 755 %{SOURCE3} %{buildroot}/etc/vdr/shutdown.sh +install -m 644 *.h %{buildroot}%{vdr_includedir} +install -m 644 libsi/*.h %{buildroot}%{vdr_includedir}/libsi +install -m 644 Make.config %{buildroot}%{vdr_includedir} +ln -s . %{buildroot}%{vdr_includedir}/vdr +ln -s . %{buildroot}%{vdr_includedir}/include +install -m 755 PLUGINS/lib/* %{buildroot}%{vdr_libdir}/ +install -m 755 %{SOURCE3} %{buildroot}%{vdr_sysconfdir}/shutdown.sh #sysconfig&init install -d -m 755 %{buildroot}/var/adm/fillup-templates install -m 644 sysconfig.vdr %{buildroot}/var/adm/fillup-templates/sysconfig.vdr @@ -169,8 +219,8 @@ cp -a PLUGINS/src/osddemo/README plugins/README.osddemo rm %{buildroot}%{_sbindir}/runvdr install -m 755 runvdr %{buildroot}%{_sbindir}/runvdr -install -m 644 %{SOURCE8} %{buildroot}/etc/vdr/channels.conf -install -m 644 %{SOURCE9} %{buildroot}/etc/vdr/remote.conf +install -m 644 %{SOURCE8} %{buildroot}%{vdr_sysconfdir}/channels.conf +install -m 644 %{SOURCE9} %{buildroot}%{vdr_sysconfdir}/remote.conf install -m 755 vdr-genindex %{buildroot}%{_bindir} # # docu @@ -183,15 +233,29 @@ install -m 644 %{SOURCE95} %{buildroot}%{_datadir}/susehelp/meta/Manuals/Productivity/vdr.desktop # locale files echo '%%defattr (644, root, root, 755)' > vdr.lang -find %{buildroot}%{_datadir}/vdr/locale -type f -printf '%%P\n' | while read f; do - echo "%%lang(${f%%%%/*}) %{_datadir}/vdr/locale/$f" +find %{buildroot}%{vdr_localedir} -type f -printf '%%P\n' | while read f; do + echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" done >> vdr.lang +# +# rpm macro file +install -d -m 755 %{buildroot}/etc/rpm +cat > %{buildroot}/etc/rpm/macros.vdr <<EOF +%%vdrname %vdrname +%%vdr_apiversion %vdr_apiversion +%%vdr_localedir %vdr_localedir +%%vdr_libdir %vdr_libdir +%%vdr_includedir %vdr_includedir +%%vdr_videodir %vdr_videodir +%%vdr_sysconfdir %vdr_sysconfdir +%%vdr_prereq vdr(abi) = %{vdr_apiversion} +EOF +cat %{SOURCE10} >> %{buildroot}/etc/rpm/macros.vdr %clean rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/useradd -r -d /var/spool/video -s /bin/false -c "Video Disk Recorder" -g video vdr 2> /dev/null || : +/usr/sbin/useradd -r -d %{vdr_videodir} -s /bin/false -c "Video Disk Recorder" -g video vdr 2> /dev/null || : %post %{fillup_and_insserv vdr} @@ -209,24 +273,37 @@ %doc COPYING INSTALL README CONTRIBUTORS HISTORY %doc MANUAL channels.conf.* PLUGINS.html plugins %doc openvt.diff -%attr(755,vdr,root) %dir /var/spool/video -%attr(755,vdr,root) %dir /etc/vdr -%dir %{_libdir}/vdr +%attr(755,vdr,root) %dir %{vdr_videodir} +%attr(755,vdr,root) %dir %{vdr_sysconfdir} +%dir %{vdr_libdir} %dir %{_datadir}/vdr -%dir %{_datadir}/vdr/locale -%dir %{_datadir}/vdr/locale/* -%dir %{_datadir}/vdr/locale/*/LC_MESSAGES -%dir %{_includedir}/vdr -%attr(-,vdr,root) %config(noreplace) /etc/vdr/* +%dir %{vdr_localedir} +%dir %{vdr_localedir}/* +%dir %{vdr_localedir}/*/LC_MESSAGES +%attr(-,vdr,root) %config(noreplace) %{vdr_sysconfdir}/* %{_sbindir}/* %{_bindir}/* -%{_libdir}/vdr/* -%{_includedir}/vdr/* +%{vdr_libdir}/* %{_mandir}/man?/* /etc/init.d/* /var/adm/fillup-templates/* +%files devel +%defattr(-,root,root) +%config /etc/rpm/macros.vdr +%dir %{vdr_includedir} +%{vdr_includedir}/* + %changelog +* Wed Jun 03 2009 lnussel@suse.de +- fix build with gcc 4.4 +- add vdr maintenance patches 1 and 2 +- Provide 'vdr(abi)' instead of 'vdrapi' as Fedora does +* Mon Mar 09 2009 lnussel@suse.de +- fix build with kernel 2.6.29 +* Fri Dec 05 2008 lnussel@suse.de +- split off devel package +- create rpm macros file to simplify plugin packages * Tue Aug 19 2008 lnussel@suse.de - set Required-Stop in init script * Sun May 04 2008 lnussel@suse.de ++++++ vdr-1.6.0-1.diff ++++++ diff -ruN vdr-1.6.0/CONTRIBUTORS vdr-1.6.0-1/CONTRIBUTORS --- vdr-1.6.0/CONTRIBUTORS 2008-03-18 18:34:00.000000000 +0100 +++ vdr-1.6.0-1/CONTRIBUTORS 2008-04-13 15:34:03.000000000 +0200 @@ -595,6 +595,8 @@ not two hex digits after the '#' for suggesting to suppress the automatic shutdown if the remote control is currently disabled + for suggesting to improve logging system time changes to avoid problems on slow + systems under heavy load Jeremy Hall <jhall@UU.NET> for fixing an incomplete initialization of the filter parameters in eit.c @@ -958,6 +960,7 @@ for making the SVDRP command LSTC list the channels with group separators if the option ':groups' is given for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet() + for fixing initializing the timer's flags in the cTimer copy constructor Olivier Jacques <jacquesolivier@hotmail.com>) for translating OSD texts to the French language @@ -1174,6 +1177,7 @@ for reporting an invalid access in the section handler when ending VDR for pointing out that cDevice::Transferring() doesn't return the right value in the early stage of channel switching + for fixing handling the counter in detection of pre 1.3.19 PS data Richard Robson <richard_robson@beeb.net> for reporting freezing replay if a timer starts while in Transfer Mode from the @@ -1506,6 +1510,7 @@ for translating OSD texts to the Estonian language for fixing a missing ',' in the Greek OSD texts for fixing a missing ',' in the Swedish OSD texts + for reporting problems with CAMs when checking the CAM status too frequently Milos Kapoun <m.kapoun@cra.cz> for suggesting to skip code table info in SI data diff -ruN vdr-1.6.0/HISTORY vdr-1.6.0-1/HISTORY --- vdr-1.6.0/HISTORY 2008-03-23 11:26:08.000000000 +0100 +++ vdr-1.6.0-1/HISTORY 2008-04-13 15:33:46.000000000 +0200 @@ -5729,3 +5729,14 @@ - Added Chinese language texts (thanks to Nan Feng). - Updated the Portuguese language texts. - Added a note about VDR_CHARSET_OVERRIDE to the INSTALL file. + +2008-04-13: Version 1.6.0-1 + +- Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard + Nissl). +- Improved logging system time changes to avoid problems on slow systems under + heavy load (suggested by Helmut Auer). +- Fixed initializing the timer's flags in the cTimer copy constructor (thanks to + Andreas Mair). +- Increased the time between checking the CAM status to 500ms to avoid problems + with some CAMs (reported by Arthur Konovalov). diff -ruN vdr-1.6.0/ci.c vdr-1.6.0-1/ci.c --- vdr-1.6.0/ci.c 2007-04-30 15:02:49.000000000 +0200 +++ vdr-1.6.0-1/ci.c 2008-04-13 15:33:32.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.c 1.48 2007/04/30 13:02:49 kls Exp $ + * $Id: ci.c 1.48.1.1 2008/04/13 13:33:32 kls Exp $ */ #include "ci.h" @@ -1525,7 +1525,7 @@ cCamSlots CamSlots; -#define MODULE_CHECK_INTERVAL 100 // ms +#define MODULE_CHECK_INTERVAL 500 // ms #define MODULE_RESET_TIMEOUT 2 // s cCamSlot::cCamSlot(cCiAdapter *CiAdapter) diff -ruN vdr-1.6.0/config.h vdr-1.6.0-1/config.h --- vdr-1.6.0/config.h 2008-03-23 11:26:10.000000000 +0100 +++ vdr-1.6.0-1/config.h 2008-04-13 13:09:42.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.310 2008/03/23 10:26:10 kls Exp $ + * $Id: config.h 1.310.1.1 2008/04/13 11:09:42 kls Exp $ */ #ifndef __CONFIG_H @@ -22,7 +22,7 @@ // VDR's own version number: -#define VDRVERSION "1.6.0" +#define VDRVERSION "1.6.0-1" #define VDRVERSNUM 10600 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff -ruN vdr-1.6.0/device.c vdr-1.6.0-1/device.c --- vdr-1.6.0/device.c 2008-03-09 11:03:34.000000000 +0100 +++ vdr-1.6.0-1/device.c 2008-04-13 13:16:00.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 1.157 2008/03/09 10:03:34 kls Exp $ + * $Id: device.c 1.157.1.1 2008/04/13 11:16:00 kls Exp $ */ #include "device.h" @@ -1273,7 +1273,7 @@ uchar SubStreamIndex = SubStreamId & 0x1F; // Compatibility mode for old VDR recordings, where 0xBD was only AC3: -pre_1_3_19_PrivateStreamDeteced: +pre_1_3_19_PrivateStreamDetected: if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) { SubStreamId = c; SubStreamType = 0x80; @@ -1314,7 +1314,8 @@ if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) { dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode - substream id = %02X", SubStreamId); ClrAvailableTracks(); - goto pre_1_3_19_PrivateStreamDeteced; + pre_1_3_19_PrivateStream = MIN_PRE_1_3_19_PRIVATESTREAM + 1; + goto pre_1_3_19_PrivateStreamDetected; } } } diff -ruN vdr-1.6.0/eit.c vdr-1.6.0-1/eit.c --- vdr-1.6.0/eit.c 2007-08-26 12:56:33.000000000 +0200 +++ vdr-1.6.0-1/eit.c 2008-04-13 13:46:38.000000000 +0200 @@ -8,7 +8,7 @@ * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>. * - * $Id: eit.c 1.126 2007/08/26 10:56:33 kls Exp $ + * $Id: eit.c 1.126.1.1 2008/04/13 11:46:38 kls Exp $ */ #include "eit.h" @@ -300,9 +300,9 @@ if (diff > 2) { mutex.Lock(); if (abs(diff - lastDiff) < 3) { - isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim); - isyslog("Local Time = %s (%ld)", *TimeToString(sattim), sattim); - if (stime(&sattim) < 0) + if (stime(&sattim) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(sattim), sattim); + else esyslog("ERROR while setting system time: %m"); } lastDiff = diff; diff -ruN vdr-1.6.0/timers.c vdr-1.6.0-1/timers.c --- vdr-1.6.0/timers.c 2008-02-16 15:47:40.000000000 +0100 +++ vdr-1.6.0-1/timers.c 2008-04-13 14:47:12.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 1.73 2008/02/16 14:47:40 kls Exp $ + * $Id: timers.c 1.73.1.1 2008/04/13 12:47:12 kls Exp $ */ #include "timers.h" @@ -92,6 +92,7 @@ channel = NULL; aux = NULL; event = NULL; + flags = tfNone; *this = Timer; } ++++++ vdr-1.6.0-2.diff ++++++ diff -ruN vdr-1.6.0-1/CONTRIBUTORS vdr-1.6.0-2/CONTRIBUTORS --- vdr-1.6.0-1/CONTRIBUTORS 2008-04-13 15:34:03.000000000 +0200 +++ vdr-1.6.0-2/CONTRIBUTORS 2008-09-06 16:46:56.000000000 +0200 @@ -1053,6 +1053,7 @@ language for fixing displaying the free disk space when entering the recordings menu where the last replayed recording was in a subdirectory, and pressing Back + for replacing the Finnish language code "smi" with "suo" Ralf Klueber <ralf.klueber@vodafone.com> for reporting a bug in cutting a recording if there is only a single editing mark @@ -1579,6 +1580,7 @@ for making housekeeping wait for a while after a replay has ended for fixing error handling in cCuttingThread::Action() for suppressing the automatic shutdown if the remote control is currently disabled + for fixing a problem with calling isyslog() from within the SignalHandler() Sven Kreiensen <svenk@kammer.uni-hannover.de> for his help in keeping 'channels.conf.terr' up to date @@ -1895,6 +1897,7 @@ for fixing cTimer::operator=() in case a cTimer variable is assigned to itself for making the list of tracks given in cStatus::SetAudioTrack() NULL terminated for fixing handling kLeft in the calls to cStatus::MsgOsdTextItem() + for fixing a possible integer overflow in GetAbsTime() Philip Prindeville <philipp_subx@redfish-solutions.com> for updates to 'sources.conf' @@ -2116,6 +2119,7 @@ for making the non-breaking space symbol be rendered as a blank for fixing a signed character used as index in cBase64Encoder::NextLine() for fixing formatting the name section in the VDR man pages + for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h Helge Lenz <h.lenz@gmx.de> for reporting a bug in setting the 'Delta' parameter when calling the shutdown @@ -2352,3 +2356,10 @@ Nan Feng <nfgx@21cn.com> for translating OSD texts to the Chinese language + +Edgar Toernig <froese@gmx.de> + for suggesting to not call FcFini() to avoid problems with older (broken) versions + of fontconfig + +Winfried K�hler <w_koehl@gmx.de> + for fixing wrong value for TableIdBAT in libsi/si.h diff -ruN vdr-1.6.0-1/HISTORY vdr-1.6.0-2/HISTORY --- vdr-1.6.0-1/HISTORY 2008-04-13 15:33:46.000000000 +0200 +++ vdr-1.6.0-2/HISTORY 2008-09-06 16:36:51.000000000 +0200 @@ -5740,3 +5740,21 @@ Andreas Mair). - Increased the time between checking the CAM status to 500ms to avoid problems with some CAMs (reported by Arthur Konovalov). + +2008-09-06: Version 1.6.0-2 + +- Updated the Italian OSD texts (thanks to Diego Pierotto). +- The SVDRP signon message now indicates the character encoding in use, as in + "220 video SVDRP VideoDiskRecorder 1.7.1; Fri May 2 16:17:10 2008; ISO-8859-1". + This may be useful for instance for external tools that provide EPG data, so that + they can correctly encode the strings. +- No longer calling FcFini() to avoid problems with older (broken) versions of + fontconfig (suggested by Edgar Toernig). +- Updated the sources.conf file (thanks to Oleg Roitburd). +- Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger). +- Fixed a problem with calling isyslog() from within the SignalHandler() (thanks + to Udo Richter). +- Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg). +- Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried K�hler). +- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h + (reported by Tobias Grimm). diff -ruN vdr-1.6.0-1/config.h vdr-1.6.0-2/config.h --- vdr-1.6.0-1/config.h 2008-04-13 13:09:42.000000000 +0200 +++ vdr-1.6.0-2/config.h 2008-09-07 11:33:03.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.310.1.1 2008/04/13 11:09:42 kls Exp $ + * $Id: config.h 1.310.1.2 2008/09/07 09:33:03 kls Exp $ */ #ifndef __CONFIG_H @@ -22,7 +22,7 @@ // VDR's own version number: -#define VDRVERSION "1.6.0-1" +#define VDRVERSION "1.6.0-2" #define VDRVERSNUM 10600 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff -ruN vdr-1.6.0-1/font.c vdr-1.6.0-2/font.c --- vdr-1.6.0-1/font.c 2008-03-01 11:19:41.000000000 +0100 +++ vdr-1.6.0-2/font.c 2008-05-03 11:59:24.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: font.c 1.25 2008/03/01 10:19:41 kls Exp $ + * $Id: font.c 1.25.1.1 2008/05/03 09:59:24 kls Exp $ */ #include "font.h" @@ -395,7 +395,7 @@ FcFontSetDestroy(fontset); FcPatternDestroy(pat); FcObjectSetDestroy(os); - FcFini(); + //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once FontNames->Sort(); } return FontNames->Size() > 0; @@ -431,7 +431,7 @@ esyslog("ERROR: no usable font found for '%s'", FontName); FcPatternDestroy(pat); free(fn); - FcFini(); + //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once } return FontFileName; } diff -ruN vdr-1.6.0-1/i18n.c vdr-1.6.0-2/i18n.c --- vdr-1.6.0-1/i18n.c 2008-01-19 13:07:11.000000000 +0100 +++ vdr-1.6.0-2/i18n.c 2008-09-06 14:21:17.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: i18n.c 1.319 2008/01/19 12:07:11 kls Exp $ + * $Id: i18n.c 1.319.1.1 2008/09/06 12:21:17 kls Exp $ * * */ @@ -45,7 +45,7 @@ "por", "fra,fre", "nor", - "fin,smi", + "fin,suo", "pol", "esl,spa", "ell,gre", diff -ruN vdr-1.6.0-1/libsi/si.h vdr-1.6.0-2/libsi/si.h --- vdr-1.6.0-1/libsi/si.h 2007-04-22 15:32:09.000000000 +0200 +++ vdr-1.6.0-2/libsi/si.h 2008-09-06 14:40:49.000000000 +0200 @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: si.h 1.17 2007/04/22 13:32:09 kls Exp $ + * $Id: si.h 1.17.1.1 2008/09/06 12:40:49 kls Exp $ * * ***************************************************************************/ @@ -28,7 +28,7 @@ TableIdNIT_other = 0x41, //network information section, other network TableIdSDT = 0x42, //service description section TableIdSDT_other = 0x46, - TableIdBAT = 0x46, //bouquet association section + TableIdBAT = 0x4A, //bouquet association section TableIdEIT_presentFollowing = 0x4E, //event information section TableIdEIT_presentFollowing_other = 0x4F, //range from 0x50 to 0x5F diff -ruN vdr-1.6.0-1/po/it_IT.po vdr-1.6.0-2/po/it_IT.po --- vdr-1.6.0-1/po/it_IT.po 2008-03-09 11:33:04.000000000 +0100 +++ vdr-1.6.0-2/po/it_IT.po 2008-04-19 12:03:16.000000000 +0200 @@ -12,9 +12,9 @@ "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "POT-Creation-Date: 2008-02-10 12:22+0100\n" -"PO-Revision-Date: 2008-03-08 21:06+0100\n" +"PO-Revision-Date: 2008-04-17 01:07+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" -"Language-Team: Italian\n" +"Language-Team: Italian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -221,7 +221,7 @@ msgstr "Disco" msgid "free" -msgstr "liberi" +msgstr "disponibile" msgid "Free To Air" msgstr "in chiaro" @@ -230,7 +230,7 @@ msgstr "codificato" msgid "auto" -msgstr "automatico" +msgstr "automatica" msgid "Edit channel" msgstr "Modifica canale" @@ -293,7 +293,7 @@ msgstr "CoderateH" msgid "none" -msgstr "nessuno" +msgstr "nessuna" msgid "CoderateL" msgstr "CoderateL" @@ -404,20 +404,20 @@ msgstr "Prossimi programmi" msgid "Button$Next" -msgstr "Prossimo" +msgstr "Prossimi" msgid "Button$Now" msgstr "Adesso" msgid "Button$Schedule" -msgstr "Programma" +msgstr "Programmi" msgid "Can't switch channel!" msgstr "Impossibile cambiare canale!" #, c-format msgid "Schedule - %s" -msgstr "Programma - %s" +msgstr "Programmi - %s" #, c-format msgid "This event - %s" @@ -500,7 +500,7 @@ msgstr "Altezza OSD" msgid "Setup.OSD$Message time (s)" -msgstr "Tempo del messaggio (s)" +msgstr "Durata del messaggio (s)" msgid "Setup.OSD$Use small font" msgstr "Utilizza caratteri piccoli" @@ -572,7 +572,7 @@ msgstr "Mostra vecchi dati EPG (min)" msgid "Setup.EPG$Set system time" -msgstr "Imposta orario automatico" +msgstr "Imposta orario di sistema" msgid "Setup.EPG$Use time from transponder" msgstr "Utilizza orario da transponder" @@ -628,7 +628,7 @@ msgstr "Dolby Digital" msgid "Setup.DVB$Update channels" -msgstr "Aggiorna i canali" +msgstr "Aggiornamento canali" msgid "Setup.DVB$Audio languages" msgstr "Lingue audio" @@ -739,7 +739,7 @@ msgstr "Nome reg. immediata" msgid "Setup.Recording$Instant rec. time (min)" -msgstr "Tempo reg. immediata (min)" +msgstr "Durata reg. immediata (min)" msgid "Setup.Recording$Max. video file size (MB)" msgstr "Dim. massima file video (MB)" @@ -899,7 +899,7 @@ msgstr "Plugin" msgid "Up/Dn for new location - OK to move" -msgstr "Su/Gi� per nuova posizione - OK per muovere" +msgstr "Su/Gi� per nuova posizione - OK per spostare" msgid "Channel locked (recording)!" msgstr "Canale bloccato (in registrazione)!" diff -ruN vdr-1.6.0-1/remux.h vdr-1.6.0-2/remux.h --- vdr-1.6.0-1/remux.h 2007-09-02 12:19:06.000000000 +0200 +++ vdr-1.6.0-2/remux.h 2008-09-06 16:34:42.000000000 +0200 @@ -4,14 +4,12 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remux.h 1.17 2007/09/02 10:19:06 kls Exp $ + * $Id: remux.h 1.17.1.1 2008/09/06 14:34:42 kls Exp $ */ #ifndef __REMUX_H #define __REMUX_H -#include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!! -#include <linux/dvb/dmx.h> #include "ringbuffer.h" #include "tools.h" diff -ruN vdr-1.6.0-1/sources.conf vdr-1.6.0-2/sources.conf --- vdr-1.6.0-1/sources.conf 2007-02-17 17:15:13.000000000 +0100 +++ vdr-1.6.0-2/sources.conf 2008-08-16 12:06:30.000000000 +0200 @@ -19,29 +19,34 @@ # Europe -S5E Sirius 2/3 +S3E Telecom 2C +S4E Eurobird 4 +S5E Sirius 4 S7E Eutelsat W3A +S9E Eurobird 9 S10E Eutelsat W1 -S13E Hotbird 1-3/6/7A +S13E Hotbird 6/7A/8 S16E Eutelsat W2 -S19.2E Astra 1B/C/E/F/G/H/2C +S19.2E Astra F/G/H/KR/L S21.0E Afristar 1 S21.6E Eutelsat W6 -S23.5E Astra 1D 3A -S26E Arabsat 2D/2C/3A +S23.5E Astra 1E/3A +S25.5E Eurobird 2 +S26E Badr 3/4/6 S28.2E Astra 2D/A/B -S28.5E Eurobird 1 & Astra 2A/B/D +S28.5E Eurobird 1 & Astra 2A/B/C/D S30.5E Arabsat 2B +S31.5E Astra 1D/5A S33E Eurobird 3 & Intelsat 802 S36E Eutelsat W4 & Sesat S38E Paksat 1 S39E Hellas Sat 2 S40E Express AM1 -S42E Turksat 1C/2A +S42E Turksat 2A/3A S45E Intelsat 12 S49E Yamal 202 S53E Express AM 22 -S55E Insat 3E & Intelsat 702 +S55E Insat 3E S56E Bonum 1 S57E NSS 703 S60E Intelsat 904 @@ -54,10 +59,10 @@ # Asia -S74E Insat 3C & Edusat -S75E LMI 1 +S74E Insat 3C/4CR & Edusat +S75E ABS 1 S76.5E Telstar 10 -S78.5E Thaicom 2/3 +S78.5E Thaicom 2/5 S80E Express AM2 S83E Insat 2E/3B/4A S85.2E Intelsat 709 @@ -65,14 +70,17 @@ S88E ST 1 S90E Yamal 201 S91.5E Measat 1 -S93.5E Insat 3A +S92.2E Chinasat 9 +S93.5E Insat 3A/4B S95E NSS 6 -S96.5E Express AM 11 +S96.5E Express AM 33 +S98.5E Protostar 1 S100.5E Asiasat 2 S103E Express A2 +S105E Asiastar S105.5E Asiasat 3S S107.7E Cakrawarta 1 -S108E Telkom 1 & AAP 1 +S108E Telkom 1 & NSS 11 S110E N-Sat 110 & BSAT 1A/2A S110.5E Sinosat 1 S113E Palapa C2 & Koreasat 2 @@ -81,38 +89,38 @@ S120E Thaicom 1A S122.2E Asiasat 4 S124E JCSAT 4a +S125E Sinosat 3 S128E JCSAT 3 -S132E N-Star A +S132E Vinasat 1 & JCSAT5a S134E Apstar 6 -S136E N-Star B S138E Telstar 18 S140E Express AM 3 S144E Superbird C S146E Agila 2 S148E Measat 2 S150E JCSAT R -S152E Optus B3 +S152E Optus D2 S154E JCSAT 2A S156E Optus C1 S158E Superbird A -S160E Optus B1 +S160E Optus D1 S162E Superbird B2 -S164E Optus A3 +S164E Optus B3 S166E Intelsat 8 S169E Intelsat 2 -S172E AMC 23 +S172E GE 23 S180E Intelsat 701 S177W NSS 5 # Atlantic -S1W Thor 2/3 & Intelsat 10-02 -S4W Amos 1/2 +S1W Thor 3/5 & Intelsat 10-02 +S4W Amos 1/2/3 S5W Atlantic Bird 3 -S7W Nilesat 101 & 102 +S7W Nilesat 101/102 & Atlantic Bird 4 S8W Telecom 2D & Atlantic Bird 2 S11W Express A3 -S12.5W Atlantic Bird 2 +S12.5W Atlantic Bird 1 S14W Express A4 S15W Telstar 12 S18W Intelsat 901 @@ -123,9 +131,9 @@ S30W Hispasat 1C/1D S31.5W Intelsat 801 S34.5W Intelsat 903 -S37.5W Telstar 11 & AMC 12 +S37.5W NSS 10 S40.5W NSS 806 -S43W Intelsat 3R/6B +S43W Intelsat 3R/11 S45W Intelsat 1R S50W Intelsat 705 S53W Intelsat 707 @@ -137,47 +145,45 @@ S61.5W Echostar 3 & Rainbow 1 S63W Estrelo de Sul 1 -S65W Brasilsat B2 -S70W Brasilsat B1 +S65W Star One C1 +S70W Star One C2 S72W Nahuel 1 & AMC 6 -S72.5W DirecTV 1 -S74W SBS 6 -S77W Echostar 4 +S72.5W DirecTV 1R & Echostar 6 +S74W Horizons 2 +S77W Echostar 4 & Galaxy 4R S79W AMC5 -S79.5W Nimiq 3 S82W Nimiq 2 S83W AMC 9 -S84W Brasilsat B3 -S85W AMC 2 +S84W Brasilsat B3/4 +S85W AMC 16 S85.1W XM 3 S87W AMC3 S89W Galaxy 28 -S91W Galaxy 11 & Nimiq 1 -S91.5W DirecTV 2 -S92W Brasilsat B4 +S91W Galaxy 11/17 & Nimiq 1 +S92W Brasilsat B2 S93W Galaxy 26 S95W Galaxy 3C S97W Galaxy 25 -S99W Galaxy 4R -S99.2W Spaceway 2 -S101W DirecTV 1R/4S/8 & AMC4 +S99W Galaxy 16 +S99.2W Spaceway 2 & DirecTV 11 +S101W DirecTV 4S/8 & AMC 2/4 S103W AMC1 -S105W AMC15 +S105W AMC15/18 S107.3W Anik F1/F1R -S110W DirecTV 5 & Echostar 6/8/10 +S110W DirecTV 5 & Echostar 8/10 S111.1W Anik F2 -S113W Solidaridad 2 -S119W Echostar 7 & DirecTV 7S +S113W SatMex 6 +S116.8W SatMex 5 +S119W Anik F3 & Echostar 7 & DirecTV 7S S121W Echostar 9 & Galaxy 23 -S123W Galaxy 10R +S123W Galaxy 18 S125W Galaxy 14 S127W Galaxy 13/Horizons 1 S129W Echostar 5 & Galaxy 27 S131W AMC 11 -S133W Galaxy15/1R +S133W Galaxy15 S135W AMC 10 S137W AMC 7 -S138.5W Echostar 10 S139W AMC 8 S148W Echostar 1/2 diff -ruN vdr-1.6.0-1/svdrp.c vdr-1.6.0-2/svdrp.c --- vdr-1.6.0-1/svdrp.c 2008-02-17 14:36:01.000000000 +0100 +++ vdr-1.6.0-2/svdrp.c 2008-05-02 16:29:16.000000000 +0200 @@ -10,7 +10,7 @@ * and interact with the Video Disk Recorder - or write a full featured * graphical interface that sits on top of an SVDRP connection. * - * $Id: svdrp.c 1.109 2008/02/17 13:36:01 kls Exp $ + * $Id: svdrp.c 1.109.1.1 2008/05/02 14:29:16 kls Exp $ */ #include "svdrp.h" @@ -1606,7 +1606,7 @@ char buffer[BUFSIZ]; gethostname(buffer, sizeof(buffer)); time_t now = time(NULL); - Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, *TimeToString(now)); + Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", buffer, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8"); } if (NewConnection) lastActivity = time(NULL); diff -ruN vdr-1.6.0-1/thread.c vdr-1.6.0-2/thread.c --- vdr-1.6.0-1/thread.c 2008-02-15 15:17:42.000000000 +0100 +++ vdr-1.6.0-2/thread.c 2008-08-16 13:00:40.000000000 +0200 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: thread.c 1.64 2008/02/15 14:17:42 kls Exp $ + * $Id: thread.c 1.64.1.1 2008/08/16 11:00:40 kls Exp $ */ #include "thread.h" @@ -24,11 +24,12 @@ { struct timeval now; if (gettimeofday(&now, NULL) == 0) { // get current time - now.tv_usec += MillisecondsFromNow * 1000; // add the timeout - while (now.tv_usec >= 1000000) { // take care of an overflow - now.tv_sec++; - now.tv_usec -= 1000000; - } + now.tv_sec += MillisecondsFromNow / 1000; // add full seconds + now.tv_usec += (MillisecondsFromNow % 1000) * 1000; // add microseconds + if (now.tv_usec >= 1000000) { // take care of an overflow + now.tv_sec++; + now.tv_usec -= 1000000; + } Abstime->tv_sec = now.tv_sec; // seconds Abstime->tv_nsec = now.tv_usec * 1000; // nano seconds return true; diff -ruN vdr-1.6.0-1/vdr.c vdr-1.6.0-2/vdr.c --- vdr-1.6.0-1/vdr.c 2008-03-14 14:22:39.000000000 +0100 +++ vdr-1.6.0-2/vdr.c 2008-09-06 13:07:52.000000000 +0200 @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $ + * $Id: vdr.c 1.313.1.1 2008/09/06 11:07:52 kls Exp $ */ #include <getopt.h> @@ -141,7 +141,6 @@ static void SignalHandler(int signum) { - isyslog("caught signal %d", signum); switch (signum) { case SIGPIPE: break; @@ -1288,9 +1287,11 @@ ReportEpgBugFixStats(); if (WatchdogTimeout > 0) dsyslog("max. latency time %d seconds", MaxLatencyTime); - isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode()); + if (LastSignal) + isyslog("caught signal %d", LastSignal); if (ShutdownHandler.EmergencyExitRequested()) esyslog("emergency exit!"); + isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode()); if (SysLogLevel > 0) closelog(); if (HasStdin) ++++++ vdr-1.6.0-const.diff ++++++ Index: vdr-1.6.0/recording.c =================================================================== --- vdr-1.6.0.orig/recording.c +++ vdr-1.6.0/recording.c @@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, co Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH); Subtitle = SubtitleBuffer; } - char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); - char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); + const char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); + const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); if (macroTITLE || macroEPISODE) { name = strdup(Timer->File()); name = strreplace(name, TIMERMACRO_TITLE, Title); @@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileN sortBuffer = NULL; fileName = strdup(FileName); FileName += strlen(VideoDirectory) + 1; - char *p = strrchr(FileName, '/'); + const char *p = strrchr(FileName, '/'); name = NULL; info = new cRecordingInfo; @@ -1022,7 +1022,8 @@ void cRecordings::DelByName(const char * if (recording) { cThreadLock DeletedRecordingsLock(&DeletedRecordings); Del(recording, false); - char *ext = strrchr(recording->FileName(), '.'); + // wtf? + char *ext = strrchr(const_cast<char*>(recording->FileName()), '.'); if (ext) { strncpy(ext, DELEXT, strlen(ext)); recording->fileSizeMB = DirSizeMB(recording->FileName()); Index: vdr-1.6.0/svdrp.c =================================================================== --- vdr-1.6.0.orig/svdrp.c +++ vdr-1.6.0/svdrp.c @@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option) char *strtok_next; FileName = strtok_r(p, delim, &strtok_next); // image type: - char *Extension = strrchr(FileName, '.'); + const char *Extension = strrchr(FileName, '.'); if (Extension) { if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0) Jpeg = true; @@ -796,12 +796,12 @@ void cSVDRP::CmdGRAB(const char *Option) if (FileName) { if (grabImageDir) { cString s; - char *slash = strrchr(FileName, '/'); + char *slash = strrchr(const_cast<char*>(FileName), '/'); if (!slash) { s = AddDirectory(grabImageDir, FileName); FileName = s; } - slash = strrchr(FileName, '/'); // there definitely is one + slash = strrchr(const_cast<char*>(FileName), '/'); // there definitely is one *slash = 0; char *r = realpath(FileName, RealFileName); *slash = '/'; ++++++ vdr-1.6.0-kernel-2.6.29.diff ++++++ Index: vdr-1.6.0/dvbdevice.h =================================================================== --- vdr-1.6.0.orig/dvbdevice.h +++ vdr-1.6.0/dvbdevice.h @@ -10,12 +10,13 @@ #ifndef __DVBDEVICE_H #define __DVBDEVICE_H +#include <linux/types.h> #include <linux/dvb/frontend.h> #include <linux/dvb/version.h> #include "device.h" #include "dvbspu.h" -#if DVB_API_VERSION != 3 +#if DVB_API_VERSION != 3 && DVB_API_VERSION != 5 #error VDR requires Linux DVB driver API version 3! #endif Index: vdr-1.6.0/dvbdevice.c =================================================================== --- vdr-1.6.0.orig/dvbdevice.c +++ vdr-1.6.0/dvbdevice.c @@ -7,9 +7,10 @@ * $Id: dvbdevice.c 1.170 2008/02/09 16:11:44 kls Exp $ */ -#include "dvbdevice.h" #include <errno.h> #include <limits.h> +#include <stdint.h> +#include "dvbdevice.h" #include <linux/videodev.h> #include <linux/dvb/audio.h> #include <linux/dvb/dmx.h> Index: vdr-1.6.0/vdr.c =================================================================== --- vdr-1.6.0.orig/vdr.c +++ vdr-1.6.0/vdr.c @@ -32,6 +32,7 @@ #include <pwd.h> #include <signal.h> #include <stdlib.h> +#include <linux/types.h> #include <sys/capability.h> #include <sys/prctl.h> #include <termios.h> ++++++ vdr.macros ++++++ %vdr_install_plugin() \ for i in %*; do \ install -d -m 755 %{buildroot}%{vdr_libdir} \ install -m 755 libvdr-$i.so %{buildroot}%{vdr_libdir}/libvdr-$i.so.%{vdr_apiversion} \ done \ %{nil} %vdr_install_plugin_locale \ if [ -d locale ]; then \ cd locale \ install -d -m 755 %buildroot%{vdr_localedir} \ for i in *_*; do \ install -d -m 755 %buildroot%{vdr_localedir}/$i/LC_MESSAGES \ install -m 644 $i/LC_MESSAGES/*.mo %buildroot%{vdr_localedir}/$i/LC_MESSAGES \ done \ cd .. \ fi \ %{nil} %vdr_make() \ make %{?jobs:-j%jobs} VDRDIR=%{vdr_includedir} LIBDIR=. LOCALEDIR=locale %{!?1:all}%{?*} \ %{nil} # vim: syntax=spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org