Date: Tue, 18 May 1999 18:34:24 +1000 (EST) From: jim@phrantic.phear.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11757: update port: gqmpeg-0.5.2 to 0.5.99 Message-ID: <199905180834.SAA21506@blues.ghis.net>
next in thread | raw e-mail | index | archive | help
>Number: 11757 >Category: ports >Synopsis: update port: gqmpeg-0.5.2 to 0.5.99 >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: Tue May 18 01:40:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jim Mock >Release: FreeBSD 3.2-19990517-STABLE i386 >Organization: >Environment: >Description: Patch updates gqmpeg port from 0.5.2 to 0.5.99 which supposedly fixes alot of things on non-Linux platforms. Removed patch-ab.. it compiled and ran cleanly without it. >How-To-Repeat: >Fix: Apply the following diff.. diff -ruN /usr/ports/audio/gqmpeg/Makefile gqmpeg/Makefile --- /usr/ports/audio/gqmpeg/Makefile Mon May 17 16:57:34 1999 +++ gqmpeg/Makefile Tue May 18 18:04:16 1999 @@ -1,12 +1,12 @@ # New ports collection makefile for: gqmpeg -# Version required: 0.5.2 +# Version required: 0.5.99 # 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.5.99 CATEGORIES= audio MASTER_SITES= http://gqview.netpedia.net/ \ http://www.geocities.com/SiliconValley/Haven/5235/ diff -ruN /usr/ports/audio/gqmpeg/files/md5 gqmpeg/files/md5 --- /usr/ports/audio/gqmpeg/files/md5 Mon May 17 16:57:34 1999 +++ gqmpeg/files/md5 Tue May 18 18:04:38 1999 @@ -1 +1 @@ -MD5 (gqmpeg-0.5.2.src.tgz) = 2e1be28d9aaac1af8da6236f656a12c3 +MD5 (gqmpeg-0.5.99.src.tgz) = 25fad49cdd1f8bd247479b6415a1aa5d diff -ruN /usr/ports/audio/gqmpeg/patches/patch-aa gqmpeg/patches/patch-aa --- /usr/ports/audio/gqmpeg/patches/patch-aa Sat Apr 3 18:22:57 1999 +++ gqmpeg/patches/patch-aa Tue May 18 18:20:00 1999 @@ -1,20 +1,22 @@ ---- 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 18 18:18:07 1999 ++++ Makefile Tue May 18 18:19:40 1999 +@@ -1,15 +1,15 @@ + + PREFIX=/usr/local --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 = gcc -g -Wall +CC += -Wall $(CFLAGS) GNOME_PREFIX = `gnome-config --prefix` diff -ruN /usr/ports/audio/gqmpeg/patches/patch-ab gqmpeg/patches/patch-ab --- /usr/ports/audio/gqmpeg/patches/patch-ab Fri Apr 2 13:52:55 1999 +++ gqmpeg/patches/patch-ab Thu Jan 1 10:00:00 1970 @@ -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) - { >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?199905180834.SAA21506>