From 59f41ce9693d7920c86663bf30dea10c3a2289c5 Mon Sep 17 00:00:00 2001 From: rohee Date: Tue, 27 Mar 2001 20:48:24 +0000 Subject: [PATCH] update to 0.9.0, work mostly by obecian@ with help from Ibrahim Khalifa --- audio/gqmpeg/Makefile | 44 +++++------ audio/gqmpeg/files/md5 | 6 +- audio/gqmpeg/patches/patch-io_mpg123.c | 11 --- audio/gqmpeg/patches/patch-mixer.c | 104 ++++++++++++------------- audio/gqmpeg/pkg/COMMENT | 1 - audio/gqmpeg/pkg/PLIST | 5 +- 6 files changed, 76 insertions(+), 95 deletions(-) delete mode 100644 audio/gqmpeg/patches/patch-io_mpg123.c delete mode 100644 audio/gqmpeg/pkg/COMMENT diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index bed8a843342..7545af20c1e 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,39 +1,37 @@ -# $OpenBSD: Makefile,v 1.17 2001/03/06 22:22:56 rohee Exp $ -# Original from: Bruno Rohée +# $OpenBSD: Makefile,v 1.18 2001/03/27 20:48:24 rohee Exp $ -DISTNAME= gqmpeg-0.6.3.src -PKGNAME= gqmpeg-0.6.3 -CATEGORIES= audio -NEED_VERSION= 1.336 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gqmpeg +COMMENT= "mpg123 front-end with skin support" -LIB_DEPENDS= gdk_imlib.19::graphics/imlib -BUILD_DEPENDS= mpg123::audio/mpg123 -RUN_DEPENDS= mpg123::audio/mpg123 +DISTNAME= gqmpeg-0.9.0 +CATEGORIES= audio +NEED_VERSION= 1.364 -HOMEPAGE= http://gqmpeg.sourceforge.net +HOMEPAGE= http://gqmpeg.sourceforge.net -MAINTAINER= Bruno Rohee +MAINTAINER= Bruno Rohee PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MAKE_FLAGS= PREFIX="${PREFIX}" CC="${CC}" \ - CFLAGS='${CFLAGS} -Wall $$(GTK_INCLUDE) $$(IMLIB_INCLUDE)' +MASTER_SITES= http://ftp1.sourceforge.net/gqmpeg/ \ + ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= gqmpeg -ALL_TARGET= gqmpeg +BUILD_DEPENDS= mpg123::audio/mpg123 \ + gdk-pixbuf-config::graphics/gdk-pixbuf +RUN_DEPENDS= mpg123::audio/mpg123 +LIB_DEPENDS= png.1::graphics/png -WRKDIST= ${WRKDIR}/${PKGNAME} +CONFIGURE_STYLE= gnu +CONFIGURE_ENV= LIBPNG="-lpng -lz" -DOCS= COPYING ChangeLog FAQ README SKIN-SPECS +DOCS= COPYING ChangeLog FAQ README SKIN-SPECS SKIN-SPECS-V1 \ + plugin/README.plugin -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqmpeg - ${INSTALL_PROGRAM} ${WRKSRC}/gqmpeg ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/plugin/gqmpeg-shoutcast-plugin.sh ${PREFIX}/bin - cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqmpeg +pre-install: + cd ${WRKSRC} && (${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqmpeg && \ + ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqmpeg) .include diff --git a/audio/gqmpeg/files/md5 b/audio/gqmpeg/files/md5 index b6fbcdd09c4..d8774c654c8 100644 --- a/audio/gqmpeg/files/md5 +++ b/audio/gqmpeg/files/md5 @@ -1,3 +1,3 @@ -MD5 (gqmpeg-0.6.3.src.tar.gz) = 01ec3ac587847b73e90326ea014cee22 -RMD160 (gqmpeg-0.6.3.src.tar.gz) = 69865bd5a7b48a67b3b46fa92c198b8e460709dc -SHA1 (gqmpeg-0.6.3.src.tar.gz) = e70acaa7efec3bba109c67b1f1f0c239725acc3a +MD5 (gqmpeg-0.9.0.tar.gz) = 78e30f5ff2fa7af0d2501fe6bd373f1b +RMD160 (gqmpeg-0.9.0.tar.gz) = 0cfe786a440e9124f8c4f873751dac71c1f248e4 +SHA1 (gqmpeg-0.9.0.tar.gz) = ee19187ec6057f339206cf42c0e5dbdfb18d3a5b diff --git a/audio/gqmpeg/patches/patch-io_mpg123.c b/audio/gqmpeg/patches/patch-io_mpg123.c deleted file mode 100644 index 30d0af0cda6..00000000000 --- a/audio/gqmpeg/patches/patch-io_mpg123.c +++ /dev/null @@ -1,11 +0,0 @@ ---- io_mpg123.c.orig Mon Dec 6 18:45:18 1999 -+++ io_mpg123.c Mon Dec 6 18:45:27 1999 -@@ -596,7 +596,7 @@ - return FALSE; - } - --#ifdef 0 -+#if 0 - /* we ignore escape sequences (for now) */ - if (c == 27 && getc(mpgpipe) == ']') - { diff --git a/audio/gqmpeg/patches/patch-mixer.c b/audio/gqmpeg/patches/patch-mixer.c index 0e317ac835e..32220602f3c 100644 --- a/audio/gqmpeg/patches/patch-mixer.c +++ b/audio/gqmpeg/patches/patch-mixer.c @@ -1,56 +1,48 @@ ---- mixer.c.orig Sat Jul 3 07:39:09 1999 -+++ mixer.c Mon Dec 6 18:43:13 1999 -@@ -24,7 +24,7 @@ - #include - #endif - --#if defined(sun) && defined(__svr4__) || defined(__NetBSD__) -+#if defined(sun) && defined(__svr4__) || defined(__NetBSD__) || defined(__OpenBSD__) - #include - #endif - -@@ -177,7 +177,7 @@ - return vol; - } - --#elif defined(__NetBSD__) -+#elif defined(__NetBSD__) || defined(__OpenBSD__) - mixer_devinfo_t *infos; - mixer_ctrl_t *values; - void mixer_init(gint init_device_id) -@@ -189,7 +189,7 @@ - - mixer_device = getenv("MIXERDEVICE"); - if (mixer_device == NULL) -- mixer_device = "/dev/mixer0"; -+ mixer_device = "/dev/mixer"; - - if ((fd = open(mixer_device, O_RDWR)) == -1) { - perror(mixer_device); -@@ -259,7 +259,7 @@ - - mixer_device = getenv("MIXERDEVICE"); - if (mixer_device == NULL) -- mixer_device = "/dev/mixer0"; -+ mixer_device = "/dev/mixer"; - - if ((fd = open(mixer_device, O_RDWR)) == -1) { - perror(mixer_device); -@@ -303,7 +303,7 @@ - - mixer_device = getenv("MIXERDEVICE"); - if (mixer_device == NULL) -- mixer_device = "/dev/mixer0"; -+ mixer_device = "/dev/mixer"; - - if ((fd = open(mixer_device, O_RDWR)) == -1) { - perror(mixer_device); -@@ -595,7 +595,7 @@ - - #endif - --#if defined(sun) && defined(__svr4__) || defined(__NetBSD__) -+#if defined(sun) && defined(__svr4__) || defined(__NetBSD__) || defined(__OpenBSD__) - /* from 0 through 100% */ - void set_volume(gint vol) - { +$OpenBSD: patch-mixer.c,v 1.2 2001/03/27 20:48:25 rohee Exp $ + +Our mixer device is /dev/mixer not /dex/mixer0 + +*** src/mixer.c.orig Tue Mar 20 14:11:50 2001 +--- src/mixer.c Tue Mar 20 14:14:08 2001 +*************** +*** 275,281 **** +--- 275,285 ---- + + mixer_device = getenv("MIXERDEVICE"); + if (mixer_device == NULL) ++ #ifdef __OpenBSD__ ++ mixer_device = "/dev/mixer"; ++ #else + mixer_device = "/dev/mixer0"; ++ #endif + + if ((fd = open(mixer_device, O_RDWR)) == -1) { + perror(mixer_device); +*************** +*** 352,358 **** +--- 356,366 ---- + + mixer_device = getenv("MIXERDEVICE"); + if (mixer_device == NULL) ++ #ifdef __OpenBSD__ ++ mixer_device = "/dev/mixer"; ++ #else + mixer_device = "/dev/mixer0"; ++ #endif + + if ((fd = open(mixer_device, O_RDWR)) == -1) { + perror(mixer_device); +*************** +*** 396,402 **** +--- 404,414 ---- + + mixer_device = getenv("MIXERDEVICE"); + if (mixer_device == NULL) ++ #ifdef __OpenBSD__ ++ mixer_device = "/dev/mixer"; ++ #else + mixer_device = "/dev/mixer0"; ++ #endif + + if ((fd = open(mixer_device, O_RDWR)) == -1) { + perror(mixer_device); diff --git a/audio/gqmpeg/pkg/COMMENT b/audio/gqmpeg/pkg/COMMENT deleted file mode 100644 index bdc2f9fb433..00000000000 --- a/audio/gqmpeg/pkg/COMMENT +++ /dev/null @@ -1 +0,0 @@ -mpg123 front-end with skin support diff --git a/audio/gqmpeg/pkg/PLIST b/audio/gqmpeg/pkg/PLIST index 1c74c12891c..936648645a3 100644 --- a/audio/gqmpeg/pkg/PLIST +++ b/audio/gqmpeg/pkg/PLIST @@ -1,9 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.2 2000/06/10 17:39:15 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2001/03/27 20:48:25 rohee Exp $ bin/gqmpeg bin/gqmpeg-shoutcast-plugin.sh +man/man1/gqmpeg.1 share/doc/gqmpeg/COPYING share/doc/gqmpeg/ChangeLog share/doc/gqmpeg/FAQ share/doc/gqmpeg/README share/doc/gqmpeg/SKIN-SPECS +share/doc/gqmpeg/SKIN-SPECS-V1 +share/doc/gqmpeg/README.plugin @dirrm share/doc/gqmpeg