From 9648c9f69455b49c826513c7121f875e8d4b1551 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 14 Aug 2004 11:15:54 +0000 Subject: [PATCH] Stefan Fiedler: fix rivatv: disable warning about mismatching kernel gcc, install modules in /lib/modules//rivatv. fix dvdauthor for gcc34. fix avview for gcc34. add package m2vrequantiser (2004-01-22). [2004080212484914022] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3844 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/stf/avview/gcc34.patch | 28 ++++++++++++ package/stf/dvdauthor/gcc34.patch | 20 +++++++++ package/stf/m2vrequantiser/gcc34.patch | 45 +++++++++++++++++++ .../stf/m2vrequantiser/m2vrequantiser.conf | 29 ++++++++++++ .../stf/m2vrequantiser/m2vrequantiser.desc | 44 ++++++++++++++++++ .../stf/rivatv/enable-all-kernel-gccs.patch | 11 +++++ package/stf/rivatv/module-install-path.patch | 16 +++++++ 7 files changed, 193 insertions(+) create mode 100644 package/stf/avview/gcc34.patch create mode 100644 package/stf/dvdauthor/gcc34.patch create mode 100644 package/stf/m2vrequantiser/gcc34.patch create mode 100644 package/stf/m2vrequantiser/m2vrequantiser.conf create mode 100644 package/stf/m2vrequantiser/m2vrequantiser.desc create mode 100644 package/stf/rivatv/enable-all-kernel-gccs.patch create mode 100644 package/stf/rivatv/module-install-path.patch diff --git a/package/stf/avview/gcc34.patch b/package/stf/avview/gcc34.patch new file mode 100644 index 000000000..660e99678 --- /dev/null +++ b/package/stf/avview/gcc34.patch @@ -0,0 +1,28 @@ +diff -dur avview-0.80.3/alsa.c avview-0.80.3-patch/alsa.c +--- avview-0.80.3/alsa.c 2004-01-03 18:17:58.000000000 +0000 ++++ avview-0.80.3-patch/alsa.c 2004-07-12 23:32:34.000000000 +0000 +@@ -297,7 +297,6 @@ + } + Tcl_ListObjAppendElement(interp,list,list2); + break; +- default: + } + Tcl_ListObjAppendElement(interp, ans, list); + j++; +Nur in avview-0.80.3-patch: alsa.c~. +diff -dur avview-0.80.3/vbi.c avview-0.80.3-patch/vbi.c +--- avview-0.80.3/vbi.c 2004-01-03 18:18:03.000000000 +0000 ++++ avview-0.80.3-patch/vbi.c 2004-07-15 23:37:56.000000000 +0000 +@@ -98,10 +98,10 @@ + Tcl_VarEval(data->interp, data->event_command, " aspect {}", NULL); + break; + +- default: ++ + } + break; +- default: ++ + } + } + diff --git a/package/stf/dvdauthor/gcc34.patch b/package/stf/dvdauthor/gcc34.patch new file mode 100644 index 000000000..fb268cd03 --- /dev/null +++ b/package/stf/dvdauthor/gcc34.patch @@ -0,0 +1,20 @@ +diff -dur dvdauthor-0.6.10/src/dvdvob.c dvdauthor-0.6.10-patch/src/dvdvob.c +--- dvdauthor-0.6.10/src/dvdvob.c 2004-03-14 21:13:26.000000000 +0000 ++++ dvdauthor-0.6.10-patch/src/dvdvob.c 2004-07-12 23:24:43.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* ++/* + * Copyright (C) 2002 Scott Smith (trckjunky@users.sourceforge.net) + * + * This program is free software; you can redistribute it and/or modify +@@ -1148,8 +1148,8 @@ + printpts(pts1); + fprintf(stderr,"\n"); + ach->audpts[ach->numaudpts-1].pts[1]=pts0; +- noshow: + } ++ noshow: + ach->audpts[ach->numaudpts].pts[0]=pts0; + ach->audpts[ach->numaudpts].pts[1]=pts1; + ach->audpts[ach->numaudpts].sect=cursect; +Nur in dvdauthor-0.6.10-patch/src: dvdvob.c~. diff --git a/package/stf/m2vrequantiser/gcc34.patch b/package/stf/m2vrequantiser/gcc34.patch new file mode 100644 index 000000000..2d30a7860 --- /dev/null +++ b/package/stf/m2vrequantiser/gcc34.patch @@ -0,0 +1,45 @@ +Nur in M2VRequantiser-patch: a.out. +Nur in M2VRequantiser-patch: M2VRequantiser. +diff -dur M2VRequantiser/main.c M2VRequantiser-patch/main.c +--- M2VRequantiser/main.c 2004-01-21 23:48:32.000000000 +0000 ++++ M2VRequantiser-patch/main.c 2004-07-17 20:02:33.000000000 +0000 +@@ -12,7 +12,7 @@ + + #define NDEBUG // turns off asserts + #define REMOVE_BYTE_STUFFING // removes series of 0x00 +-#define USE_GLOBAL_REGISTER // assign registers to bit buffers ++//#define USE_GLOBAL_REGISTER // assign registers to bit buffers + #define MAX_ERRORS 0 // if above copy slice + + //#define CHANGE_BRIGHTNESS //add a param to command line, changing brightness: _will_not_recompress_, disables max_errors +@@ -120,7 +120,7 @@ + register int inbitcnt asm ("r13"); + register int outbitcnt asm ("r14"); + register uint32 inbitbuf asm ("r15"); +- register uint32 outbitbuf asm ("r16"); ++ register uint32 outbitbuf asm ("r16"); + #else + static int inbitcnt, outbitcnt; + static uint32 inbitbuf, outbitbuf; +Nur in M2VRequantiser-patch: main.c~. +Nur in M2VRequantiser-patch: makeTable. +diff -dur M2VRequantiser/makeTable.c M2VRequantiser-patch/makeTable.c +--- M2VRequantiser/makeTable.c 2003-12-30 05:17:01.000000000 +0000 ++++ M2VRequantiser-patch/makeTable.c 2004-07-17 20:10:57.000000000 +0000 +@@ -18,8 +18,12 @@ + int alt_table = 0; + int fill_table = 1; + +- if (argc != 3) return 2; +- ++ if (argc != 3) ++ { ++ printf("Usage: %s { norm | alt | run } OutputFile\n", argv[0]); ++ return 2; ++ } ++ + if (strcmp(argv[1], "norm") == 0) alt_table = 0; + else if (strcmp(argv[1], "alt") == 0) alt_table = 1; + else if (strcmp(argv[1], "run") == 0) fill_table = 0; +Nur in M2VRequantiser-patch: makeTable.c~. +Nur in M2VRequantiser-patch: test.txt. diff --git a/package/stf/m2vrequantiser/m2vrequantiser.conf b/package/stf/m2vrequantiser/m2vrequantiser.conf new file mode 100644 index 000000000..c786dc2b8 --- /dev/null +++ b/package/stf/m2vrequantiser/m2vrequantiser.conf @@ -0,0 +1,29 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/stf/ffmpeg/ffmpeg.conf +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +M2V_custom () +{ + $CC main.c -lm -o M2VRequantiser + $CC makeTable.c -o makeTable + cp -va M2VRequantiser makeTable $root/usr/bin +} +custmain=M2V_custom diff --git a/package/stf/m2vrequantiser/m2vrequantiser.desc b/package/stf/m2vrequantiser/m2vrequantiser.desc new file mode 100644 index 000000000..cdaf77383 --- /dev/null +++ b/package/stf/m2vrequantiser/m2vrequantiser.desc @@ -0,0 +1,44 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/stf/ffmpeg/ffmpeg.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] MPEG requantiser - shrinks MPEG video files + +[T] M2Vrequantiser shrinks MPEG video files by applying requantisation, which is +[T] faster and gives better results than complete recompression. A factor that +[T] determines the size (and quality) of shrunk video can be given at the +[T] command line. + +[U] http://metakine.com + +[A] Antoine Missout + +[M] Stefan Fiedler + +[C] extra/multimedia + +[L] GPL +[S] Stable +[V] 2004-01-22 +[P] X -----5---9 650.000 + +[D] 0 M2VRequantiser.tgz http://metakine.com/files/ diff --git a/package/stf/rivatv/enable-all-kernel-gccs.patch b/package/stf/rivatv/enable-all-kernel-gccs.patch new file mode 100644 index 000000000..5b835a22b --- /dev/null +++ b/package/stf/rivatv/enable-all-kernel-gccs.patch @@ -0,0 +1,11 @@ +--- rivatv-0.8.5/configure 2004-05-28 12:38:27.000000000 +0000 ++++ rivatv-0.8.5-patch/configure 2004-07-16 00:14:10.000000000 +0000 +@@ -229,7 +229,7 @@ + echo "*** If you are going to use the running kernel (compiled with" + echo "*** gcc version $kgcc) with RivaTV (will be compiled" + echo "*** with gcc version $bgcc) you may experience system crashes." +- WARNINGS=`expr $WARNINGS + 1` ++# WARNINGS=`expr $WARNINGS + 1` + fi + + # Check for write access to kernel sources diff --git a/package/stf/rivatv/module-install-path.patch b/package/stf/rivatv/module-install-path.patch new file mode 100644 index 000000000..c91921592 --- /dev/null +++ b/package/stf/rivatv/module-install-path.patch @@ -0,0 +1,16 @@ +--- ./Makefile.in 2004-03-15 21:21:17.000000000 +0100 ++++ ./Makefile.in.patch 2004-08-02 12:08:40.000000000 +0200 +@@ -17,11 +17,11 @@ + + + # Location of your module tree +-MODULES = /lib/modules/@UTS_RELEASE@/kernel ++MODULES = /lib/modules/@UTS_RELEASE@ + + + # Destination directory of the built modules within $(MODULES). +-MOD_DEST = /drivers/media/video ++MOD_DEST = /rivatv + + #============================================================================= + #