From 6d2faeb0e137565269431824648619184e85fe5b Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sat, 29 May 1999 04:08:02 +0000 Subject: Update to version 0.6.1 and use new version of imlib. PR: 11843 Submitted by: Jeremy Lea PR: 11909 Submitted by: Chirs Piazza --- audio/gqmpeg-devel/Makefile | 11 +++--- audio/gqmpeg-devel/distinfo | 2 +- audio/gqmpeg-devel/files/patch-aa | 22 +++++++----- audio/gqmpeg-devel/files/patch-ab | 75 --------------------------------------- audio/gqmpeg-devel/pkg-comment | 2 +- 5 files changed, 20 insertions(+), 92 deletions(-) delete mode 100644 audio/gqmpeg-devel/files/patch-ab (limited to 'audio/gqmpeg-devel') diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index aa22234da43e..9be8e0374224 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -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 # -# $Id: Makefile,v 1.12 1999/04/02 03:52:51 steve Exp $ +# $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/ @@ -15,14 +15,11 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= nacai@iname.com RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= Imlib.3:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= Imlib.4:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes ALL_TARGET= gqmpeg -BINGRP= kmem -BINMODE= 2555 - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo index 94dd26eaddbe..98bd6fc77de9 100644 --- a/audio/gqmpeg-devel/distinfo +++ b/audio/gqmpeg-devel/distinfo @@ -1 +1 @@ -MD5 (gqmpeg-0.5.2.src.tgz) = 2e1be28d9aaac1af8da6236f656a12c3 +MD5 (gqmpeg-0.6.1.src.tgz) = 4d480e6c1b6e2be4e0768dfa4912882b diff --git a/audio/gqmpeg-devel/files/patch-aa b/audio/gqmpeg-devel/files/patch-aa index 4e9b9b08dae7..67188587f308 100644 --- a/audio/gqmpeg-devel/files/patch-aa +++ b/audio/gqmpeg-devel/files/patch-aa @@ -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` diff --git a/audio/gqmpeg-devel/files/patch-ab b/audio/gqmpeg-devel/files/patch-ab deleted file mode 100644 index 9a8d2a1fd11d..000000000000 --- a/audio/gqmpeg-devel/files/patch-ab +++ /dev/null @@ -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 - #include - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#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) - { diff --git a/audio/gqmpeg-devel/pkg-comment b/audio/gqmpeg-devel/pkg-comment index 6f4af48adce3..31a1d4d6b557 100644 --- a/audio/gqmpeg-devel/pkg-comment +++ b/audio/gqmpeg-devel/pkg-comment @@ -1 +1 @@ -Another gtk-base MP3 frontend. +Another gtk-based MP3 frontend. -- cgit v1.2.3