Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
201660c85b
6 changed files with 55 additions and 38 deletions
  1. +33
    -0
      package/stf/rivatv/disable-ckeck-proc.patch
  2. +14
    -13
      package/stf/rivatv/disable-depmod.patch
  3. +6
    -4
      package/stf/rivatv/disable-mknod-video.patch
  4. +0
    -19
      package/stf/rivatv/kernel_fpu_begin.patch
  5. +1
    -1
      package/stf/rivatv/rivatv.conf
  6. +1
    -1
      package/stf/rivatv/rivatv.desc

+ 33
- 0
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

+ 14
- 13
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); \

+ 6
- 4
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~.

+ 0
- 19
package/stf/rivatv/kernel_fpu_begin.patch

@ -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)
{

+ 1
- 1
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"

+ 1
- 1
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/

Loading…
Cancel
Save