Hello community,
here is the log from the commit of package vdr13
checked in at Sat Jun 3 01:00:42 CEST 2006.
--------
New Changes file:
--- /dev/null 2002-12-09 23:01:21.000000000 +0100
+++ vdr13/vdr13-internal.changes 2006-06-02 15:59:14.000000000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Fri Jun 2 15:58:33 CEST 2006 - lnussel@suse.de
+
+- initial package branched off vdr 1.4.0
+
--- vdr13/vdr13.changes 2006-05-30 08:50:43.000000000 +0200
+++ vdr13/vdr13.changes 2006-06-02 16:07:48.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 2 16:07:42 CEST 2006 - lnussel@suse.de
+
+- remove unused patches
+
+-------------------------------------------------------------------
Old:
----
vdr-1.3.14-sc.diff
New:
----
vdr-1.3.38-ffdecsa-0.1.3.diff
vdr-1.3.38-sc.diff
vdr-1.4.0-ffdecsa-cflags.diff
vdr13-internal.changes
vdr13-internal.spec
vdr13.spec.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vdr13-internal.spec ++++++
#
# spec file for package vdr13-internal (Version 1.4.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: vdr13-internal
# !!! DO NOT EDIT THIS FILE, APPLY vdr13.spec.diff INSTEAD
Provides: vdr13
BuildRequires: dvb freetype2-devel gcc-c++ libjpeg-devel
%if %suse_version > 1000
BuildRequires: libcap-devel
%else
BuildRequires: libcap
%endif
%define with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}
Url: http://www.cadsoft.de/people/kls/vdr/
License: GPL
Group: Hardware/TV
Requires: dvb
Prereq: /usr/sbin/useradd
Version: 1.4.0
Release: 1
Summary: Video Disk Recorder
Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2
Source1: rcvdr
Source2: sysconfig.vdr
Source3: vdr-shutdown.sh
Source4: runvdr
#Source5: README.SuSE-vdr
Source6: openvt.diff
#Source7: vdr-genindex.c
Source8: channels.conf
Source9: remote.conf
Patch0: vdr13-scripts.diff
Patch1: vdr-1.4.0-1_norunvdr.diff
Patch2: vdr-1.4.0-2_norunvdr.diff
Patch12: vdr-1.3.45-dvbplayer-nosleep.diff
Patch13: vdr-1.3.25-utf8-0.0.3.patch
Patch14: vdr-1.3.23-utf8-fonts.diff
Patch20: runvdr.diff
# unused patches
Patch98: vdr-1.3.5-find-v4l-device-kernel-2.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %with_freetype
Requires: xorg-x11-fonts-scalable
%endif
Patch80: vdr-1.3.38-sc.diff
Patch81: vdr-1.3.38-ffdecsa-0.1.3.diff
Patch82: vdr-1.4.0-ffdecsa-cflags.diff
Patch85: vdr13.spec.diff
%description
This is a hard disk video recording software supporting the Siemens
DVB-S card and compatible devices.
%prep
%setup -n vdr-%{version}
cp %{SOURCE1} .
cp %{SOURCE2} .
cp %{SOURCE4} .
# need to find a better solution for this ...
if [ -x /usr/bin/quilt ]; then
qpatch()
{
test -d patches || mkdir patches
patch=$1; shift;
quilt import "$@" -P ${patch##*/} "$patch"
}
qpush()
{
tac < patches/series > patches/series.1
mv patches/series.1 patches/series
quilt push -a
}
else
qpatch()
{
patch=$1; shift;
[ -z "$*" ] && set -- -p1
case `file -b "$patch"` in
gzip*) %{_gzipbin} -dc "$patch" ;;
bzip2*) %{_bzip2bin} -dc "$patch" ;;
*) cat "$patch" ;;
esac | %__patch "$@"
}
qpush() { :; }
fi
#
qpatch %PATCH0
qpatch %PATCH1
qpatch %PATCH2
qpatch %PATCH12
#qpatch %PATCH11
%if %with_freetype
qpatch %PATCH13
qpatch %PATCH14
%endif
qpatch %PATCH20 -p0
qpatch %PATCH80 -p1
qpatch %PATCH81 -p1
qpatch %PATCH82 -p1
qpush
#
cat > Make.config < /dev/null || :
%post
%{fillup_and_insserv vdr13}
%postun
%{insserv_cleanup}
%files
%defattr(-,root,root)
#%doc README.SuSE
%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/vdr13
%dir %{_libdir}/vdr13
%dir %{_includedir}/vdr13
%attr(-,vdr,root) %config(noreplace) /etc/vdr13/*
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/vdr13/*
%{_includedir}/vdr13/*
%{_mandir}/man?/*
/etc/init.d/*
/var/adm/fillup-templates/*
%changelog -n vdr13-internal
* Fri Jun 02 2006 - lnussel@suse.de
- initial package branched off vdr 1.4.0
++++++ vdr13.spec ++++++
--- /var/tmp/diff_new_pack.wN0NMk/_old 2006-06-03 01:00:12.000000000 +0200
+++ /var/tmp/diff_new_pack.wN0NMk/_new 2006-06-03 01:00:12.000000000 +0200
@@ -24,7 +24,7 @@
Requires: dvb
Prereq: /usr/sbin/useradd
Version: 1.4.0
-Release: 4
+Release: 5
Summary: Video Disk Recorder
Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2
Source1: rcvdr
@@ -45,7 +45,6 @@
Patch20: runvdr.diff
# unused patches
Patch98: vdr-1.3.5-find-v4l-device-kernel-2.6.patch
-Patch99: vdr-1.3.14-sc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %with_freetype
Requires: xorg-x11-fonts-scalable
@@ -92,7 +91,7 @@
{
test -d patches || mkdir patches
patch=$1; shift;
- quilt import "$@" -n ${patch##*/} "$patch"
+ quilt import "$@" -P ${patch##*/} "$patch"
}
qpush()
{
@@ -228,6 +227,8 @@
/var/adm/fillup-templates/*
%changelog -n vdr13
+* Fri Jun 02 2006 - lnussel@suse.de
+- remove unused patches
* Tue May 30 2006 - lnussel@suse.de
- add maintenance patches 1 and 2
* Tue May 02 2006 - lnussel@suse.de
++++++ vdr-1.3.38-ffdecsa-0.1.3.diff ++++++
++++ 7323 lines (skipped)
++++++ vdr-1.3.14-sc.diff -> vdr-1.3.38-sc.diff ++++++
--- vdr13/vdr-1.3.14-sc.diff 2005-05-12 15:52:39.000000000 +0200
+++ vdr13/vdr-1.3.38-sc.diff 2006-06-02 15:00:21.000000000 +0200
@@ -1,93 +1,126 @@
-diff -uN -X ex.vdr-sc vdr-1.3.14-orig/ci.c vdr-1.3.14/ci.c
---- vdr-1.3.14-orig/ci.c 2004-07-17 16:30:17.000000000 +0200
-+++ vdr-1.3.14/ci.c 2004-10-24 17:58:19.000000000 +0200
-@@ -1340,6 +1340,11 @@
- close(fd);
- }
-
-+int cCiHandler::GetCaFd(void)
-+{
-+ return dup(fd);
-+}
-+
- cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
- {
- int fd_ca = open(FileName, O_RDWR);
-diff -uN -X ex.vdr-sc vdr-1.3.14-orig/ci.h vdr-1.3.14/ci.h
---- vdr-1.3.14-orig/ci.h 2004-02-08 15:36:23.000000000 +0100
-+++ vdr-1.3.14/ci.h 2004-10-24 17:58:19.000000000 +0200
-@@ -82,6 +82,8 @@
+diff -urN -X ex.vdr-sc vdr-1.3.38-orig/ci.h vdr-1.3.38/ci.h
+--- vdr-1.3.38-orig/ci.h 2006-01-07 16:03:05.000000000 +0100
++++ vdr-1.3.38/ci.h 2006-03-16 18:26:46.000000000 +0100
+@@ -96,6 +96,9 @@
class cCiTransportLayer;
class cCiTransportConnection;
-+#define VDR_IS_SC_PATCHED 314
++#include
++#define VDR_IS_SC_PATCHED 330
+
class cCiHandler {
private:
cMutex mutex;
-@@ -115,6 +117,7 @@
- bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot???
- bool SetCaPmt(cCiCaPmt &CaPmt, int Slot);
+@@ -175,6 +178,7 @@
+ ///< Triggers sending all currently active CA_PMT entries to the CAM,
+ ///< so that it will start decrypting.
bool Reset(int Slot);
-+ int GetCaFd(void);
++ int GetCaFd(void) { return dup(fd); }
};
#endif //__CI_H
-diff -uN -X ex.vdr-sc vdr-1.3.14-orig/dvbdevice.c vdr-1.3.14/dvbdevice.c
---- vdr-1.3.14-orig/dvbdevice.c 2004-10-24 13:06:37.000000000 +0200
-+++ vdr-1.3.14/dvbdevice.c 2004-10-24 17:58:19.000000000 +0200
-@@ -448,13 +448,47 @@
- return fd_video >= 0 && fd_audio >= 0;
+diff -urN -X ex.vdr-sc vdr-1.3.38-orig/dvbdevice.c vdr-1.3.38/dvbdevice.c
+--- vdr-1.3.38-orig/dvbdevice.c 2006-01-07 16:15:01.000000000 +0100
++++ vdr-1.3.38/dvbdevice.c 2006-03-16 18:26:46.000000000 +0100
+@@ -501,17 +501,31 @@
+ return true;
}
-+#include "plugin.h"
-+#define SC_NAME "sc"
-+#define SC_MAGIC { 0,'S','C',0xc4,0x5e,0xa1 }
-+#define OP_PROVIDES 0
-+#define OP_IGNORE 1
-+
-+struct ScLink {
-+ char magic[6];
-+ short op;
-+ const cDevice *dev;
-+ unsigned short *caids;
-+ const cChannel *channel;
-+ int num;
-+ };
++#include "sclink.h"
+
int cDvbDevice::ProvidesCa(const cChannel *Channel) const
{
-+#ifndef HAVE_SOFTCSA
- if (Channel->Ca() >= 0x0100 && ciHandler) {
-+#else
-+ if (Channel->Ca() >= 0x0100) {
-+#endif
- unsigned short ids[MAXCAIDS + 1];
- for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0!
- ids[i] = Channel->Ca(i);
-- return ciHandler->ProvidesCa(ids);
-+ struct ScLink link = { SC_MAGIC,0,this,ids,Channel,0 };
-+ cPlugin *p = cPluginManager::GetPlugin(SC_NAME);
-+ int n;
-+ if(ciHandler && (n=ciHandler->ProvidesCa(ids))) {
-+ if(p) { // ignore this channel in SC (ugly hack!)
-+ link.op=OP_IGNORE;
-+ p->SetupParse((const char *)&link,"");
-+ }
-+ return n;
-+ }
-+ else if(p) {
-+ // check if SC provides the ID (ugly hack!)
-+ link.op=OP_PROVIDES;
-+ p->SetupParse((const char *)&link,"");
-+ return link.num;
-+ }
+ int NumCams = 0;
+- if (ciHandler) {
++ if (ciHandler)
+ NumCams = ciHandler->NumCams();
++ struct ScLink link;
++ PrepareScLink(&link,this,OP_CAMS);
++ int n = DoScLinkOp(&link);
++ if (n > 0 && n > NumCams)
++ NumCams = n;
++ if (NumCams > 0) {
+ if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
+ unsigned short ids[MAXCAIDS + 1];
+ for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0!
+ ids[i] = Channel->Ca(i);
+- if (ciHandler->ProvidesCa(ids))
++ if (ciHandler && ciHandler->ProvidesCa(ids))
+ return NumCams + 1;
++ else {
++ PrepareScLink(&link,this,OP_PROVIDES);
++ link.data.caids=ids;
++ if (DoScLinkOp(&link) > 0)
++ return NumCams + 1;
++ }
+ }
}
- return cDevice::ProvidesCa(Channel);
- }
-diff -uN -X ex.vdr-sc vdr-1.3.14-orig/pat.c vdr-1.3.14/pat.c
---- vdr-1.3.14-orig/pat.c 2004-10-16 12:01:12.000000000 +0200
-+++ vdr-1.3.14/pat.c 2004-10-24 17:58:19.000000000 +0200
+ int result = cDevice::ProvidesCa(Channel);
+@@ -681,8 +695,18 @@
+ LOG_ERROR;
+ return false;
+ }
++ struct ScLink link;
++ PrepareScLink(&link,this,OP_ADDPID);
++ link.data.pids.pid=Handle->pid;
++ link.data.pids.type=Type;
++ DoScLinkOp(&link);
+ }
+ else if (!Handle->used) {
++ struct ScLink link;
++ PrepareScLink(&link,this,OP_DELPID);
++ link.data.pids.pid=Handle->pid;
++ DoScLinkOp(&link);
++
+ CHECK(ioctl(Handle->handle, DMX_STOP));
+ if (Type <= ptTeletext) {
+ pesFilterParams.pid = 0x1FFF;
+@@ -775,8 +799,14 @@
+ if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
+ #ifdef DO_MULTIPLE_RECORDINGS
+ #ifndef DO_MULTIPLE_CA_CHANNELS
+- if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN)
+- needsDetachReceivers = Ca() != Channel->Ca();
++ if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN) {
++ struct ScLink link;
++ PrepareScLink(&link,this,OP_ALLOWED);
++ if(Channel->Ca()0)
++ result = true;
++ else
++ needsDetachReceivers = Ca() != Channel->Ca();
++ }
+ else
+ #endif
+ if (!IsPrimaryDevice())
+@@ -824,11 +854,25 @@
+
+ // Turn off live PIDs if necessary:
+
++ if (!TurnOffLivePIDs && HasDecoder() && Channel->Ca() >= CA_ENCRYPTED_MIN && (pidHandles[ptAudio].pid || pidHandles[ptVideo].pid)) {
++ struct ScLink link;
++ PrepareScLink(&link,this,OP_LIVE);
++ if(DoScLinkOp(&link)>0)
++ TurnOffLivePIDs=true;
++ }
++
+ if (TurnOffLivePIDs)
+ TurnOffLiveMode(LiveView);
+
+ // Set the tuner:
+
++ if(DoTune) {
++ struct ScLink link;
++ PrepareScLink(&link,this,OP_TUNE);
++ link.data.tune.source=Channel->Source();
++ link.data.tune.transponder=Channel->Transponder();
++ DoScLinkOp(&link);
++ }
+ dvbTuner->Set(Channel, DoTune);
+
+ // If this channel switch was requested by the EITScanner we don't wait for
+diff -urN -X ex.vdr-sc vdr-1.3.38-orig/pat.c vdr-1.3.38/pat.c
+--- vdr-1.3.38-orig/pat.c 2005-09-04 16:32:39.000000000 +0200
++++ vdr-1.3.38/pat.c 2006-03-16 18:26:46.000000000 +0100
@@ -158,7 +158,7 @@
for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) {
const unsigned short *caids = CaSystemIds;
@@ -97,3 +130,81 @@
if (length + d->Length() <= BufSize) {
if (IsStream >= 0 && IsStream != d->Stream())
dsyslog("CAM: different stream flag in CA descriptors");
+diff -urN -X ex.vdr-sc vdr-1.3.38-orig/sclink.h vdr-1.3.38/sclink.h
+--- vdr-1.3.38-orig/sclink.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.3.38/sclink.h 2006-03-16 18:26:46.000000000 +0100
+@@ -0,0 +1,74 @@
++/*
++ * Softcam plugin to VDR (C++)
++ *
++ * This code is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This code is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
++ */
++
++#define SC_NAME "sc"
++#define SC_MAGIC { 0,'S','C',0xc4,0x5e,0xa2 }
++
++#define OP_PROVIDES 0
++#define OP_ADDPID 1
++#define OP_DELPID 2
++#define OP_TUNE 3
++#define OP_ALLOWED 4
++#define OP_CAMS 5
++#define OP_LIVE 6
++
++struct ScLink {
++ char magic[6];
++ short op;
++ const cDevice *dev;
++ union {
++ unsigned short *caids;
++ struct {
++ int pid;
++ int type;
++ } pids;
++ struct {
++ int source;
++ int transponder;
++ } tune;
++ int live;
++ } data;
++ int num;
++ };
++
++static const char magic[] = SC_MAGIC;
++
++#ifndef PLUGIN_COMPILE
++
++#include "plugin.h"
++
++void PrepareScLink(struct ScLink *link, const cDevice *dev, int op)
++{
++ memcpy(link->magic,magic,sizeof(link->magic));
++ link->op=op;
++ link->dev=dev;
++ link->num=-1;
++}
++
++int DoScLinkOp(struct ScLink *link)
++{
++ cPlugin *p=cPluginManager::GetPlugin(SC_NAME);
++ if(p) {
++ p->SetupParse((const char *)link,"");
++ return link->num;
++ }
++ return -1;
++}
++
++#endif
++++++ vdr-1.4.0-ffdecsa-cflags.diff ++++++
Index: vdr-1.4.0/FFdecsa/Makefile
===================================================================
--- vdr-1.4.0.orig/FFdecsa/Makefile
+++ vdr-1.4.0/FFdecsa/Makefile
@@ -19,7 +19,10 @@
#FLAGS += -pg
COMPILER ?= g++
-FLAGS ?= -Wall -O3 -march=pentium -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
+#FLAGS ?= -Wall -O3 -march=pentium -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
+
+-include ../Make.config
+FLAGS = $(CFLAGS)
H_FILES = FFdecsa.h parallel_generic.h parallel_std_def.h \
parallel_032_4char.h \
Index: vdr-1.4.0/Makefile
===================================================================
--- vdr-1.4.0.orig/Makefile
+++ vdr-1.4.0/Makefile
@@ -93,7 +93,7 @@ endif
OBJS += csa.o
CPUOPT ?= pentium
PARALLEL ?= PARALLEL_32_INT
-CSAFLAGS = -Wall -fPIC -g -O3 -march=$(CPUOPT) -mmmx -DPARALLEL_MODE=$(PARALLEL) -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
+CSAFLAGS = $(CFLAGS) -DPARALLEL_MODE=$(PARALLEL) -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
FFDECSADIR = FFdecsa
FFDECSA = $(FFDECSADIR)/FFdecsa.o
++++++ vdr13.spec.diff ++++++
Index: vdr13/vdr13-internal.spec
===================================================================
--- vdr13.orig/vdr13-internal.spec
+++ vdr13/vdr13-internal.spec
@@ -10,7 +10,9 @@
# norootforbuild
-Name: vdr13
+Name: vdr13-internal
+# !!! DO NOT EDIT THIS FILE, APPLY vdr13.spec.diff INSTEAD
+Provides: vdr13
BuildRequires: dvb freetype2-devel gcc-c++ libjpeg-devel
%if %suse_version > 1000
BuildRequires: libcap-devel
@@ -49,6 +51,10 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
%if %with_freetype
Requires: xorg-x11-fonts-scalable
%endif
+Patch80: vdr-1.3.38-sc.diff
+Patch81: vdr-1.3.38-ffdecsa-0.1.3.diff
+Patch82: vdr-1.4.0-ffdecsa-cflags.diff
+Patch85: vdr13.spec.diff
%description
This is a hard disk video recording software supporting the Siemens
@@ -123,6 +129,9 @@ qpatch %PATCH13
qpatch %PATCH14
%endif
qpatch %PATCH20 -p0
+qpatch %PATCH80 -p1
+qpatch %PATCH81 -p1
+qpatch %PATCH82 -p1
qpush
#
cat > Make.config <
