summaryrefslogtreecommitdiff
path: root/www/ump/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/ump/files')
-rw-r--r--www/ump/files/patch-interface-Makefile.in11
-rw-r--r--www/ump/files/patch-libunimod-Makefile.in11
-rw-r--r--www/ump/files/patch-timidity-Makefile.in11
-rw-r--r--www/ump/files/patch-ump-Makefile.in33
-rw-r--r--www/ump/files/patch-ump__UnixShell.c108
-rw-r--r--www/ump/files/patch-utils-Makefile.in11
6 files changed, 0 insertions, 185 deletions
diff --git a/www/ump/files/patch-interface-Makefile.in b/www/ump/files/patch-interface-Makefile.in
deleted file mode 100644
index 7e26e7a8e1ce..000000000000
--- a/www/ump/files/patch-interface-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- interface/Makefile.in.orig Wed May 24 20:40:04 2006
-+++ interface/Makefile.in Wed May 24 20:43:13 2006
-@@ -319,7 +319,7 @@
-
- INCLUDES = \
- -I$(top_srcdir)/timidity \
-- -I$(top_srcdir)/libarc \
-+ -I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
- -I$(top_srcdir)/utils
-
-
diff --git a/www/ump/files/patch-libunimod-Makefile.in b/www/ump/files/patch-libunimod-Makefile.in
deleted file mode 100644
index c138a50afdd7..000000000000
--- a/www/ump/files/patch-libunimod-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libunimod/Makefile.in.orig Wed May 24 20:47:34 2006
-+++ libunimod/Makefile.in Wed May 24 20:50:16 2006
-@@ -317,7 +317,7 @@
- -I$(top_srcdir) \
- -I$(top_srcdir)/timidity \
- -I$(top_srcdir)/utils \
-- -I$(top_srcdir)/libarc \
-+ -I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
- $(EXTRAINCS)
-
-
diff --git a/www/ump/files/patch-timidity-Makefile.in b/www/ump/files/patch-timidity-Makefile.in
deleted file mode 100644
index e646a372fc3c..000000000000
--- a/www/ump/files/patch-timidity-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- timidity/Makefile.in.orig Wed May 24 20:45:31 2006
-+++ timidity/Makefile.in Wed May 24 20:46:31 2006
-@@ -315,7 +315,7 @@
-
- INCLUDES = \
- -I$(top_srcdir) \
-- -I$(top_srcdir)/libarc \
-+ -I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
- -I$(top_srcdir)/libunimod \
- -I$(top_srcdir)/interface \
- -I$(top_srcdir)/utils \
diff --git a/www/ump/files/patch-ump-Makefile.in b/www/ump/files/patch-ump-Makefile.in
deleted file mode 100644
index 7be313ed34ad..000000000000
--- a/www/ump/files/patch-ump-Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- ump/Makefile.in.orig Wed May 24 20:38:23 2006
-+++ ump/Makefile.in Wed May 24 20:39:09 2006
-@@ -183,7 +183,7 @@
- DEF_SHLIB_DIR = -DSHLIB_DIR=\"$(SHLIB_DIR)\"
- BITMAP_DIR = $(TCL_DIR)/bitmaps
-
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libarc -I$(top_srcdir)/interface -I$(top_srcdir)/utils -I$(top_srcdir)/timidity -I$(top_srcdir)/libunimod $(EXTRAINCS)
-+INCLUDES = -I$(top_srcdir) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc -I$(top_srcdir)/interface -I$(top_srcdir)/utils -I$(top_srcdir)/timidity -I$(top_srcdir)/libunimod $(EXTRAINCS)
-
-
- noinst_LIBRARIES = libump.a
-@@ -204,7 +204,7 @@
- UMPOBJS = npunix.o UnixShell.o plugin_c.o timiditymain.o
-
-
--UMPLINKS = $(LIBS) -lXpm
-+UMPLINKS = $(LIBS) -lXpm -larc -L$(LOCALBASE)/lib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h ../interface.h
- CONFIG_CLEAN_FILES =
-@@ -437,11 +437,10 @@
- ump: $(UMP)
-
- $(UMP): $(UMPOBJS)
-- for f in libarc utils interface; do (cd $(top_builddir)/$$f; $(MAKE)); done
-+ for f in utils interface; do (cd $(top_builddir)/$$f; $(MAKE)); done
- cd $(top_builddir)/timidity; $(MAKE) objs
- $(SHLD) -o $(UMP) $(LDFLAGS) $(UMPOBJS) \
- `echo $(top_builddir)/timidity/*.o | sed -e s@$(top_builddir)/timidity/timidity.o@@g` \
-- $(top_builddir)/libarc/*.o \
- $(top_builddir)/utils/*.o \
- $(top_builddir)/interface/*.o \
- $(top_builddir)/libunimod/*.o \
diff --git a/www/ump/files/patch-ump__UnixShell.c b/www/ump/files/patch-ump__UnixShell.c
deleted file mode 100644
index d14be21ca02d..000000000000
--- a/www/ump/files/patch-ump__UnixShell.c
+++ /dev/null
@@ -1,108 +0,0 @@
---- ump/UnixShell.c.orig Thu Nov 15 20:47:15 2001
-+++ ump/UnixShell.c Thu Nov 15 20:50:37 2001
-@@ -38,7 +38,7 @@
- /*
- ** Stuff for the NPP_SetWindow method:
- */
--#ifdef XP_UNIX
-+#if 0
- #include <X11/Xlib.h> /* Xlib */
- #include <X11/Intrinsic.h> /* Xt */
- #include <X11/StringDefs.h> /* "callback" */
---- ump/UnixShell.c.orig Fri Feb 15 02:42:28 2002
-+++ ump/UnixShell.c Fri Feb 15 02:42:48 2002
-@@ -144,8 +144,8 @@
- int argc = 0;
-
- argv[argc++] = "timidity";
--#ifdef AU_ALSA
-- argv[argc++] = "-Os";
-+#ifdef AU_ESD
-+ argv[argc++] = "-Oe";
- #else
- argv[argc++] = "-Od";
- #endif
-@@ -151,7 +151,7 @@
- #endif
-
- if(timid_ump_rate <= 0)
-- argv[argc++] = eightKFlag ? "-s8000": "-s22050"; /* check if the user specified 8K rate */
-+ argv[argc++] = eightKFlag ? "-s8000": "-s44100"; /* check if the user specified 8K rate */
- else
- {
- sprintf(opt_rate, "-s%d", timid_ump_rate);
-@@ -230,7 +230,7 @@
- int loop; /* 0 means play only once, non-zero means loop forever */
-
- /* UNIX data members */
--#ifdef XP_UNIX
-+#if 0
- Widget play, pause, stop, plus, minus; /* button widgets, and their pictures, as well as the logo picture */
- Pixmap logoPixmap, playupPixmap, playdnPixmap, pauseupPixmap, pausednPixmap, stopupPixmap, stopdnPixmap, plusupPixmap, plusdnPixmap, minusupPixmap, minusdnPixmap;
- Display *display; /* needed for XFreePixmap() */
-@@ -344,6 +344,7 @@
- This->pid = -1;
- This->pipes[1] = -1;
- This->pipes[0] = -1;
-+#if 0
- This->logoPixmap = -1;
- This->playupPixmap = -1;
- This->playdnPixmap = -1;
-@@ -355,6 +356,7 @@
- This->plusdnPixmap = -1;
- This->minusupPixmap = -1;
- This->minusdnPixmap = -1;
-+#endif
- This->pluginState = PLUGIN_PLAYING;
- This->loop = 0;
- }
-@@ -422,7 +424,7 @@
- close(This->pipes[1]);
- close(This->pipes[0]);
-
--#ifdef XP_UNIX
-+#if 0
- if(This->logoPixmap != -1)XFreePixmap(This->display, This->logoPixmap);
- if(This->playupPixmap != -1)XFreePixmap(This->display, This->playupPixmap);
- if(This->playdnPixmap != -1)XFreePixmap(This->display, This->playdnPixmap);
-@@ -446,6 +448,7 @@
- return NPERR_NO_ERROR;
- }
-
-+#if 0
- /* give buttons the right look for the state of the plugin */
-
- static void setButtons(PluginInstance* This, pluginPlayState state){
-@@ -610,6 +613,7 @@
- *b = False;
-
- }
-+#endif
-
-
- NPError
-@@ -633,7 +637,7 @@
- * size changes, etc.
- */
-
--#ifdef XP_UNIX
-+#if 0
- {
-
-
-@@ -1050,6 +1054,7 @@
- unuse_UMP(NPN_GetJavaEnv());
- }
-
-+#if 0
- /* functions for LiveConnect */
-
- static void stopSelectedCallback(XtPointer This, XtIntervalId* id){ stopSelected(NULL, This, NULL); }
-@@ -1109,6 +1114,7 @@
- (void) XtAppAddTimeOut(XtWidgetToApplicationContext(Ump->stop), 1, minusSelectedCallback, (XtPointer) This);
-
- }
-+#endif
-
-
-
diff --git a/www/ump/files/patch-utils-Makefile.in b/www/ump/files/patch-utils-Makefile.in
deleted file mode 100644
index 91b151b6b5fa..000000000000
--- a/www/ump/files/patch-utils-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile.in.orig Wed May 24 20:51:07 2006
-+++ utils/Makefile.in Wed May 24 20:57:43 2006
-@@ -314,7 +314,7 @@
- BITMAP_DIR = $(TCL_DIR)/bitmaps
-
- INCLUDES = \
-- -I$(top_srcdir)/libarc \
-+ -I$(LOCALBASE)/include -I$(LOCALBASE)/include/libarc \
- -I$(top_srcdir)/timidity
-
-