Date: Mon, 15 Oct 2001 20:17:19 +0200 (CEST) From: Christian Weisgerber <naddy@mips.inka.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/31294: audio/mpg321: update to 0.2.2 Message-ID: <200110151817.f9FIHJr52621@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
>Number: 31294 >Category: ports >Synopsis: audio/mpg321: update to 0.2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 15 11:40:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Christian Weisgerber >Release: FreeBSD 5.0-CURRENT alpha >Organization: >Environment: System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Oct 15 01:43:47 CEST 2001 naddy@kemoauc.mips.inka.de:/home/obj/usr/src/sys/KEMOAUC alpha >Description: - Update of audio/mpg321 to release 0.2.2: various bug fixes. - New master site. - Improved description. >How-To-Repeat: >Fix: diff -uNr /usr/ports/audio/mpg321/Makefile mpg321/Makefile --- /usr/ports/audio/mpg321/Makefile Fri Oct 12 16:57:16 2001 +++ mpg321/Makefile Mon Oct 15 13:35:00 2001 @@ -6,10 +6,10 @@ # PORTNAME= mpg321 -PORTVERSION= 0.2.0 +PORTVERSION= 0.2.2 CATEGORIES= audio -MASTER_SITES= http://people.debian.org/~drew/ -DISTNAME= ${PORTNAME}_${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= mpg321 MAINTAINER= naddy@mips.inka.de @@ -20,8 +20,6 @@ CONFIGURE_ARGS= --disable-mpg123-symlink CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAN1= mpg321.1 diff -uNr /usr/ports/audio/mpg321/distinfo mpg321/distinfo --- /usr/ports/audio/mpg321/distinfo Fri Oct 12 16:57:16 2001 +++ mpg321/distinfo Mon Oct 15 13:36:15 2001 @@ -1 +1 @@ -MD5 (mpg321_0.2.0.tar.gz) = 9bf6a0b049c492381819b53e7449455a +MD5 (mpg321-0.2.2.tar.gz) = 3ad9c1fb9bbecefb2cbdda4cffd2b0df diff -uNr /usr/ports/audio/mpg321/files/patch-getopt.c mpg321/files/patch-getopt.c --- /usr/ports/audio/mpg321/files/patch-getopt.c Thu Jan 1 01:00:00 1970 +++ mpg321/files/patch-getopt.c Mon Oct 15 14:05:50 2001 @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- getopt.c.orig Mon Oct 15 14:05:23 2001 ++++ getopt.c Mon Oct 15 14:05:37 2001 +@@ -76,16 +76,7 @@ + # endif + #endif + +-#ifndef _ +-/* This is for other GNU distributions with internationalized messages. +- When compiling libc, the _ macro is predefined. */ +-# ifdef HAVE_LIBINTL_H +-# include <libintl.h> +-# define _(msgid) gettext (msgid) +-# else + # define _(msgid) (msgid) +-# endif +-#endif + + /* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user diff -uNr /usr/ports/audio/mpg321/files/patch-mad.c mpg321/files/patch-mad.c --- /usr/ports/audio/mpg321/files/patch-mad.c Thu Oct 11 14:35:18 2001 +++ mpg321/files/patch-mad.c Thu Jan 1 01:00:00 1970 @@ -1,90 +0,0 @@ - -$FreeBSD: ports/audio/mpg321/files/patch-mad.c,v 1.1 2001/10/11 12:35:18 ijliao Exp $ - ---- mad.c.orig Sun Sep 23 08:17:55 2001 -+++ mad.c Mon Sep 24 15:56:20 2001 -@@ -554,44 +554,47 @@ - - int calc_length(char *file, buffer *buf) - { -- FILE * f; -+ int f; - struct stat filestat; - void *fdm; - char buffer[3]; - -- if (stat(file, &filestat) == -1) -+ f = open(file, O_RDONLY); -+ -+ if (f < 0) - { - mpg321_error(file); - return -1; - } - -- f = fopen(file, "r"); -- -- if (f == NULL) -+ if (fstat(f, &filestat) < 0) - { - mpg321_error(file); -+ close(f); - return -1; - } - - if (!S_ISREG(filestat.st_mode)) - { - fprintf(stderr, "%s: Not a regular file\n", file); -- fclose(f); -+ close(f); - return -1; - } - - /* TAG checking is adapted from XMMS */ - buf->length = filestat.st_size; - -- if (fseek(f, -128, SEEK_END) < 0) -+ if (lseek(f, -128, SEEK_END) < 0) - { - mpg321_error(file); -+ close(f); - return -1; - } - -- if (read(fileno(f), buffer, 3) != 3) -+ if (read(f, buffer, 3) != 3) - { - fprintf(stderr, "Couldnt read 3 bytes from %s\n", file); -+ close(f); - return -1; - } - -@@ -600,12 +603,11 @@ - buf->length -= 128; /* Correct for id3 tags */ - } - -- rewind(f); -- -- fdm = mmap(0, buf->length, PROT_READ, MAP_SHARED, fileno(f), 0); -+ fdm = mmap(0, buf->length, PROT_READ, MAP_SHARED, f, 0); - if (fdm == MAP_FAILED) - { - mpg321_error(file); -+ close(f); - return -1; - } - -@@ -616,11 +618,11 @@ - if (munmap(fdm, buf->length) == -1) - { - mpg321_error(file); -- fclose(f); -+ close(f); - return -1; - } - -- if (fclose(f) == EOF) -+ if (close(f) < 0) - { - mpg321_error(file); - return -1; diff -uNr /usr/ports/audio/mpg321/files/patch-mpg321.h mpg321/files/patch-mpg321.h --- /usr/ports/audio/mpg321/files/patch-mpg321.h Thu Oct 11 14:35:18 2001 +++ mpg321/files/patch-mpg321.h Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ - -$FreeBSD: ports/audio/mpg321/files/patch-mpg321.h,v 1.1 2001/10/11 12:35:18 ijliao Exp $ - ---- mpg321.h.orig Sat Sep 22 22:39:04 2001 -+++ mpg321.h Mon Sep 24 16:06:19 2001 -@@ -32,6 +32,7 @@ - #include "config.h" - #endif - -+#include <sys/types.h> - #include <stdio.h> - #include <limits.h> - #include <ao/ao.h> diff -uNr /usr/ports/audio/mpg321/files/patch-network.c mpg321/files/patch-network.c --- /usr/ports/audio/mpg321/files/patch-network.c Thu Oct 11 14:35:18 2001 +++ mpg321/files/patch-network.c Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/audio/mpg321/files/patch-network.c,v 1.1 2001/10/11 12:35:18 ijliao Exp $ - ---- network.c.orig Mon Sep 24 16:01:09 2001 -+++ network.c Mon Sep 24 16:01:27 2001 -@@ -237,7 +237,7 @@ - int data_sock; - char ftp_request[1024]; - struct sockaddr_in stLclAddr; -- size_t namelen; -+ socklen_t namelen; - int i; - - /* Check for URL syntax */ diff -uNr /usr/ports/audio/mpg321/files/patch-options.c mpg321/files/patch-options.c --- /usr/ports/audio/mpg321/files/patch-options.c Thu Oct 11 14:35:18 2001 +++ mpg321/files/patch-options.c Thu Jan 1 01:00:00 1970 @@ -1,17 +0,0 @@ - -$FreeBSD: ports/audio/mpg321/files/patch-options.c,v 1.1 2001/10/11 12:35:18 ijliao Exp $ - ---- options.c.orig Mon Sep 24 16:12:31 2001 -+++ options.c Mon Sep 24 16:12:47 2001 -@@ -28,9 +28,9 @@ - #include "mpg321.h" - #include "getopt.h" - --#include <sys/types.h> --#include <unistd.h> -+#include <sys/time.h> - #include <sys/resource.h> -+#include <unistd.h> - #include <string.h> - - void parse_options(int argc, char *argv[], playlist *pl) diff -uNr /usr/ports/audio/mpg321/files/patch-playlist.c mpg321/files/patch-playlist.c --- /usr/ports/audio/mpg321/files/patch-playlist.c Thu Oct 11 14:35:18 2001 +++ mpg321/files/patch-playlist.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ - -$FreeBSD: ports/audio/mpg321/files/patch-playlist.c,v 1.1 2001/10/11 12:35:18 ijliao Exp $ - ---- playlist.c.orig Mon Sep 24 21:09:15 2001 -+++ playlist.c Mon Sep 24 21:09:34 2001 -@@ -48,6 +48,7 @@ - pl->files_size = DEFAULT_PLAYLIST_SIZE; - pl->numfiles = 0; - pl->random_play = 0; -+ strcpy(pl->remote_file, ""); - - return pl; - } diff -uNr /usr/ports/audio/mpg321/files/patch-remote.c mpg321/files/patch-remote.c --- /usr/ports/audio/mpg321/files/patch-remote.c Thu Oct 11 14:35:18 2001 +++ mpg321/files/patch-remote.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ - -$FreeBSD: ports/audio/mpg321/files/patch-remote.c,v 1.1 2001/10/11 12:35:18 ijliao Exp $ - ---- remote.c.orig Mon Sep 24 16:06:46 2001 -+++ remote.c Mon Sep 24 16:06:48 2001 -@@ -27,6 +27,7 @@ - - #include "mpg321.h" - -+#include <sys/time.h> - #include <string.h> - #include <unistd.h> - diff -uNr /usr/ports/audio/mpg321/pkg-descr mpg321/pkg-descr --- /usr/ports/audio/mpg321/pkg-descr Thu Jul 26 12:57:27 2001 +++ mpg321/pkg-descr Mon Oct 15 20:11:19 2001 @@ -1,9 +1,16 @@ -mpg321 is a completely free clone of mpg123. +mpg321 is a clone of the popular mpg123 command-line mp3 player. It should +function as a drop-in replacement for mpg123 in many cases. While some of +the functionality of mpg123 is not yet implemented, mpg321 should function +properly in most cases for most people, such as for frontends such as +gqmpeg. -mpg321 has been tested to work with gqmpeg. It should work with -other frontends, but isn't guaranteed. mpg321 is built on top of -libmad, which was written by Robert Leslie, and is a fully ISO-compliant -MPEG decoder, meaning it's very accurate. It also operates entirely -within fixed-point arithmetic. +mpg321 is based on the mad MPEG audio decoding library. It therefore is +highly accurate, and also uses only fixed-point calculation, making it +more efficient on machines without a floating-point unit. -ID3 tags are not supported at all, yet. +While mpg321 is not as fast as the non-free mpg123 on systems which have a +floating point unit, it comes under the GNU General Public License, which +allows greater freedom to its users. For most people who want mpg123, +mpg321 is a better alternative. + +WWW: http://sourceforge.net/projects/mpg321/ >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?200110151817.f9FIHJr52621>