Attachment #35023 for bug #56679

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

Lines 7-12 Link Here

(-)xmp/Makefile (+7 lines)
7		7
8	PORTNAME= xmp	8	PORTNAME= xmp
9	PORTVERSION= 2.0.4	9	PORTVERSION= 2.0.4
		10	PORTREVISION= 0
10	CATEGORIES= audio	11	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 34-39 Link Here
34	USE_GNOME+= esound	35	USE_GNOME+= esound
35	CONFIGURE_ARGS+= --enable-esd	36	CONFIGURE_ARGS+= --enable-esd
36	PKGNAMESUFFIX= -esound	37	PKGNAMESUFFIX= -esound
		38	.endif
		39
		40	.if !defined(WITHOUT_XMMS)
		41	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
		42	.else
		43	CONFIGURE_ARGS+= --disable-xmms
37	.endif	44	.endif
38		45
39	MAN1= xmp.1	46	MAN1= xmp.1




*** src/loaders/it_load.c.orig	Wed Sep 10 12:13:18 2003
--- src/loaders/it_load.c	Wed Sep 10 12:11:36 2003
***************
*** 327,340 ****
  
  #define BUILD_ENV(X) { \
  	    fread (&env, 1, sizeof (env), f); \
! 	    xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
! 	    xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
! 	    xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
! 	    xxih[i].##X##ei.npt = env.num; \
! 	    xxih[i].##X##ei.sus = env.slb; \
! 	    xxih[i].##X##ei.sue = env.sle; \
! 	    xxih[i].##X##ei.lps = env.lpb; \
! 	    xxih[i].##X##ei.lpe = env.lpe; \
  	    if (env.num) xx##X##e[i] = calloc (4, env.num); \
  	    for (j = 0; j < env.num; j++) { \
  		L_ENDIAN16 (env.node[j].x); \
--- 327,340 ----
  
  #define BUILD_ENV(X) { \
  	    fread (&env, 1, sizeof (env), f); \
! 	    xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
! 	    xxih[i].X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
! 	    xxih[i].X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
! 	    xxih[i].X##ei.npt = env.num; \
! 	    xxih[i].X##ei.sus = env.slb; \
! 	    xxih[i].X##ei.sue = env.sle; \
! 	    xxih[i].X##ei.lps = env.lpb; \
! 	    xxih[i].X##ei.lpe = env.lpe; \
  	    if (env.num) xx##X##e[i] = calloc (4, env.num); \
  	    for (j = 0; j < env.num; j++) { \
  		L_ENDIAN16 (env.node[j].x); \




*** src/xmms/plugin.c.orig	Sun Jan  7 01:53:15 2001
--- src/xmms/plugin.c	Wed Sep 10 12:17:16 2003
***************
*** 228,234 ****
  	xmp_cfg.filter = TRUE;
  	xmp_cfg.pan_amplitude = 80;
  
! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x)
  
  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
  	if ((cfg = xmms_cfg_open_file(filename))) {
--- 228,234 ----
  	xmp_cfg.filter = TRUE;
  	xmp_cfg.pan_amplitude = 80;
  
! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.x)
  
  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
  	if ((cfg = xmms_cfg_open_file(filename))) {




*** src/xmms/plugin.c.orig	Wed Sep 10 14:13:18 2003
--- src/xmms/plugin.c	Wed Sep 10 14:13:31 2003
***************
*** 558,564 ****
  	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);	\
  	gtk_widget_show(w);						\
  	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);		\
! 	if (xmp_cfg.##o == 1)						\
  		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
  }
  
--- 558,564 ----
  	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);	\
  	gtk_widget_show(w);						\
  	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);		\
! 	if (xmp_cfg.o == 1)						\
  		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
  }
  
***************
*** 658,664 ****
  	if (!cfg)
  		cfg = xmms_cfg_new();
  
! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x)
  
  	CFGWRITEINT (mixing_freq);
  	CFGWRITEINT (force8bit);
--- 658,664 ----
  	if (!cfg)
  		cfg = xmms_cfg_new();
  
! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.x)
  
  	CFGWRITEINT (mixing_freq);
  	CFGWRITEINT (force8bit);

Return to bug 56679

Line 0 Link Here

(-)xmp/files/patch-ai (+33 lines)
	1	*** src/loaders/it_load.c.orig Wed Sep 10 12:13:18 2003
	2	--- src/loaders/it_load.c Wed Sep 10 12:11:36 2003
	3	***************
	4	* 327,340 **
	5
	6	#define BUILD_ENV(X) { \
	7	fread (&env, 1, sizeof (env), f); \
	8	! xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
	9	! xxih[i].##X##ei.flg \|= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
	10	! xxih[i].##X##ei.flg \|= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
	11	! xxih[i].##X##ei.npt = env.num; \
	12	! xxih[i].##X##ei.sus = env.slb; \
	13	! xxih[i].##X##ei.sue = env.sle; \
	14	! xxih[i].##X##ei.lps = env.lpb; \
	15	! xxih[i].##X##ei.lpe = env.lpe; \
	16	if (env.num) xx##X##e[i] = calloc (4, env.num); \
	17	for (j = 0; j < env.num; j++) { \
	18	L_ENDIAN16 (env.node[j].x); \
	19	--- 327,340 ----
	20
	21	#define BUILD_ENV(X) { \
	22	fread (&env, 1, sizeof (env), f); \
	23	! xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
	24	! xxih[i].X##ei.flg \|= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
	25	! xxih[i].X##ei.flg \|= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
	26	! xxih[i].X##ei.npt = env.num; \
	27	! xxih[i].X##ei.sus = env.slb; \
	28	! xxih[i].X##ei.sue = env.sle; \
	29	! xxih[i].X##ei.lps = env.lpb; \
	30	! xxih[i].X##ei.lpe = env.lpe; \
	31	if (env.num) xx##X##e[i] = calloc (4, env.num); \
	32	for (j = 0; j < env.num; j++) { \
	33	L_ENDIAN16 (env.node[j].x); \

Line 0 Link Here

(-)xmp/files/patch-aj (+19 lines)
	1	*** src/xmms/plugin.c.orig Sun Jan 7 01:53:15 2001
	2	--- src/xmms/plugin.c Wed Sep 10 12:17:16 2003
	3	***************
	4	* 228,234 **
	5	xmp_cfg.filter = TRUE;
	6	xmp_cfg.pan_amplitude = 80;
	7
	8	! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x)
	9
	10	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
	11	if ((cfg = xmms_cfg_open_file(filename))) {
	12	--- 228,234 ----
	13	xmp_cfg.filter = TRUE;
	14	xmp_cfg.pan_amplitude = 80;
	15
	16	! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.x)
	17
	18	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
	19	if ((cfg = xmms_cfg_open_file(filename))) {

Line 0 Link Here

(-)xmp/files/patch-ak (+36 lines)
	1	*** src/xmms/plugin.c.orig Wed Sep 10 14:13:18 2003
	2	--- src/xmms/plugin.c Wed Sep 10 14:13:31 2003
	3	***************
	4	* 558,564 **
	5	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w); \
	6	gtk_widget_show(w); \
	7	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0); \
	8	! if (xmp_cfg.##o == 1) \
	9	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
	10	}
	11
	12	--- 558,564 ----
	13	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w); \
	14	gtk_widget_show(w); \
	15	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0); \
	16	! if (xmp_cfg.o == 1) \
	17	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
	18	}
	19
	20	***************
	21	* 658,664 **
	22	if (!cfg)
	23	cfg = xmms_cfg_new();
	24
	25	! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x)
	26
	27	CFGWRITEINT (mixing_freq);
	28	CFGWRITEINT (force8bit);
	29	--- 658,664 ----
	30	if (!cfg)
	31	cfg = xmms_cfg_new();
	32
	33	! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.x)
	34
	35	CFGWRITEINT (mixing_freq);
	36	CFGWRITEINT (force8bit);