--- /dev/null
+diff -ru sc/contrib/sasc-ng/dvbloopback/module/config_dvb.pl sc-build/contrib/sasc-ng/dvbloopback/module/config_dvb.pl
+--- sc/contrib/sasc-ng/dvbloopback/module/config_dvb.pl 2012-07-31 21:59:15.715706905 +0200
++++ sc-build/contrib/sasc-ng/dvbloopback/module/config_dvb.pl 2012-09-15 13:29:47.000000000 +0200
+@@ -17,79 +17,12 @@
+ $cmd = "cd config-dvb && make $vars" . ($debug ? "" : "2>/dev/null 1>/dev/null");
+ print "$cmd\n" if($debug);
+
+- #test linux-version >= 2.6.22
+ system("ln -sf chkdvb-2.6.v4l.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found dvbdev.h from 2.6.22 or later\n";
++ print "Assuming kernel 2.6.22 or later\n";
+ `echo "DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);" >> dvbdevwrap.h`;
+ `echo "#define wrap_dvb_reg_adapter(a, b, c) dvb_register_adapter(a, b, c, &dvblb_basedev->dev, adapter_nr)" >> dvbdevwrap.h`;
+ return 0;
+- }
+-
+- #test linux-version >= 2.6.18
+- system("ln -sf chkdvb-2.6.18.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found dvbdev.h from 2.6.18 or later\n";
+- `echo "#define wrap_dvb_reg_adapter(a, b, c) dvb_register_adapter(a, b, c, &dvblb_basedev->dev)" >> dvbdevwrap.h`;
+- return 0;
+- }
+-
+- #test linux-version >= 2.6.14
+- system("ln -sf chkdvb-2.6.14.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found dvbdev.h from 2.6.14 or later\n";
+- `echo "#define wrap_dvb_reg_adapter dvb_register_adapter" >> dvbdevwrap.h`;
+- return 0;
+- }
+-
+- #test linux-version >= 2.6.5
+- system("ln -sf chkdvb-2.6.5.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found dvbdev.h from 2.6.5 or later\n";
+- print "But this is an unsupported kernel!\n";
+- return 1;
+- }
+
+- #maybe kernel headers aren't available. let's use canned dvbdev.h
+- #this is dangerous!
+- $uname = `uname -r`;
+- if($uname =~ /2\.6\.(\d\d)/ && $1 >= 22) {
+- system("ln -sf ../dvbdev-2.6.v4l.h config-dvb/dvbdev.h");
+- system("ln -sf chkdvb-2.6.v4l.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found 2.6.22 or later kernel, but no dvbdev.h\n";
+- print "Using canned header\n";
+- `echo "DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);" >> dvbdevwrap.h`;
+- `echo "#define wrap_dvb_reg_adapter(a, b, c) dvb_register_adapter(a, b, c, &dvblb_basedev->dev, adapter_nr)" >> dvbdevwrap.h`;
+- system("ln -sf dvbdev-2.6.v4l.h dvbdev.h");
+- return 0;
+- }
+- }
+- elsif($uname =~ /2\.6\.2[01]/ ||
+- $uname =~ /2\.6\.1[89]/) {
+- system("ln -sf ../dvbdev-2.6.18.h config-dvb/dvbdev.h");
+- system("ln -sf chkdvb-2.6.18.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found 2.6.18 or later kernel, but no dvbdev.h\n";
+- print "Using canned header\n";
+- `echo "#define wrap_dvb_reg_adapter(a, b, c) dvb_register_adapter(a, b, c, &dvblb_basedev->dev)" >> dvbdevwrap.h`;
+- system("ln -sf dvbdev-2.6.18.h dvbdev.h");
+- return 0;
+- }
+- }
+- elsif($uname =~ /2\.6\.1[4-7]/) {
+- system("ln -sf ../dvbdev-2.6.14.h config-dvb/dvbdev.h");
+- system("ln -sf chkdvb-2.6.14.c config-dvb/chkdvb.c");
+- if(system("$cmd") == 0) {
+- print "Found 2.6.14 or later kernel, but no dvbdev.h\n";
+- print "Using canned header\n";
+- `echo "#define wrap_dvb_reg_adapter dvb_register_adapter" >> dvbdevwrap.h`;
+- system("ln -sf dvbdev-2.6.14.h dvbdev.h");
+- return 0;
+- }
+- }
+- print "Could not identify kernel\n";
+- return 1;
+ }
+
+ exit(test_dvb_adapter(@ARGV));
+--- sc/contrib/sasc-ng/configure.old 2013-01-04 16:08:36.000000000 +0100
++++ sc/contrib/sasc-ng/configure 2013-01-04 16:09:11.000000000 +0100
+@@ -221,6 +221,9 @@
+ elif test -e "${dvb_path}/linux/include/linux/dvb/frontend.h"; then
+ echo "DVB_DIR=${dvb_path}/linux" >> config.mak
+ echo "Using DVB_DIR: ${dvb_path}/linux"
++ elif test -e "${dvb_path}/include/uapi/linux/dvb/frontend.h"; then
++ echo "DVB_DIR=${dvb_path}" >> config.mak
++ echo "Using DVB_DIR: ${dvb_path}"
+ else
+ echo "Could not find DVB headers within $dvb_path"
+ fi
--- /dev/null
+diff -r 29b7b5f231c8 Makefile
+--- a/contrib/sasc-ng/Makefile Sat Jul 21 20:51:33 2012 +0200
++++ b/contrib/sasc-ng/Makefile Tue Jan 08 13:14:13 2013 +0100
+@@ -12,7 +12,7 @@
+ CFLAGS ?= -Wall -D__user=
+
+ ifdef DVB_DIR
+- INCLUDES = -I$(DVB_DIR)/include
++ INCLUDES = -I$(SOURCE_DIR)/include/uapi -I$(SOURCE_DIR)/arch/x86/include -I$(SOURCE_DIR)/include
+ DVB_MOD_DIR = DVB_DIR=$(DVB_DIR)
+ endif
+
+diff -r 29b7b5f231c8 dvbloopback/module/Makefile
+--- a/contrib/sasc-ng/dvbloopback/module/Makefile Sat Jul 21 20:51:33 2012 +0200
++++ b/contrib/sasc-ng/dvbloopback/module/Makefile Tue Jan 08 13:14:13 2013 +0100
+@@ -4,7 +4,9 @@
+ dvbloopback-objs := dvb_loopback.o dvblb_proc.o dvblb_forward.o
+
+ ifdef DVB_DIR
+- EXTRA_CFLAGS = -I$(DVB_DIR) -I$(DVB_DIR)/drivers/media/dvb/dvb-core
++ EXTRA_CFLAGS = -I$(SOURCE_DIR) -I$(SOURCE_DIR)/include \
++ -I$(SOURCE_DIR)/include/uapi -I$(SOURCE_DIR)/arch/x86/include \
++ -I$(DVB_DIR)/drivers/media/dvb-core
+ DVB_SRC = $(DVB_DIR)
+ SYMVER = $(DVB_DIR)/../v4l/Module.symvers
+ have_modver := $(wildcard $(SYMVER))
+diff -r 29b7b5f231c8 dvbloopback/module/config-dvb/Makefile
+--- a/contrib/sasc-ng/dvbloopback/module/config-dvb/Makefile Sat Jul 21 20:51:33 2012 +0200
++++ b/contrib/sasc-ng/dvbloopback/module/config-dvb/Makefile Tue Jan 08 13:14:13 2013 +0100
+@@ -4,7 +4,7 @@
+
+ EXTRA_CFLAGS ?= -Idrivers/media/dvb/dvb-core/ -I$(PWD)
+
+-BUILD_DIR := /lib/modules/$(shell uname -r)/build
++BUILD_DIR ?= /lib/modules/$(shell uname -r)/build
+
+ all: clean
+ make -C $(BUILD_DIR) M=$(PWD) V=1 modules
--- /dev/null
+#!/usr/bin/make -f
+
+kernel_name = "3.7-trunk-amd64"
+kernel_version = "3.7.1-1~experimental.2.sasc1"
+
+DVB_DIR=/home/janpascal/src/tmp/linux/linux-3.7.1
+
+PACKAGE = $(firstword $(shell dh_listpackages))
+TMP = $(CURDIR)/debian/$(PACKAGE)
+
+SUBSTVARS = \
+ -Vkver:Depends="linux-image-$(kernel_name) (=$(kernel_version))" \
+ -Vkver:BuildDepends="linux-headers-$(kernel_name) (=$(kernel_version))"
+
+#SUBSTVARS = -Vkver:BuildDepends="foo (>= 2)"
+
+%:
+ dh $@
+
+override_dh_gencontrol:
+ dh_gencontrol -- $(SUBSTVARS)
+
+override_dh_auto_configure:
+ cd contrib/sasc-ng; ./configure --dvb-dir=$(DVB_DIR)
+
+override_dh_auto_clean:
+ cd contrib/sasc-ng; if [ -r config.mak ]; then make clean module_clean; fi
+
+override_dh_auto_build:
+ cd contrib/sasc-ng; make module; make
+
+override_dh_auto_install:
+ mkdir -p $(TMP)/usr/bin
+ mkdir -p $(TMP)/lib/modules/$(kernel_name)/misc
+ mkdir -p $(TMP)/usr/lib/
+ install -m0755 contrib/sasc-ng/sasc-ng $(TMP)/usr/bin/
+ install -m0644 contrib/sasc-ng/dvbloopback.ko $(TMP)/lib/modules/$(kernel_name)/misc
+ install -m0644 contrib/sasc-ng/sc/PLUGINS/lib/* $(TMP)/usr/lib/
projects / sasc-ng.git / commitdiff