Date: Wed, 10 Sep 2003 15:13:59 +0200 From: "YazzY" <yazzy@yazzy.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56679: Fixed broken build with xmms dependiency installed on the system. Message-ID: 1063199639@lapdance Resent-Message-ID: <200309101320.h8ADKA5Q017550@freefall.freebsd.org>
| raw e-mail | index | archive | help
>Number: 56679 >Category: ports >Synopsis: Fixed broken build with xmms dependiency installed on the system. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Sep 10 06:20:09 PDT 2003 >Closed-Date: >Last-Modified: >Originator: YazzY >Release: FreeBSD 5.1-CURRENT i386 >Organization: YazzY.org >Environment: System: FreeBSD lapdance 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 8 16:58:13 CEST 2003 root@lapdance:/usr/obj/usr/src/sys/LAPDANCE i386 >Description: Fixed broken build with xmms dependiency installed on the system. Last pr was uncomplete, it missed the patch. Please delete http://www.freebsd.org/cgi/query-pr.cgi?pr=56678 >How-To-Repeat: >Fix: --- xmp.diff begins here --- diff -ruN xmp.orig/Makefile xmp/Makefile --- xmp.orig/Makefile Tue Apr 8 02:40:08 2003 +++ xmp/Makefile Wed Sep 10 14:28:00 2003 @@ -7,6 +7,7 @@ PORTNAME= xmp PORTVERSION= 2.0.4 +PORTREVISION= 0 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -34,6 +35,12 @@ USE_GNOME+= esound CONFIGURE_ARGS+= --enable-esd PKGNAMESUFFIX= -esound +.endif + +.if !defined(WITHOUT_XMMS) + LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +.else + CONFIGURE_ARGS+= --disable-xmms .endif MAN1= xmp.1 diff -ruN xmp.orig/files/patch-ai xmp/files/patch-ai --- xmp.orig/files/patch-ai Thu Jan 1 01:00:00 1970 +++ xmp/files/patch-ai Wed Sep 10 14:28:00 2003 @@ -0,0 +1,33 @@ +*** 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); \ diff -ruN xmp.orig/files/patch-aj xmp/files/patch-aj --- xmp.orig/files/patch-aj Thu Jan 1 01:00:00 1970 +++ xmp/files/patch-aj Wed Sep 10 14:28:00 2003 @@ -0,0 +1,19 @@ +*** 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))) { diff -ruN xmp.orig/files/patch-ak xmp/files/patch-ak --- xmp.orig/files/patch-ak Thu Jan 1 01:00:00 1970 +++ xmp/files/patch-ak Wed Sep 10 14:28:00 2003 @@ -0,0 +1,36 @@ +*** 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); --- xmp.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1063199639>