Date: Thu, 27 May 1999 16:00:37 -0700 (PDT) From: cpiazza@home.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11909: Update: audio/gqmpeg Message-ID: <19990527230037.78D91144D@norn.ca.eu.org>
next in thread | raw e-mail | index | archive | help
>Number: 11909 >Category: ports >Synopsis: Update: audio/gqmpeg >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 27 16:10:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Chris Piazza >Release: FreeBSD 4.0-CURRENT i386 >Organization: n/a >Environment: FreeBSD norn.ca.eu.org 4.0-CURRENT FreeBSD 4.0-CURRENT #215: Sat May 22 12:09:02 PDT 1999 norn@norn.ca.eu.org:/usr/src/sys/compile/NORN i386 >Description: This PR should be seen as superceding pr# 11757. Update gqmpeg to 0.6.1. Files removed: patch-ab >How-To-Repeat: >Fix: Index: gqmpeg/Makefile =================================================================== RCS file: /cvs/FreeBSD/ports/audio/gqmpeg/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 1999/05/16 23:34:14 1.13 +++ Makefile 1999/05/27 22:41:53 @@ -1,12 +1,12 @@ # New ports collection makefile for: gqmpeg -# Version required: 0.5.2 +# Version required: 0.6.1 # Date Created: 28 Oct 1998 # Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG> # # $Id: Makefile,v 1.13 1999/05/16 23:34:14 steve Exp $ # -DISTNAME= gqmpeg-0.5.2 +DISTNAME= gqmpeg-0.6.1 CATEGORIES= audio MASTER_SITES= http://gqview.netpedia.net/ \ http://www.geocities.com/SiliconValley/Haven/5235/ @@ -19,9 +19,6 @@ USE_X_PREFIX= yes ALL_TARGET= gqmpeg - -BINGRP= kmem -BINMODE= 2555 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin Index: gqmpeg/files/md5 =================================================================== RCS file: /cvs/FreeBSD/ports/audio/gqmpeg/files/md5,v retrieving revision 1.8 diff -u -r1.8 md5 --- md5 1999/05/16 23:34:32 1.8 +++ md5 1999/05/27 22:43:09 @@ -1 +1 @@ -MD5 (gqmpeg-0.5.2.src.tgz) = 2e1be28d9aaac1af8da6236f656a12c3 +MD5 (gqmpeg-0.6.1.src.tgz) = 4d480e6c1b6e2be4e0768dfa4912882b Index: gqmpeg/patches/patch-aa =================================================================== RCS file: /cvs/FreeBSD/ports/audio/gqmpeg/patches/patch-aa,v retrieving revision 1.7 diff -u -r1.7 patch-aa --- patch-aa 1999/04/02 03:52:55 1.7 +++ patch-aa 1999/05/27 22:41:10 @@ -1,21 +1,27 @@ ---- Makefile.orig Sat Mar 27 21:38:09 1999 -+++ Makefile Tue Mar 30 01:48:05 1999 -@@ -1,13 +1,11 @@ +--- Makefile.orig Tue May 25 18:10:24 1999 ++++ Makefile Tue May 25 18:11:45 1999 +@@ -1,12 +1,11 @@ -PREFIX=/usr/local -- + -GTK_INCLUDE = `gtk-config --cflags` -GTK_LIB = `gtk-config --libs` +GTK_INCLUDE = `gtk12-config --cflags` +GTK_LIB = `gtk12-config --libs` IMLIB_INCLUDE = `imlib-config --cflags-gdk` IMLIB_LIB = `imlib-config --libs-gdk` + -CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE) --LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) --CC = gcc -Wall $(CFLAGS) +CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -lkvm -+CC += -Wall $(CFLAGS) + LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) + + #The following commented out lines are for replacing the stock defines on +@@ -18,7 +17,7 @@ + #for IRIX + #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio + +-CC = gcc -Wall ++CC += -Wall GNOME_PREFIX = `gnome-config --prefix` Index: gqmpeg/patches/patch-ab =================================================================== RCS file: patch-ab diff -N patch-ab --- /tmp/cvsd23521 Thu May 27 15:59:54 1999 +++ /dev/null Thu May 27 15:55:47 1999 @@ -1,75 +0,0 @@ ---- main.c.orig Tue Mar 30 01:40:15 1999 -+++ main.c Tue Mar 30 01:47:25 1999 -@@ -15,6 +15,27 @@ - #include <gdk/gdkx.h> - #include <X11/Xlib.h> - -+#ifdef __FreeBSD__ -+#include <kvm.h> -+#include <fcntl.h> -+#include <sys/user.h> -+#include <sys/proc.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+ -+#ifdef FSCALE -+#define FIXED_PCTCPU FSCALE -+#endif -+ -+#ifdef FIXED_PCTCPU -+typedef long pctcpu; -+#define pctdouble(p) ((double)(p) / FIXED_PCTCPU) -+#else -+typedef double pctcpu; -+#define pctdouble(p) (p) -+#endif -+#endif -+ - static gint fast_advance = FALSE; - static gint advance_max_frame; - static gint advance_max_sec; -@@ -99,6 +120,36 @@ - #define HZ 100 /* for FreeBSD? */ - #endif - -+#ifdef __FreeBSD__ -+static gfloat check_child_cpu_usage(int childs_pid) -+{ -+ static gfloat percent_of_cpu = 0.0; -+ -+ static kvm_t *kd; -+ kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open"); -+ if (kd == NULL) return percent_of_cpu; -+ -+ { -+ static struct kinfo_proc *ki; -+ static int nproc; -+ ki = kvm_getprocs(kd, KERN_PROC_PID, childs_pid, &nproc); -+ if (nproc != 1) { -+ percent_of_cpu = 0.0; -+ } else { -+ percent_of_cpu = 100.0 * pctdouble(ki->kp_proc.p_pctcpu); -+ } -+ } -+ -+ kvm_close(kd); -+ -+ if (percent_of_cpu > 99.0) { -+ percent_of_cpu = 99; -+ } -+ -+ return percent_of_cpu; -+} -+ -+#else - static gfloat check_child_cpu_usage(int childs_pid) - { - /* needed for SGI IRIX 5.3 and 6.5 */ -@@ -197,6 +248,7 @@ - - return percent_of_cpu; - } -+#endif - - void set_song_info(gint n) - { Index: gqmpeg/pkg/COMMENT =================================================================== RCS file: /cvs/FreeBSD/ports/audio/gqmpeg/pkg/COMMENT,v retrieving revision 1.2 diff -u -r1.2 COMMENT --- COMMENT 1999/01/27 21:26:52 1.2 +++ COMMENT 1999/05/27 22:59:06 @@ -1 +1 @@ -Another gtk-base MP3 frontend. +Another gtk-based MP3 frontend. -Chris >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990527230037.78D91144D>