Date: Tue, 02 Apr 2013 21:47:40 +0200 From: Matthias Andree <mandree@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: ehaupt@FreeBSD.org Subject: ports/177587: [PATCH] audio/mp3guessenc: update 2 upstream versions to 0.25 beta 1 Message-ID: <E1UN7BE-000J7h-5g@apollo.emma.line.org> Resent-Message-ID: <201304021950.r32Jo051065275@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177587
>Category: ports
>Synopsis: [PATCH] audio/mp3guessenc: update 2 upstream versions to 0.25 beta 1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 02 19:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 9.1-RELEASE FreeBSD 9.1-RELEASE #2 r244869: Sun Dec 30 22:05:16 CET
>Description:
- Makefile adjusted to heed CPPFLAGS, LDFLAGS, LIBS.
- Upgrade two versions to 0.25 beta 1. No more stat64 hassles. As discussed
on IRC March 6th and with Elio (upstream maintainer) by email.
(Seems to work for me on amd64, but hangs noisily on one known broken MP3 file.)
Emanuel, please judge for yourself if this warrants portmgr@ permission to
upgrade, or if you can leave 0.23alphablah to ship and upgrade after the
freeze is lifted.
- Upstream changelog:
version 0.25 beta 1 (2013/03/24, "Please Please Please Let Me Release What I Want")
- added a version check on the lame string found in xing vbr tag in order to
avoid reading a lame tag where there isn't one (first lame tag appeared in v3.90,
previous versions just added a signature string to the xing vbr tag)
- detection of Ape tag v1/v2 - actually read main data, then skip it
- increased buffer size due to the maximum length freeformat frames can have (5760 bytes
when encoding 8 kHz content into a 640 kbps stream -- quite strange, yet still feasible)
- fixed detection of mp3Surround streams encoded with OFL (original file length) feature
- added detection of mp3Surround streams too!
(mp3Surround is another extension of mp3 which brings multi channel audio out of a
regular mp3 stream. Almost an un-flexible (only encodes 5.1 channels - 44.1 kHz and
48 kHz, and that's all) and unknown one, though)
- mp3guessenc is now able to detect mp3PRO streams!
(Well, the detection method is somewhat trivial but it works with any sample stream I
could test. Actually, I'm not aware of any other utility able to tell `normal'
mp3 streams from mp3PRO ones without the need of external closed libraries.)
- many integer variables are now declared as off_t (which can become 64 bit integers
on systems supporting them) for correct handling of large files (> 256MB)
Now mp3guessenc can scan files up to 2^60 bytes long. Thanks to Matthias Andree for
pointing me to a portable solution for large files support.
- show ancillary data infos (for layerIII only)
- fixed encoder delay info for both fhg and lame encodings
version 0.25 alpha 24 (2013/02/21, the "Owner Of A Lonely Release" release)
- added workaround for buggy lame vbr tag in freeformat streams
- enhanced detection of frame size in layerIII free format streams
- sync error counter now gets updated
- update GUESSING ENGINE! Added support for gogo, helix and updated detection for known
encoders (xing/lame/fhg)
- refined memory requirements: less buffers, better managed
- more comments in bit-handling routines (now everything is clear to me, eh eh)
- fixed out-of-bound write in `extract_lame_string'
- enhanced modularity: source was splitted into modules (so mp3guessenc.c is lighter now!)
- refined detection of lame string into the first frame (xing/lame tag)
- fixed regression in lame string detection into the very last frame
- added missing structure initialization
- added tag offset value (for xing/lame/vbri tags)
- replaced old `for' cycles with more efficient memset/memcpy routines
- replaced `stat' with `stat64' in order to avoid crashes when managing large files
- fixed detection of long/mixed/switch blocks in compliance with lame results (short blocks
were already correctly detected)
- mp3guessenc is now lame-preset aware
- fixed nice coherent alignment
Port maintainer (ehaupt@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- mp3guessenc-0.25.b1.patch begins here ---
diff -ruN /usr/ports/audio/mp3guessenc/Makefile ./Makefile
--- /usr/ports/audio/mp3guessenc/Makefile 2012-11-29 00:52:08.000000000 +0100
+++ ./Makefile 2013-04-02 21:31:06.000000000 +0200
@@ -1,5 +1,5 @@
# Created by: Emanuel Haupt <ehaupt@critical.ch>
-# $FreeBSD: ports/audio/mp3guessenc/Makefile,v 1.9 2012/11/28 23:52:08 svnexp Exp $
+# $FreeBSD: head/audio/mp3guessenc/Makefile 307947 2012-11-28 23:48:14Z ehaupt $
PORTNAME= mp3guessenc
DISTVERSION= ${DIST_REL}${ALPHA_REL}
@@ -12,17 +12,17 @@
MAKE_JOBS_SAFE= yes
DIST_REL= 0.25
-ALPHA_REL= alpha23-HPR
+ALPHA_REL= beta1
PLIST_FILES= bin/mp3guessenc
-SRC= decode.c mp3guessenc.c
+SRC= decode.c mp3guessenc.c bit_utils.c tags.c
do-build:
.for f in ${SRC}
- ${CC} ${CFLAGS} ${WRKSRC}/${f} -c -o ${WRKSRC}/${f:C/\.c/.o/}
+ ${CC} ${CPPFLAGS} ${CFLAGS} ${WRKSRC}/${f} -c -o ${WRKSRC}/${f:C/\.c/.o/}
.endfor
${CC} ${SRC:S|\.c|${WRKSRC}/.o|:S|^|${WRKSRC}/|} \
- -o ${WRKSRC}/${PORTNAME}
+ -o ${WRKSRC}/${PORTNAME} ${LDFLAGS} ${LIBS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff -ruN /usr/ports/audio/mp3guessenc/distinfo ./distinfo
--- /usr/ports/audio/mp3guessenc/distinfo 2012-11-29 00:52:08.000000000 +0100
+++ ./distinfo 2013-04-02 21:31:43.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (mp3guessenc-0.25alpha23-HPR.tar.gz) = 50937dcb66d32ab2ff4e560d8f1f437a5d0ea76c9061e96cf78101e2bb84f1bd
-SIZE (mp3guessenc-0.25alpha23-HPR.tar.gz) = 53920
+SHA256 (mp3guessenc-0.25beta1.tar.gz) = df8ad7e94d8d2f0151a346d400d53ac8246d6deff4ffc968ffd02241777510e0
+SIZE (mp3guessenc-0.25beta1.tar.gz) = 84588
--- mp3guessenc-0.25.b1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1UN7BE-000J7h-5g>