1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff -up src/wmmp3-0.12/buttons.c.orig src/wmmp3-0.12/buttons.c
--- src/wmmp3-0.12/buttons.c.orig 1999-10-08 00:40:19.000000000 -0600
+++ src/wmmp3-0.12/buttons.c 2016-08-18 20:02:22.000000000 -0600
@@ -10,7 +10,7 @@
* $Id: mpg123ctl.c,v 1.12 1999/10/08 06:21:41 pcrosby Exp $
*/
-#include "buttons.h"
+#include "main.h"
struct coord {
int x;
diff -up src/wmmp3-0.12/configure.in.orig src/wmmp3-0.12/configure.in
--- src/wmmp3-0.12/configure.in.orig 2000-04-02 17:58:57.000000000 -0600
+++ src/wmmp3-0.12/configure.in 2016-08-18 20:07:40.000000000 -0600
@@ -1,19 +1,22 @@
-AC_INIT(main.c)
-AM_INIT_AUTOMAKE(wmmp3,0.12)
+AC_INIT([adwm],[0.12])
+AC_CONFIG_SRCDIR([main.c])
+AC_USE_SYSTEM_EXTENSIONS
+AM_INIT_AUTOMAKE
+AC_PROG_SED
+AC_PROG_AWK
AC_PROG_CC
+AC_PROG_CPP
AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
+AC_PATH_X
AC_PATH_XTRA
-if test "$x_includes" != "NONE"; then
- CFLAGS="$CFLAGS -I$x_includes"
-fi
+LT_INIT
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([X11],[x11])
+PKG_CHECK_MODULES([XEXT],[xext])
+PKG_CHECK_MODULES([XPM],[xpm])
-if test "$x_libraries" != "NONE"; then
- LDFLAGS="$LDFLAGS -L$x_libraries"
-fi
-
-AC_CHECK_LIB(X11, XOpenDisplay)
-AC_CHECK_LIB(Xext, XShapeCombineMask)
-AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, , , $LIBS)
-
-AC_OUTPUT(Makefile)
+AC_OUTPUT([Makefile])
diff -up src/wmmp3-0.12/main.h.orig src/wmmp3-0.12/main.h
--- src/wmmp3-0.12/main.h.orig 1999-10-25 12:37:19.000000000 -0600
+++ src/wmmp3-0.12/main.h 2016-08-18 20:02:22.000000000 -0600
@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
+#include <ctype.h>
#include "buttons.h"
#include "wmgeneral.h"
diff -up src/wmmp3-0.12/Makefile.am.orig src/wmmp3-0.12/Makefile.am
--- src/wmmp3-0.12/Makefile.am.orig 2016-08-18 20:09:13.000000000 -0600
+++ src/wmmp3-0.12/Makefile.am 2016-08-18 20:09:01.000000000 -0600
@@ -1,4 +1,6 @@
bin_PROGRAMS = wmmp3
wmmp3_SOURCES = main.c mpg123ctl.c wmgeneral.c buttons.c main.h mpg123ctl.h wmgeneral.h buttons.h charset.xpm wmmp3.xpm song_hash.c song_hash.h
+wmmp3_CFLAGS = $(X11_CFLAGS) $(XEXT_CFLAGS) $(XPM_CFLAGS)
+wmmp3_LDADD = $(X11_LIBS) $(XEXT_LIBS) $(XPM_LIBS)
EXTRA_DIST = sample.wmmp3
diff -up src/wmmp3-0.12/mpg123ctl.h.orig src/wmmp3-0.12/mpg123ctl.h
--- src/wmmp3-0.12/mpg123ctl.h.orig 1999-12-08 21:11:23.000000000 -0700
+++ src/wmmp3-0.12/mpg123ctl.h 2016-08-18 20:02:22.000000000 -0600
@@ -21,6 +21,8 @@
#include <string.h>
#include <dirent.h>
#include <stdlib.h>
+#include <time.h>
+#include <ctype.h>
#include "wmgeneral.h"
#include "buttons.h"
#include "song_hash.h"
diff -up src/wmmp3-0.12/song_hash.c.orig src/wmmp3-0.12/song_hash.c
--- src/wmmp3-0.12/song_hash.c.orig 2000-04-02 18:17:22.000000000 -0600
+++ src/wmmp3-0.12/song_hash.c 2016-08-18 20:02:22.000000000 -0600
@@ -1,3 +1,4 @@
+#include "main.h"
#include "song_hash.h"
#define HASH_TABLE_SIZE 11
|