diff options
| -rw-r--r-- | debian/dh_xine.in (renamed from debian/dh_xine) | 12 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | src/input/input_dvb.c | 8 |
3 files changed, 19 insertions, 8 deletions
diff --git a/debian/dh_xine b/debian/dh_xine.in index 831151983..596e12096 100644 --- a/debian/dh_xine +++ b/debian/dh_xine.in @@ -27,6 +27,9 @@ By listing package name suffixes, you can generate dependencies and recommendations (almost) at will. If you don't specify any, then 'x' and 'console' are used, generating xine-x:Depends and xine-console:Depends. +'-' generates xine:Depends which contains a dependency on libxine2 which is +suitable for use by out-of-tree plugins. + =head1 EXAMPLES dh_xine is usually called indirectly in a rules file via the dh command. @@ -62,8 +65,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp = tmpdir ($package); foreach my $suffix (@suffix) { - delsubstvar($package, "xine-$suffix:Depends"); - addsubstvar ($package, "xine-$suffix:Depends", "libxine2-$suffix"); + if ($suffix eq '-') { + delsubstvar($package, "xine:Depends"); + addsubstvar ($package, "xine:Depends", "libxine2 (>= @VERSION@)"); + } else { + delsubstvar($package, "xine-$suffix:Depends"); + addsubstvar ($package, "xine-$suffix:Depends", "libxine2-$suffix"); + } } } diff --git a/debian/rules b/debian/rules index 5d34e792b..a09eb29b0 100755 --- a/debian/rules +++ b/debian/rules @@ -102,7 +102,7 @@ update-config-sub-guess: clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp po/*.gmo po/stamp-po + rm -f build-stamp configure-stamp po/*.gmo po/stamp-po debian/dh_xine if test -f .noauto; then \ [ ! -f Makefile ] || $(MAKE) distclean; \ else \ @@ -110,7 +110,10 @@ clean: fi dh_clean -install: build +debian/dh_xine: debian/dh_xine.in + sed -e's/@VERSION@/'$(shell dpkg-parsechangelog -c1 | sed -e '/^Version:/! d; s/^.* //; s/-[^-]*$$//')'/' $< >$@ + +install: build debian/dh_xine dh_testdir dh_testroot dh_clean -k diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 74365cc44..6b791d355 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -1249,8 +1249,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) { xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: Error setting up Internal PAT filter - reverting to rc6 hehaviour\n"); dvb_set_pidfilter (this,VIDFILTER,this->channels[this->channel].pid[VIDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP); dvb_set_pidfilter (this,AUDFILTER,this->channels[this->channel].pid[AUDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP); - free(tmpbuffer); - return; + goto done; } result = read (tuner->fd_pidfilter[INTERNAL_FILTER], tmpbuffer, 3); @@ -1291,10 +1290,10 @@ static void dvb_parse_si(dvb_input_plugin_t *this) { if((poll(&pfd,1,15000)<1) || this->channels[this->channel].pmtpid==0) /* PMT timed out or couldn't be found - default to using channels.conf info */ { - xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: WARNING **** Reverting to rc6 hehaviour. Please regenerate your channels.conf in ?zap format ****\n"); + xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: PMT scan timed out. Using video & audio PID info from channels.conf.\n"); dvb_set_pidfilter (this,VIDFILTER,this->channels[this->channel].pid[VIDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP); dvb_set_pidfilter (this,AUDFILTER,this->channels[this->channel].pid[AUDFILTER], DMX_PES_OTHER, DMX_OUT_TS_TAP); - return; + goto done; } result = read(tuner->fd_pidfilter[INTERNAL_FILTER],tmpbuffer,3); @@ -1322,6 +1321,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) { xprintf(this->stream->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Setup of PID filters complete\n"); +done: free(tmpbuffer); } |