1 diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/Imakefile AfterStep-APPS-991125/ascd-0.12.1/ascd/Imakefile
2 --- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/Imakefile Fri Nov 30 13:20:26 2001
3 +++ AfterStep-APPS-991125/ascd-0.12.1/ascd/Imakefile Fri Nov 30 13:24:04 2001
7 @echo "Installing themes..."
8 - @cp themes/default.tar $(THEMESDIR)
9 - @cp themes/sands.tar $(THEMESDIR)
10 - @cp themes/clean.tar $(THEMESDIR)
11 - @cp themes/vintage.tar $(THEMESDIR)
12 - @cp themes/night.tar $(THEMESDIR)
13 - @cd $(THEMESDIR) ; tar xf default.tar
14 - @cd $(THEMESDIR) ; tar xf sands.tar
15 - @cd $(THEMESDIR) ; tar xf clean.tar
16 - @cd $(THEMESDIR) ; tar xf vintage.tar
17 - @cd $(THEMESDIR) ; tar xf night.tar
18 - @cd $(THEMESDIR) ; rm default.tar
19 - @cd $(THEMESDIR) ; rm sands.tar
20 - @cd $(THEMESDIR) ; rm clean.tar
21 - @cd $(THEMESDIR) ; rm vintage.tar
22 - @cd $(THEMESDIR) ; rm night.tar
23 - @cd $(THEMESDIR) ; rm .dir
24 - @cd $(THEMESDIR) ; /bin/ls -1 > /tmp/.dir
25 - @cd $(THEMESDIR) ; cp /tmp/.dir .
26 + @cp themes/default.tar $(DESTDIR)$(THEMESDIR)
27 + @cp themes/sands.tar $(DESTDIR)$(THEMESDIR)
28 + @cp themes/clean.tar $(DESTDIR)$(THEMESDIR)
29 + @cp themes/vintage.tar $(DESTDIR)$(THEMESDIR)
30 + @cp themes/night.tar $(DESTDIR)$(THEMESDIR)
31 + @cd $(DESTDIR)$(THEMESDIR) ; tar xf default.tar
32 + @cd $(DESTDIR)$(THEMESDIR) ; tar xf sands.tar
33 + @cd $(DESTDIR)$(THEMESDIR) ; tar xf clean.tar
34 + @cd $(DESTDIR)$(THEMESDIR) ; tar xf vintage.tar
35 + @cd $(DESTDIR)$(THEMESDIR) ; tar xf night.tar
36 + @cd $(DESTDIR)$(THEMESDIR) ; rm default.tar
37 + @cd $(DESTDIR)$(THEMESDIR) ; rm sands.tar
38 + @cd $(DESTDIR)$(THEMESDIR) ; rm clean.tar
39 + @cd $(DESTDIR)$(THEMESDIR) ; rm vintage.tar
40 + @cd $(DESTDIR)$(THEMESDIR) ; rm night.tar
41 + @cd $(DESTDIR)$(THEMESDIR) ; rm .dir
42 + @cd $(DESTDIR)$(THEMESDIR) ; /bin/ls -1 > /tmp/.dir
43 + @cd $(DESTDIR)$(THEMESDIR) ; cp /tmp/.dir .
45 diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/configure AfterStep-APPS-991125/ascd-0.12.1/ascd/configure
46 --- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/configure Fri Nov 30 13:20:26 2001
47 +++ AfterStep-APPS-991125/ascd-0.12.1/ascd/configure Fri Nov 30 13:24:04 2001
49 echo "#define CTHDIR /usr/local/share/AScd" >> dirs.h
50 echo "Pixmaps will be installed in /usr/local/share/AScd."
52 - *) echo "#define \"$THDIR\"" >> config.h
53 + *) echo "#define THDIR \"$THDIR\"" >> config.h
54 echo "#define CTHDIR $THDIR" >> dirs.h
55 echo "Pixmaps will be installed in $THDIR."
57 diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h
58 --- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h Fri Nov 30 13:20:26 2001
59 +++ AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h Fri Nov 30 13:22:40 2001
61 * if there is no support.
64 -# include <bytesex.h>
67 * XXX could this be a problem? The results are only 0 and 1 because
68 diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h.compile AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h.compile
69 --- AfterStep-APPS-991125/ascd-0.12.1.orig/ascd/workman/wm_cdda.h.compile Thu Jan 1 00:00:00 1970
70 +++ AfterStep-APPS-991125/ascd-0.12.1/ascd/workman/wm_cdda.h.compile Sun Feb 14 09:50:46 1999
77 + * This file is part of WorkMan, the civilized CD player library
78 + * (c) 1991-1997 by Steven Grimm (original author)
79 + * (c) by Dirk Försterling (current 'author' = maintainer)
80 + * The maintainer can be contacted by his e-mail address:
81 + * milliByte@DeathsDoor.com
83 + * This library is free software; you can redistribute it and/or
84 + * modify it under the terms of the GNU Library General Public
85 + * License as published by the Free Software Foundation; either
86 + * version 2 of the License, or (at your option) any later version.
88 + * This library is distributed in the hope that it will be useful,
89 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
90 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
91 + * Library General Public License for more details.
93 + * You should have received a copy of the GNU Library General Public
94 + * License along with this library; if not, write to the Free
95 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
100 + * Information about a particular block of CDDA data.
103 + unsigned char status; /* see below */
104 + unsigned char track;
105 + unsigned char index;
106 + unsigned char minute;
107 + unsigned char second;
108 + unsigned char frame;
110 + /* Average volume levels, for level meters */
111 + unsigned char lev_chan0;
112 + unsigned char lev_chan1;
114 + /* Current volume setting (0-255) */
115 + unsigned char volume;
117 + /* Current balance setting (0-255, 128 = balanced) */
118 + unsigned char balance;
122 + * cdda_block status codes.
124 +#define WMCDDA_ERROR 0 /* Couldn't read CDDA from disc */
125 +#define WMCDDA_OK 1 /* Read this block successfully (raw data) */
126 +#define WMCDDA_PLAYED 2 /* Just played the block in question */
127 +#define WMCDDA_STOPPED 3 /* Block data invalid; we've just stopped */
128 +#define WMCDDA_ACK 4 /* Acknowledgement of command from parent */
129 +#define WMCDDA_DONE 5 /* Chunk of data is done playing */
130 +#define WMCDDA_EJECTED 6 /* Disc ejected or offline */
133 + * Enable or disable CDDA building depending on platform capabilities, and
134 + * determine endianness based on architecture. (Gross!)
136 + * For header-comfort, the macros LITTLE_ENDIAN and BIG_ENDIAN had to be
137 + * renamed. At least Linux does have bytesex.h and endian.h for easy
138 + * byte-order examination.
143 +# include <sys/types.h>
144 +# include <sys/cdio.h>
149 +# define WM_LITTLE_ENDIAN 1
150 +# define WM_BIG_ENDIAN 0
152 +# define WM_BIG_ENDIAN 1
153 +# define WM_LITTLE_ENDIAN 0
160 +/* Linux only allows definition of endianness, because there's no
161 + * standard interface for CDROM CDDA functions that aren't available
162 + * if there is no support.
165 +# include <bytesex.h>
166 +# include <endian.h>
168 + * XXX could this be a problem? The results are only 0 and 1 because
169 + * of the ! operator. How about other linux compilers than gcc ?
171 +# define WM_LITTLE_ENDIAN !(__BYTE_ORDER - __LITTLE_ENDIAN)
172 +# define WM_BIG_ENDIAN !(__BYTE_ORDER - __BIG_ENDIAN)
176 + * The following code shouldn't take effect now.
177 + * In 1998, the WorkMan platforms don't support __PDP_ENDIAN
182 +#if !WM_LITTLE_ENDIAN
184 +# error yet unsupported architecture
185 + foo bar this is to stop the compiler.
188 +#endif /* WM_CDDA_H */
189 diff -Naur AfterStep-APPS-991125/ascd-0.12.1.orig/libworkman/Config AfterStep-APPS-991125/ascd-0.12.1/libworkman/Config
190 --- AfterStep-APPS-991125/ascd-0.12.1.orig/libworkman/Config Fri Nov 30 13:20:26 2001
191 +++ AfterStep-APPS-991125/ascd-0.12.1/libworkman/Config Fri Nov 30 13:24:04 2001
193 XCOMM -------------------------------------------------------------------
194 XCOMM LibWorkMan include file target relative to DSTDIR
195 XCOMM -------------------------------------------------------------------
196 -WMINCDIR=/usr/local/include/workman
197 +WMINCDIR=/usr/X11R6/include/workman
201 XCOMM -------------------------------------------------------------------
202 #define SHARED_LIBWORKMAN
203 -LIBDIR=/usr/local/lib
204 +LIBDIR=/usr/X11R6/lib