Update to version 0.5.0.

PR:		10781
Submitted by:	Chris Piazza <cpiazza@home.net>
This commit is contained in:
Steve Price 1999-04-02 03:52:55 +00:00
parent 139d8d2920
commit 72019c94df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=17539
10 changed files with 194 additions and 28 deletions

View file

@ -1,12 +1,12 @@
# New ports collection makefile for: gqmpeg # New ports collection makefile for: gqmpeg
# Version required: 0.4.6 # Version required: 0.5.1
# Date Created: 28 Oct 1998 # Date Created: 28 Oct 1998
# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG> # Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
# #
# $Id: Makefile,v 1.10 1999/02/02 17:07:22 vanilla Exp $ # $Id: Makefile,v 1.11 1999/03/15 18:30:04 nectar Exp $
# #
DISTNAME= gqmpeg-0.4.6 DISTNAME= gqmpeg-0.5.1
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= http://www.geocities.com/SiliconValley/Haven/5235/ MASTER_SITES= http://www.geocities.com/SiliconValley/Haven/5235/
EXTRACT_SUFX= .src.tgz EXTRACT_SUFX= .src.tgz
@ -19,6 +19,9 @@ LIB_DEPENDS= Imlib.3:${PORTSDIR}/graphics/imlib
USE_X_PREFIX= yes USE_X_PREFIX= yes
ALL_TARGET= gqmpeg ALL_TARGET= gqmpeg
BINGRP= kmem
BINMODE= 2555
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin

View file

@ -1 +1 @@
MD5 (gqmpeg-0.4.6.src.tgz) = 17233ea8f197d0227fa67e15e1d8b1c1 MD5 (gqmpeg-0.5.1.src.tgz) = 9649e5366da9298df19c216791fb9b14

View file

@ -1,17 +1,21 @@
--- Makefile.orig Fri Jan 22 07:37:38 1999 --- Makefile.orig Sat Mar 27 21:38:09 1999
+++ Makefile Sun Jan 24 03:15:04 1999 +++ Makefile Tue Mar 30 01:48:05 1999
@@ -1,11 +1,8 @@ @@ -1,13 +1,11 @@
-
-PREFIX=/usr/local -PREFIX=/usr/local
- -
-GTK_INCLUDE = `gtk-config --cflags` -GTK_INCLUDE = `gtk-config --cflags`
-GTK_LIB = `gtk-config --libs` -GTK_LIB = `gtk-config --libs`
+GTK_INCLUDE = `gtk11d-config --cflags` +GTK_INCLUDE = `gtk12-config --cflags`
+GTK_LIB = `gtk11d-config --libs` +GTK_LIB = `gtk12-config --libs`
IMLIB_INCLUDE = `imlib-config --cflags-gdk` IMLIB_INCLUDE = `imlib-config --cflags-gdk`
IMLIB_LIB = `imlib-config --libs-gdk` IMLIB_LIB = `imlib-config --libs-gdk`
-CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE) -CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-LDFLAGS = $(GTK_LIB) $(IMLIB_LIB)
-CC = gcc -Wall $(CFLAGS)
+CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE) +CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE)
LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) +LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -lkvm
CC = gcc -Wall $(CFLAGS) $(SHAPED_HACK) +CC += -Wall $(CFLAGS)
GNOME_PREFIX = `gnome-config --prefix`

View file

@ -0,0 +1,75 @@
--- 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)
{

View file

@ -1,6 +1,7 @@
Another gtk-base graphic file viewer. A GTK-based mp3 front-end.
Uses mpg123 for decoding and supports winamp themes..
author's homepage: http://www.geocities.com/SiliconValley/Haven/5235/ Author's homepage: http://www.geocities.com/SiliconValley/Haven/5235/
-Vanilla -Vanilla
vanilla@FreeBSD.ORG vanilla@FreeBSD.ORG

View file

@ -1,12 +1,12 @@
# New ports collection makefile for: gqmpeg # New ports collection makefile for: gqmpeg
# Version required: 0.4.6 # Version required: 0.5.1
# Date Created: 28 Oct 1998 # Date Created: 28 Oct 1998
# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG> # Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
# #
# $Id: Makefile,v 1.10 1999/02/02 17:07:22 vanilla Exp $ # $Id: Makefile,v 1.11 1999/03/15 18:30:04 nectar Exp $
# #
DISTNAME= gqmpeg-0.4.6 DISTNAME= gqmpeg-0.5.1
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= http://www.geocities.com/SiliconValley/Haven/5235/ MASTER_SITES= http://www.geocities.com/SiliconValley/Haven/5235/
EXTRACT_SUFX= .src.tgz EXTRACT_SUFX= .src.tgz
@ -19,6 +19,9 @@ LIB_DEPENDS= Imlib.3:${PORTSDIR}/graphics/imlib
USE_X_PREFIX= yes USE_X_PREFIX= yes
ALL_TARGET= gqmpeg ALL_TARGET= gqmpeg
BINGRP= kmem
BINMODE= 2555
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin

View file

@ -1 +1 @@
MD5 (gqmpeg-0.4.6.src.tgz) = 17233ea8f197d0227fa67e15e1d8b1c1 MD5 (gqmpeg-0.5.1.src.tgz) = 9649e5366da9298df19c216791fb9b14

View file

@ -1,17 +1,21 @@
--- Makefile.orig Fri Jan 22 07:37:38 1999 --- Makefile.orig Sat Mar 27 21:38:09 1999
+++ Makefile Sun Jan 24 03:15:04 1999 +++ Makefile Tue Mar 30 01:48:05 1999
@@ -1,11 +1,8 @@ @@ -1,13 +1,11 @@
-
-PREFIX=/usr/local -PREFIX=/usr/local
- -
-GTK_INCLUDE = `gtk-config --cflags` -GTK_INCLUDE = `gtk-config --cflags`
-GTK_LIB = `gtk-config --libs` -GTK_LIB = `gtk-config --libs`
+GTK_INCLUDE = `gtk11d-config --cflags` +GTK_INCLUDE = `gtk12-config --cflags`
+GTK_LIB = `gtk11d-config --libs` +GTK_LIB = `gtk12-config --libs`
IMLIB_INCLUDE = `imlib-config --cflags-gdk` IMLIB_INCLUDE = `imlib-config --cflags-gdk`
IMLIB_LIB = `imlib-config --libs-gdk` IMLIB_LIB = `imlib-config --libs-gdk`
-CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE) -CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-LDFLAGS = $(GTK_LIB) $(IMLIB_LIB)
-CC = gcc -Wall $(CFLAGS)
+CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE) +CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE)
LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) +LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -lkvm
CC = gcc -Wall $(CFLAGS) $(SHAPED_HACK) +CC += -Wall $(CFLAGS)
GNOME_PREFIX = `gnome-config --prefix`

View file

@ -0,0 +1,75 @@
--- 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)
{

View file

@ -1,6 +1,7 @@
Another gtk-base graphic file viewer. A GTK-based mp3 front-end.
Uses mpg123 for decoding and supports winamp themes..
author's homepage: http://www.geocities.com/SiliconValley/Haven/5235/ Author's homepage: http://www.geocities.com/SiliconValley/Haven/5235/
-Vanilla -Vanilla
vanilla@FreeBSD.ORG vanilla@FreeBSD.ORG