Attachment #19679 for bug #34937

View | Details | Raw Unified | Return to bug 34937
Collapse All | Expand All

Lines 7-12 Link Here

(-)ump/Makefile (-2 / +5 lines)
7		7
8	PORTNAME= ump	8	PORTNAME= ump
9	PORTVERSION= 1.10	9	PORTVERSION= 1.10
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/ \	12	MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/ \
12	http://www.geocities.com/SiliconValley/Lab/2826/1-10/ \	13	http://www.geocities.com/SiliconValley/Lab/2826/1-10/ \
Lines 23-31 Link Here
23	RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \	24	RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \
24	${X11BASE}/bin/mozilla:${PORTSDIR}/www/mozilla	25	${X11BASE}/bin/mozilla:${PORTSDIR}/www/mozilla
25		26
26	BZ2DIST= TiMidity++-2.10.4.tar.bz2	27	BZ2DIST= TiMidity++-${TIMIDITY_VERSION}.tar.bz2
27	ZDIST= unix-sdk-3.0b5.tar.Z ump_with_volume.tar.Z timdiffs.tar.Z	28	ZDIST= unix-sdk-3.0b5.tar.Z ump_with_volume.tar.Z timdiffs.tar.Z
28		29
		30	TIMIDITY_VERSION= 2.11.3
		31
29	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --enable-ump	33	CONFIGURE_ARGS= --enable-ump
31	USE_GMAKE= yes	34	USE_GMAKE= yes
Lines 35-41 Link Here
35	EXTRA_PATCHES= ${.CURDIR}/../../audio/timidity++/files/*	38	EXTRA_PATCHES= ${.CURDIR}/../../audio/timidity++/files/*
36	PKGDIR= ${.CURDIR}	39	PKGDIR= ${.CURDIR}
37	DIST_SUBDIR= timidity	40	DIST_SUBDIR= timidity
38	WRKSRC= ${WRKDIR}/TiMidity++-2.10.4	41	WRKSRC= ${WRKDIR}/TiMidity++-${TIMIDITY_VERSION}
39		42
40	# USE_MOTIF= yes	43	# USE_MOTIF= yes
41	# CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}"	44	# CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}"

Lines 1-4 Link Here

(-)ump/distinfo (-1 / +1 lines)
1	MD5 (timidity/TiMidity++-2.10.4.tar.bz2) = 8e69753b7e71055e61aeb3c234048f1e	1	MD5 (timidity/TiMidity++-2.11.3.tar.bz2) = 72f6624d467b61c69b8ec9ce002c21a8
2	MD5 (timidity/unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e	2	MD5 (timidity/unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e
3	MD5 (timidity/ump_with_volume.tar.Z) = 73c429e79e23b2d43906dddc594cc53b	3	MD5 (timidity/ump_with_volume.tar.Z) = 73c429e79e23b2d43906dddc594cc53b
4	MD5 (timidity/timdiffs.tar.Z) = efe668b0f7093d21294d6b03cec37b85	4	MD5 (timidity/timdiffs.tar.Z) = efe668b0f7093d21294d6b03cec37b85

Line 0 Link Here

(-)ump/files/patch-timidity::Makefile.in (+10 lines)
	1	--- timidity/Makefile.in.orig Fri Jan 18 07:43:16 2002
	2	+++ timidity/Makefile.in Fri Feb 15 03:08:51 2002
	3	@@ -291,6 +291,7 @@
	4	@ENABLE_W32GUI_TRUE@ $(top_builddir)/utils/libutils.a \
	5	@ENABLE_W32GUI_TRUE@ $(top_builddir)/interface/w32g_res.res
	6	@ENABLE_W32GUI_FALSE@timidity_DEPENDENCIES = \
	7	+@ENABLE_W32GUI_FALSE@ $(SYSEXTRAS:.c=.o) \
	8	@ENABLE_W32GUI_FALSE@ $(top_builddir)/interface/libinterface.a \
	9	@ENABLE_W32GUI_FALSE@ $(top_builddir)/libarc/libarc.a \
	10	@ENABLE_W32GUI_FALSE@ $(top_builddir)/libunimod/libunimod.a \




--- 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 @@
 /*

 #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 */

Return to bug 34937

Lines 1-4 Link Here

(-)ump/files/patch-ump::UnixShell.c (-1 / +23 lines)
1	--- ump/UnixShell.c.orig.1 Thu Nov 15 20:47:15 2001	1	--- ump/UnixShell.c.orig Thu Nov 15 20:47:15 2001
2	+++ ump/UnixShell.c Thu Nov 15 20:50:37 2001	2	+++ ump/UnixShell.c Thu Nov 15 20:50:37 2001
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	/*	4	/*
Lines 9-14 Link Here
9	#include <X11/Xlib.h> /* Xlib */	9	#include <X11/Xlib.h> /* Xlib */
10	#include <X11/Intrinsic.h> /* Xt */	10	#include <X11/Intrinsic.h> /* Xt */
11	#include <X11/StringDefs.h> /* "callback" */	11	#include <X11/StringDefs.h> /* "callback" */
		12	--- ump/UnixShell.c.orig Fri Feb 15 02:42:28 2002
		13	+++ ump/UnixShell.c Fri Feb 15 02:42:48 2002
		14	@@ -144,8 +144,8 @@
		15	int argc = 0;
		16
		17	argv[argc++] = "timidity";
		18	-#ifdef AU_ALSA
		19	- argv[argc++] = "-Os";
		20	+#ifdef AU_ESD
		21	+ argv[argc++] = "-Oe";
		22	#else
		23	argv[argc++] = "-Od";
		24	#endif
		25	@@ -151,7 +151,7 @@
		26	#endif
		27
		28	if(timid_ump_rate <= 0)
		29	- argv[argc++] = eightKFlag ? "-s8000": "-s22050"; /* check if the user specified 8K rate */
		30	+ argv[argc++] = eightKFlag ? "-s8000": "-s44100"; /* check if the user specified 8K rate */
		31	else
		32	{
		33	sprintf(opt_rate, "-s%d", timid_ump_rate);
12	@@ -230,7 +230,7 @@	34	@@ -230,7 +230,7 @@
13	int loop; /* 0 means play only once, non-zero means loop forever */	35	int loop; /* 0 means play only once, non-zero means loop forever */