From 201660c85b8063e89fc8256eeea968be2b3a49f5 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 3 Jul 2004 10:02:41 +0000 Subject: [PATCH] Stefan Fiedler: several fixes to rivatv 0.8.5; tail -n1 issue, remove obsolete kernel_fpu_begin.patch, disable i2c-2.8.4 patch for now, disable the following in ./configure: check for proc filesystem, depmod runs, creation of video device files [2004062517045108621] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3480 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/stf/rivatv/disable-ckeck-proc.patch | 33 ++++++++++++++++++++ package/stf/rivatv/disable-depmod.patch | 27 ++++++++-------- package/stf/rivatv/disable-mknod-video.patch | 10 +++--- package/stf/rivatv/kernel_fpu_begin.patch | 19 ----------- package/stf/rivatv/rivatv.conf | 2 +- package/stf/rivatv/rivatv.desc | 2 +- 6 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 package/stf/rivatv/disable-ckeck-proc.patch delete mode 100644 package/stf/rivatv/kernel_fpu_begin.patch diff --git a/package/stf/rivatv/disable-ckeck-proc.patch b/package/stf/rivatv/disable-ckeck-proc.patch new file mode 100644 index 000000000..b02ddea59 --- /dev/null +++ b/package/stf/rivatv/disable-ckeck-proc.patch @@ -0,0 +1,33 @@ +--- rivatv-0.8.5/configure 2004-05-28 12:38:27.000000000 +0000 ++++ rivatv-0.8.5-patch/configure 2004-06-18 12:10:49.000000000 +0000 +@@ -208,20 +208,21 @@ + + echo -n "Checking for /proc... " + +-if test -n "`/bin/mount | grep \"type proc\"`"; then ++#mount none /proc -t proc ++#if test -n "`/bin/mount | grep \"type proc\"`"; then + echo "yes" +-else +- echo "no" +- echo "*** ERROR:" +- echo "*** proc-fs is needed for testing" +- echo "*** We recommend you enable proc-fs in your kernel" +- exit 1 +-fi ++#else ++# echo "no" ++# echo "*** ERROR:" ++# echo "*** proc-fs is needed for testing" ++# echo "*** We recommend you enable proc-fs in your kernel" ++# exit 1 ++#fi + + echo -n "Checking for kernel gcc... " + + kgcc=`cat /proc/version | sed 's/\(.*\)gcc[ -][vV]ersion \([0-9.]*\).*/\2/'` +-bgcc=`gcc -v 2>&1 |tail -1|sed 's/\(.*\)gcc[ -][vV]ersion \([0-9.]*\).*/\2/'` ++bgcc=`gcc -v 2>&1 |tail -n 1|sed 's/\(.*\)gcc[ -][vV]ersion \([0-9.]*\).*/\2/'` + echo $kgcc + + if test "$bgcc" != "$kgcc"; then diff --git a/package/stf/rivatv/disable-depmod.patch b/package/stf/rivatv/disable-depmod.patch index 5159c0d3f..05d531c08 100644 --- a/package/stf/rivatv/disable-depmod.patch +++ b/package/stf/rivatv/disable-depmod.patch @@ -1,16 +1,17 @@ ---- rivatv-0.8.4/Makefile.in 2004-02-24 20:44:54.000000000 +0100 -+++ rivatv-0.8.4.patched/Makefile.in 2004-05-13 23:46:46.000000000 +0200 -@@ -99,7 +99,7 @@ - else \ - install -m 644 -o 0 -g 0 $$ofiles $(MODULES)$(MOD_DEST); \ - fi; \ -- $(DEPMOD); \ -+ \ - echo; \ - echo "RivaTV installed."; \ - echo "To load RivaTV, login as root and \`modprobe rivatv\`."; \ -@@ -107,12 +107,12 @@ - fi +diff -dur rivatv-0.8.5/Makefile.in rivatv-0.8.5-patch/Makefile.in +--- rivatv-0.8.5/Makefile.in 2004-03-15 21:21:17.000000000 +0100 ++++ rivatv-0.8.5-patch/Makefile.in 2004-06-18 09:31:53.000000000 +0200 +@@ -100,7 +100,7 @@ + else \ + install -m 644 -o 0 -g 0 $$ofiles $(MODULES)$(MOD_DEST); \ + fi; \ +- $(DEPMOD); \ ++ \ + echo; \ + echo "RivaTV installed."; \ + echo "To load RivaTV, login as root and \`modprobe rivatv\`."; \ +@@ -108,12 +108,12 @@ + fi install-ko: - install -m 644 -o 0 -g 0 $(TARGETS:.o=.ko) $(MODULES)$(MOD_DEST); \ diff --git a/package/stf/rivatv/disable-mknod-video.patch b/package/stf/rivatv/disable-mknod-video.patch index 717f7f813..2409ae3bf 100644 --- a/package/stf/rivatv/disable-mknod-video.patch +++ b/package/stf/rivatv/disable-mknod-video.patch @@ -1,7 +1,8 @@ ---- rivatv-0.8.4/Makefile.in 2004-02-24 20:44:54.000000000 +0100 -+++ rivatv-0.8.4/Makefile.in.patched 2004-05-12 17:46:56.000000000 +0200 -@@ -69,14 +69,14 @@ - make -C $(KERNEL) SUBDIRS=`pwd`/src EXTRA_CFLAGS="-I`pwd`/bttv @CFLAGS@" modules +diff -dur rivatv-0.8.5/Makefile.in rivatv-0.8.5-patch/Makefile.in +--- rivatv-0.8.5/Makefile.in 2004-06-18 09:34:54.000000000 +0200 ++++ rivatv-0.8.5-patch/Makefile.in 2004-06-18 09:34:25.000000000 +0200 +@@ -70,14 +70,14 @@ + @make -C $(KERNEL) SUBDIRS=`pwd`/src EXTRA_CFLAGS="-I`pwd`/bttv @CFLAGS@" modules devices: - @if ! test -c /dev/video0 ; then \ @@ -23,3 +24,4 @@ config: @-./configure +Nur in rivatv-0.8.5-patch/: Makefile.in~. diff --git a/package/stf/rivatv/kernel_fpu_begin.patch b/package/stf/rivatv/kernel_fpu_begin.patch deleted file mode 100644 index d796f142f..000000000 --- a/package/stf/rivatv/kernel_fpu_begin.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -dur rivatv-0.8.4/src/rivatv-convert.c rivatv-0.8.4-patched/src/rivatv-convert.c ---- rivatv-0.8.4/src/rivatv-convert.c 2004-02-23 17:27:12.000000000 +0100 -+++ rivatv-0.8.4-patched/src/rivatv-convert.c 2004-05-19 20:54:32.000000000 +0200 -@@ -73,7 +73,6 @@ - /* indicates whether MMX code is requested or not */ - int mmx = 1; - --#ifndef RIVATV_DISABLE_CONVERSION - #if defined (__i386__) || defined (__x86_64__) - - /* kernel_fpu_begin() is not exported (properly). Made a local -@@ -105,7 +104,6 @@ - - #endif - #endif --#endif - - void rivatv_detect_mmx (void) - { diff --git a/package/stf/rivatv/rivatv.conf b/package/stf/rivatv/rivatv.conf index 2c35a0c0e..3e9a3f874 100644 --- a/package/stf/rivatv/rivatv.conf +++ b/package/stf/rivatv/rivatv.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -var_append patchfiles " " "$archdir/rivatv-0.8.4-i2c-2.8.4.patch" +#var_append patchfiles " " "$archdir/rivatv-0.8.4-i2c-2.8.4.patch" diff --git a/package/stf/rivatv/rivatv.desc b/package/stf/rivatv/rivatv.desc index c34bd5f3a..d5cfe30f0 100644 --- a/package/stf/rivatv/rivatv.desc +++ b/package/stf/rivatv/rivatv.desc @@ -44,6 +44,6 @@ [P] X -----5---9 650.000 [D] 623051103 rivatv-0.8.5.tar.gz http://dl.sourceforge.net/sourceforge/rivatv/ -[D] 3379469693 rivatv-0.8.4-i2c-2.8.4.patch http://khali.linux-fr.org/devel/i2c/other/ +# [D] 3379469693 rivatv-0.8.4-i2c-2.8.4.patch http://khali.linux-fr.org/devel/i2c/other/ # [D] X rivatv-2004-01-13.tar.bz2 cvs://pserver:anonymous@cvs.rivatv.sourceforge.net:/cvsroot/rivatv::rivatv/!2004-01-13/