1
--- kdemultimedia-2.2.0-final.orig/kmidi/BITMAPS/Makefile.am
2
+++ kdemultimedia-2.2.0-final/kmidi/BITMAPS/Makefile.am
4
off.xbm on.xbm pause.xbm play.xbm prev.xbm quit.xbm restart.xbm \
5
stop.xbm tback.xbm timidity.xbm tnext.xbm tpause.xbm tprev.xbm tquit.xbm
7
-TIMID_DIR = $(kde_datadir)/kmidi/config
8
+TIMID_DIR = $(kde_datadir)/kmidi
10
EXTRA_DIST = $(CONFIG_FILES)
12
--- kdemultimedia-2.2.0-final.orig/kmidi/Makefile.am
13
+++ kdemultimedia-2.2.0-final/kmidi/Makefile.am
15
# Where to install the patches, config files, and MIDI files.
16
# If you change this, it's a good idea to recompile the binary,
17
# or you'll need to invoke timidity with the -L option.
18
-TIMID_DIR = $(kde_datadir)/kmidi/config
19
+TIMID_DIR = $(kde_datadir)/kmidi
22
bin_PROGRAMS = kmidi sf2cfg
23
--- kdemultimedia-2.2.0-final.orig/kmidi/config.h
24
+++ kdemultimedia-2.2.0-final/kmidi/config.h
26
/* You could specify a complete path, e.g. "/etc/timidity.cfg", and
27
then specify the library directory in the configuration file. */
29
-#define CONFIG_FILE TIMID_DIR "/timidity.cfg"
30
+#define CONFIG_FILE "/etc/kde2/timidity.cfg"
33
-#define CONFIG_FILE DEFAULT_PATH "/timidity.cfg"
34
+#define CONFIG_FILE "/etc/kde2/timidity.cfg"
38
--- kdemultimedia-2.2.0-final.orig/kmidi/TIMIDITY/Makefile.am
39
+++ kdemultimedia-2.2.0-final/kmidi/TIMIDITY/Makefile.am
41
# Where to install the patches, config files, and MIDI files.
42
# If you change this, it's a good idea to recompile the binary,
43
# or you'll need to invoke timidity with the -L option.
44
-TIMID_DIR = /$(kde_datadir)/kmidi/config
45
+TIMID_DIR = $(kde_datadir)/kmidi
47
appsdir = $(kde_appsdir)/Multimedia
48
apps_DATA = timidity.desktop
50
-bin_PROGRAMS = timidity
51
+bin_PROGRAMS = ktimidity
53
-timidity_SOURCES = timidity.c common.c readmidi.c playmidi.c resample.c mix.c instrum.c \
54
+ktimidity_SOURCES = timidity.c common.c readmidi.c playmidi.c resample.c mix.c instrum.c \
55
tables.c controls.c output.c filter.c \
56
wave_a.c raw_a.c dumb_c.c fffload.c \
58
--- kdemultimedia-2.2.0-final.orig/kmidi/TIMIDITY/timidity.desktop
59
+++ kdemultimedia-2.2.0-final/kmidi/TIMIDITY/timidity.desktop
61
Name[vi]=Tổng hợp TiMidity
62
Name[zh_CN.GB2312]=TiMidity 合成器
63
DocPath=kmidi/index.html
69
--- kdemultimedia-2.2.0-final.orig/kmidi/config/Makefile.am
70
+++ kdemultimedia-2.2.0-final/kmidi/config/Makefile.am
73
CONFIG_FILES = gravis.cfg gsdrum.cfg midia.cfg mt32.cfg timidity.cfg wowpats.cfg chaos12-voices chaos8-voices megadrum megainst pila-voices sound-canvas-drums guitar piano piano+guitar drums $(TCLFILES)
75
-TIMID_DIR = $(kde_datadir)/kmidi/config
76
+TIMID_DIR = $(kde_confdir)/kmidi
78
EXTRA_DIST = $(CONFIG_FILES)
83
- $(mkinstalldirs) $(TIMID_DIR)
84
+ $(mkinstalldirs) $(DESTDIR)$(TIMID_DIR)
85
@for i in $(CONFIG_FILES); do \
86
- if [ ! -f "$(TIMID_DIR)/$$i" ] ; then \
87
+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/$$i" ] ; then \
88
echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)"; \
89
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR) ; \
92
- if [ ! -f "$(TIMID_DIR)/tclIndex" -a -f "$(TIMID_DIR)/misc.tcl" ] ; then \
93
- (cd $(TIMID_DIR); sed -e s@%TCL_DIR%@$(TIMID_DIR)@g $(srcdir)/tkmidity.ptcl > tkmidity.tcl ) ; \
94
- (cd $(TIMID_DIR); echo 'auto_mkindex . *.tcl; exit' | tclsh ) ; \
95
+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/tclIndex" -a -f "$(DESTDIR)$(TIMID_DIR)/misc.tcl" ] ; then \
96
+ (cd $(DESTDIR)$(TIMID_DIR); sed -e s@%TCL_DIR%@$(TIMID_DIR)@g $(srcdir)/tkmidity.ptcl > tkmidity.tcl ) ; \
97
+ (cd $(DESTDIR)$(TIMID_DIR); echo 'auto_mkindex . *.tcl; exit' | tclsh ) ; \
101
--- kdemultimedia-2.2.0-final.orig/kmidi/config/timidity.cfg
102
+++ kdemultimedia-2.2.0-final/kmidi/config/timidity.cfg
104
# If you've moved things around since compiling, uncomment and edit this to
105
# point to the library directory:
107
-#dir /opt/kde/share/apps/kmidi/config
111
##############################################################################
112
--- kdemultimedia-2.2.0-final.orig/kmidi/config/tkmidity.ptcl
113
+++ kdemultimedia-2.2.0-final/kmidi/config/tkmidity.ptcl
115
-#!/usr/local/bin/wishx -f
118
# TkMidity -- Tcl/Tk Interface for TiMidity
119
# written by Takashi IWAI
120
--- kdemultimedia-2.2.0-final.orig/kmidi/config/tkpanel.tcl
121
+++ kdemultimedia-2.2.0-final/kmidi/config/tkpanel.tcl
123
-#!/usr/local/bin/wishx -f
126
# TkMidity -- Tcl/Tk Interface for TiMidity
127
# written by Takashi IWAI
128
--- kdemultimedia-2.2.0-final.orig/mpeglib/configure.in.in
129
+++ kdemultimedia-2.2.0-final/mpeglib/configure.in.in
134
-AC_MSG_CHECKING(for X11 video extension)
137
- #include <X11/Xlib.h>
138
- #include <X11/extensions/Xvlib.h>
143
-AC_MSG_RESULT($x11_xv)
144
-if test x$x11_xv = xyes; then
145
- AC_DEFINE(X11_XV,1,[Define if you have XFree4.0 XV extension])
149
AC_MSG_CHECKING(for X11 videomode extension)
152
--- kdemultimedia-2.2.0-final.orig/noatun/noatun/modules/kjofol-skin/noatun_kjofol_fixskin.sh
153
+++ kdemultimedia-2.2.0-final/noatun/noatun/modules/kjofol-skin/noatun_kjofol_fixskin.sh
160
--- kdemultimedia-2.2.0-final.orig/admin/config.guess
161
+++ kdemultimedia-2.2.0-final/admin/config.guess
163
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
164
# Free Software Foundation, Inc.
166
-timestamp='2001-03-30'
167
+timestamp='2001-04-20'
169
# This file is free software; you can redistribute it and/or modify it
170
# under the terms of the GNU General Public License as published by
172
rm -f $dummy.c $dummy
173
echo mips-mips-riscos${UNAME_RELEASE}
175
+ Motorola:PowerMAX_OS:*:*)
176
+ echo powerpc-motorola-powermax
178
Night_Hawk:Power_UNIX:*:*)
179
echo powerpc-harris-powerunix
182
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
183
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
184
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
196
if [ -x /usr/sbin/sysversion ] ; then
197
echo ${UNAME_MACHINE}-unknown-osf1mk
201
echo m68k-unknown-openbsd${UNAME_RELEASE}
203
- i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
204
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
205
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
210
echo x86_64-unknown-linux-gnu
214
# The BFD linker knows what the default object file format is, so
215
# first see if it will tell us. cd to the root directory to prevent
216
# problems with other programs or directories called `ld' in the path.
217
@@ -887,14 +890,14 @@
220
case "$ld_supported_emulations" in
223
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
228
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
232
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
236
# that means it is gnuoldld.
237
test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
238
case "${UNAME_MACHINE}" in
244
@@ -944,10 +947,10 @@
246
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
247
# are messed up and put the nodename in both sysname and nodename.
248
- i?86:DYNIX/ptx:4*:*)
249
+ i*86:DYNIX/ptx:4*:*)
250
echo i386-sequent-sysv4
252
- i?86:UNIX_SV:4.2MP:2.*)
253
+ i*86:UNIX_SV:4.2MP:2.*)
254
# Unixware is an offshoot of SVR4, but it has its own version
255
# number series starting with 2...
256
# I am not positive that other SVR4 systems won't match this,
258
# Use sysv4.2uw... so that sysv4* matches it.
259
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
261
- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
262
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
263
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
264
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
265
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
267
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
272
# Fixed at (any) Pentium or better
274
if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
276
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
281
if test -f /usr/options/cb.name; then
282
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
283
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
285
echo ${UNAME_MACHINE}-pc-sysv32
290
echo ${UNAME_MACHINE}-pc-msdosdjgpp
293
@@ -1035,7 +1038,7 @@
294
mc68030:UNIX_System_V:4.*:*)
295
echo m68k-atari-sysv4
297
- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:* | i?86:LynxOS:4.0*:*)
298
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
299
echo i386-unknown-lynxos${UNAME_RELEASE}
301
TSUNAMI:LynxOS:2.*:*)
302
@@ -1146,7 +1149,7 @@
304
echo ${UNAME_MACHINE}-unknown-plan9
308
# If we were able to find `uname', then EMX Unix compatibility
309
# is probably installed.
310
echo ${UNAME_MACHINE}-pc-os2-emx
311
--- kdemultimedia-2.2.0-final.orig/admin/config.sub
312
+++ kdemultimedia-2.2.0-final/admin/config.sub
314
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
315
# Free Software Foundation, Inc.
317
-timestamp='2001-03-30'
318
+timestamp='2001-04-20'
320
# This file is (in principle) common to ALL GNU software.
321
# The presence of a machine in this file suggests that SOME GNU software
323
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
324
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
325
| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
326
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
327
+ | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
329
| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
331
basic_machine=$basic_machine-unknown
333
# We use `pc' rather than `unknown'
334
# because (1) that's what they normally are, and
335
# (2) the word "unknown" tends to confuse beginning users.
336
- i[234567]86 | x86_64)
338
basic_machine=$basic_machine-pc
340
# Object if more than one company name word.
343
# Recognize the basic CPU types with company name.
344
# FIXME: clean up the formatting here.
345
- vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
346
+ vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
347
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
348
| arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
349
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
351
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
352
| clipper-* | orion-* \
353
| sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
354
- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
355
+ | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
356
+ | mips16-* | mips64-* | mipsel-* \
357
| mips64el-* | mips64orion-* | mips64orionel-* \
358
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
359
| mipstx39-* | mipstx39el-* | mcore-* \
360
@@ -506,19 +508,19 @@
361
basic_machine=i370-ibm
363
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
366
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
371
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
376
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
381
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
386
basic_machine=sh-unknown
389
+ sparc | sparcv9 | sparcv9b)
390
basic_machine=sparc-sun
393
@@ -1025,7 +1027,7 @@
396
case $basic_machine in
397
- x86-* | i[34567]86-*)