[dvb-apps] Move to hg snapshot d4e8bf5658ce
Peter Robinson
pbrobinson at fedoraproject.org
Sat Nov 12 17:56:06 UTC 2011
commit 199972065d5b47826e2fd3fb26066c660ec3b32a
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sat Nov 12 17:51:26 2011 +0000
Move to hg snapshot d4e8bf5658ce
.gitignore | 3 +-
dvb-apps-1.1.1-czap-sscanf-557580.patch | 13 ----
dvb-apps-1.1.1-dvbnet-h-597604.patch | 21 ------
dvb-apps-1.1.1-no-build-test.patch | 8 --
dvb-apps-1.1.1-optflags.patch | 100 --------------------------
dvb-apps-1.1.1-tzap-auto-574112.patch | 38 ----------
dvb-apps-Docs.patch | 87 +++++++++++++++++++++++
dvb-apps-Make.patch | 35 +++++++++
dvb-apps-paths.patch | 80 ---------------------
dvb-apps-tuningfiles-snapshot.sh | 23 ------
dvb-apps.spec | 116 ++++++++++++++-----------------
sources | 3 +-
12 files changed, 177 insertions(+), 350 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd84452..cc5efeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20100605.tar.bz2
+d4e8bf5658ce.tar.bz2
diff --git a/dvb-apps-Docs.patch b/dvb-apps-Docs.patch
new file mode 100644
index 0000000..3216e50
--- /dev/null
+++ b/dvb-apps-Docs.patch
@@ -0,0 +1,87 @@
+--- dvb-apps-d4e8bf5658ce/util/av7110_loadkeys/README.orig 2011-11-12 16:53:01.233227473 +0000
++++ dvb-apps-d4e8bf5658ce/util/av7110_loadkeys/README 2011-11-12 16:57:19.299251777 +0000
+@@ -5,7 +5,7 @@
+
+ just call
+
+- # ./av7110_loadkeys [-i|--invert] [-a|--address <num>] keymapname.(rc5|rcmm) > /proc/av7110_ir
++ # av7110_loadkeys [-i|--invert] [-a|--address <num>] keymapname.(rc5|rcmm) > /proc/av7110_ir
+
+ If your IR receiver hardware inverts the signal, you should use the -i
+ or --invert command line option.
+@@ -15,17 +15,17 @@
+ driver listens to all device addresses. Some examples:
+
+ Listen to *any* IR transmitter with uses the RC5 protocol:
+-# ./av7110_loadkeys hauppauge.rc5 > /proc/av7110_ir
++# av7110_loadkeys hauppauge.rc5 > /proc/av7110_ir
+
+ Listen to RC5 transmitter with address 2:
+-# ./av7110_loadkeys -a 2 hauppauge.rc5 > /proc/av7110_ir
++# av7110_loadkeys -a 2 hauppauge.rc5 > /proc/av7110_ir
+
+ If you don't know the correct value for the -a parameter, take a look
+ on the debug output of the driver (see below).
+
+ Now you can test your hardware setup using evtest
+
+- # ./evtest /dev/input/eventX
++ # evtest /dev/input/eventX
+
+ where eventX is the IR input event device, usually event0 if you don't
+ use USB mice or keyboards.
+--- dvb-apps-d4e8bf5658ce/util/scan/README.orig 2011-11-12 16:53:09.756222723 +0000
++++ dvb-apps-d4e8bf5658ce/util/scan/README 2011-11-12 16:56:17.387230135 +0000
+@@ -6,13 +6,13 @@
+ feel free to submit it to the linux-dvb mailing list
+ http://www.linuxtv.org/lists.php.
+
+-Basic usage: ./dvbscan dvb-s/Astra-19.2E | tee mychannels.conf
+-or ./atscscan atsc/us-NTSC-center-frequencies-8VSB
++Basic usage: dvbscan dvb-s/Astra-19.2E | tee mychannels.conf
++or atscscan atsc/us-NTSC-center-frequencies-8VSB
+
+ If you want it to check a specific frequency, tune to that frequency
+-(e.g. using szap/tzap/czap/azap) and then use './dvbscan -c' or './atscscan -c'.
++(e.g. using szap/tzap/czap/azap) and then use 'dvbscan -c' or 'atscscan -c'.
+
+-For more scan options see ./dvbscan -h or ./atscscan -h
++For more scan options see dvbscan -h or atscscan -h
+
+ atscscan is _just_ a copy of dvbscan to not confuse ATSC-user.
+
+--- dvb-apps-d4e8bf5658ce/util/szap/README.orig 2011-11-12 16:53:15.587217543 +0000
++++ dvb-apps-d4e8bf5658ce/util/szap/README 2011-11-12 16:55:25.100234795 +0000
+@@ -5,19 +5,19 @@
+
+ For DVB-S, Astra Channel config file:
+
+-$ ./szap -c channels-conf/dvb-s/Astra-19.2E n24
++$ szap -c channels-conf/dvb-s/Astra-19.2E n24
+
+ will tune to N24. For DVB-C, Berlin Cable channel config:
+
+-$ ./czap -c channels-conf/dvb-c/de-Berlin Arte
++$ czap -c channels-conf/dvb-c/de-Berlin Arte
+
+ For DVB-T, Berlin Config:
+
+-$ ./tzap -c channels-conf/dvb-t/de-Berlin phoenix
++$ tzap -c channels-conf/dvb-t/de-Berlin phoenix
+
+ For ATSC, Raleigh Durham Config:
+
+-$ ./azap -c channels-conf/atsc/us-Raleigh-Durham WRAL
++$ azap -c channels-conf/atsc/us-Raleigh-Durham WRAL
+
+ will tune to WRAL's Digital Channel 5-1.
+
+@@ -25,7 +25,7 @@
+ record the stream to disk you will route it to the DVR device by using the
+ '-r' option:
+
+-$ ./tzap -c channels-conf/dvb-t/de-Berlin phoenix -r
++$ tzap -c channels-conf/dvb-t/de-Berlin phoenix -r
+ [keep it running in one console]
+ $ cat /dev/dvb/adapter0/dvr0 > /tmp/recording.ts
+ [in a second console, will dump the MPEG transport stream to /tmp/recording.ts]
diff --git a/dvb-apps-Make.patch b/dvb-apps-Make.patch
new file mode 100644
index 0000000..86f5e1b
--- /dev/null
+++ b/dvb-apps-Make.patch
@@ -0,0 +1,35 @@
+--- dvb-apps-d4e8bf5658ce/Make.rules.orig 2011-11-12 13:59:36.506702158 +0000
++++ dvb-apps-d4e8bf5658ce/Make.rules 2011-11-12 14:01:44.436698401 +0000
+@@ -1,6 +1,6 @@
+ # build rules for linuxtv.org dvb-apps
+
+-CFLAGS ?= -g -Wall -W -Wshadow -Wpointer-arith -Wstrict-prototypes
++CFLAGS ?= $(RPM_OPT_FLAGS) -Wall -W -Wshadow -Wpointer-arith -Wstrict-prototypes
+
+ ifneq ($(lib_name),)
+
+--- dvb-apps-d4e8bf5658ce/Makefile.orig 2011-11-12 14:05:43.341719482 +0000
++++ dvb-apps-d4e8bf5658ce/Makefile 2011-11-12 14:05:56.433725987 +0000
+@@ -4,7 +4,6 @@
+
+ all clean install:
+ $(MAKE) -C lib $@
+- $(MAKE) -C test $@
+ $(MAKE) -C util $@
+
+ update:
+--- dvb-apps-d4e8bf5658ce/util/scan/Makefile.orig 2011-11-12 14:19:17.393759015 +0000
++++ dvb-apps-d4e8bf5658ce/util/scan/Makefile 2011-11-12 14:19:50.260773076 +0000
+@@ -5,10 +5,10 @@
+ dump-vdr.o \
+ dump-zap.o \
+ lnb.o \
+- scan.o \
++ scandvb.o \
+ section.o
+
+-binaries = scan
++binaries = scandvb
+
+ inst_bin = $(binaries)
+
diff --git a/dvb-apps.spec b/dvb-apps.spec
index 1664620..a27b8e2 100644
--- a/dvb-apps.spec
+++ b/dvb-apps.spec
@@ -1,40 +1,43 @@
-Name: dvb-apps
-Version: 1.1.1
-Release: 23%{?dist}
-Summary: Utility, demo and test applications using the Linux DVB API
-
-Group: Applications/Multimedia
-License: GPLv2+
-URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
-Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2
-# Source1 created with Source99
-Source1: %{name}-tuningfiles-20100605.tar.bz2
-Source99: %{name}-tuningfiles-snapshot.sh
-Patch0: %{name}-1.1.1-optflags.patch
-Patch1: %{name}-paths.patch
-Patch2: %{name}-1.1.1-no-build-test.patch
-Patch3: %{name}-1.1.1-czap-sscanf-557580.patch
-# http://linuxtv.org/hg/dvb-apps/rev/53ca8b7c9d31
-Patch4: %{name}-1.1.1-tzap-auto-574112.patch
-# http://www.linuxtv.org/pipermail/linux-dvb/2010-June/032676.html
-Patch5: %{name}-1.1.1-dvbnet-h-597604.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define hgver d4e8bf5658ce
+Name: dvb-apps
+Version: 1.1.2
+Release: 0.%{hgver}%{?dist}
+Summary: Utility, demo and test applications using the Linux DVB API
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
+
+Source0: http://linuxtv.org/hg/dvb-apps/archive/%{hgver}.tar.bz2
+Patch0: dvb-apps-Make.patch
+Patch1: dvb-apps-Docs.patch
+
+Autoreq: 0
BuildRequires: libusb-devel
-BuildRequires: kernel-headers >= 2.6.16
+BuildRequires: kernel-headers
%description
-%{summary}.
-
+The LinuxTV dvb-apps package contains some Linux DVB API applications and a set
+of utilities that both the developer and end user alike will find quite useful.
+Specifically, the utilities are geared towards the initial setup, testing, and
+operation of a DVB device, whether it be of the software decoding or hardware
+decoding type.
%prep
-%setup -q -n linuxtv-%{name}-%{version} -a 1
-%patch0 -p1
-%patch1 -p1
-%patch2
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%setup -q -n %{name}-%{hgver}
+
+# Various fixes to fix various upstream build issues
+%patch0 -p1 -b .make
+%patch1 -p1 -b docs
+
+# Rename to non generic name
+mv util/scan/scan.c util/scan/scandvb.c
+
+# Fix libdir for 64 bit arches
+%ifarch x86_64 ia64 ppc64 sparc64 s390x
+sed -i.lib64 's#$(prefix)/lib#$(prefix)/lib64#' Make.rules
+%endif
cd util
install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
@@ -44,50 +47,37 @@ install -pm 644 ttusb_dec_reset/README ../README.ttusb_dec_reset
chmod 644 dvbnet/net_start.*
cd ..
-rm -rf include
-
-f=util/szap/channels.conf-dvbc-berlin
-iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-
-sed -i -e 's/\r//g' util/scan/dvb-c/hu-Digikabel util/scan/dvb-t/uk-Aberdare
-
-
%build
-make CC="%{__cc}" # %{?_smp_mflags}
-make %{?_smp_mflags} CC="%{__cc}" -C util/ttusb_dec_reset
-
+make %{?_smp_mflags} V=1
%install
-rm -rf $RPM_BUILD_ROOT
-cd util
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 av7110_loadkeys/av7110_loadkeys $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 av7110_loadkeys/evtest $RPM_BUILD_ROOT%{_bindir}/av7110_evtest
-install -pm 755 dvbdate/dvbdate $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 dvbnet/dvbnet $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 dvbtraffic/dvbtraffic $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 scan/scan $RPM_BUILD_ROOT%{_bindir}/scandvb
-install -pm 755 szap/?zap $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 szap/femon $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 ttusb_dec_reset/ttusb_dec_reset $RPM_BUILD_ROOT%{_bindir}
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/dvb-apps
-cp -pR scan/dvb-? scan/atsc av7110_loadkeys/*.rc{5,mm} \
- $RPM_BUILD_ROOT%{_datadir}/dvb-apps
-cd ..
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+#Remove static libraries
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
-%doc README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb*
+%doc README COPYING COPYING.LGPL README.* util/szap/channels-conf
%{_bindir}/*
-%{_datadir}/dvb-apps/
-
+%{_datadir}/dvb
+%{_libdir}/libdvbapi.so
+%{_libdir}/libdvbcfg.so
+%{_libdir}/libdvben50221.so
+%{_libdir}/libdvbsec.so
+%{_libdir}/libucsi.so
+# Exclude for the moment as they're not used by shipped binaries
+%exclude %{_libdir}/libesg.so
+%exclude %{_includedir}/*
%changelog
+* Sat Nov 12 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.1.2-0.d4e8bf5658ce
+- Move to hg snapshot d4e8bf5658ce
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 6097df8..6986276 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2
-2b9872664c9d2344360e69ccc239cc86 dvb-apps-tuningfiles-20100605.tar.bz2
+c06d743420e1678f17824099ed22e907 d4e8bf5658ce.tar.bz2
More information about the scm-commits
mailing list