From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 22 01:00:11 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DFE0116A475 for ; Thu, 22 Mar 2007 01:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id BE68D13C4F5 for ; Thu, 22 Mar 2007 01:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2M10BSw004627 for ; Thu, 22 Mar 2007 01:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2M10BBi004626; Thu, 22 Mar 2007 01:00:11 GMT (envelope-from gnats) Resent-Date: Thu, 22 Mar 2007 01:00:11 GMT Resent-Message-Id: <200703220100.l2M10BBi004626@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D801B16A405 for ; Thu, 22 Mar 2007 00:52:44 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: from relay02.pair.com (relay02.pair.com [209.68.5.16]) by mx1.freebsd.org (Postfix) with SMTP id 9C81513C4C5 for ; Thu, 22 Mar 2007 00:52:44 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: (qmail 3053 invoked from network); 22 Mar 2007 00:52:42 -0000 Received: from 190.55.87.118 (HELO deimos.mars.bsd) (190.55.87.118) by relay02.pair.com with SMTP; 22 Mar 2007 00:52:42 -0000 Message-Id: <1174524766.91733@deimos.mars.bsd> Date: Wed, 21 Mar 2007 21:52:46 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: Subject: ports/110650: [PATCH] audio/sdl_sound: don't use broken internal MP3 decoder X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Mar 2007 01:00:12 -0000 >Number: 110650 >Category: ports >Synopsis: [PATCH] audio/sdl_sound: don't use broken internal MP3 decoder >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Mar 22 01:00:11 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007 root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP >Description: - Convert KNOBS to OPTIONS. - When enabling MPEG use it for MP3 decoding, and when disabling it warn the user about the broken included decoder (see http://source.bungie.org/wiki/index.php/Linux_Build_Instructions). >How-To-Repeat: >Fix: --- sdl_sound.diff begins here --- Index: sdl_sound/Makefile =================================================================== RCS file: /home/pcvs/ports/audio/sdl_sound/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- sdl_sound/Makefile 23 Feb 2007 22:51:09 -0000 1.22 +++ sdl_sound/Makefile 6 Mar 2007 23:28:16 -0000 @@ -15,79 +15,71 @@ MAINTAINER= dyeske@yahoo.com COMMENT= A SDL audio library and player for some popular sound file formats -USE_SDL= sdl USE_AUTOTOOLS= libtool:15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes +USE_SDL= sdl +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" + +OPTIONS= FLAC "Enable flac support" on \ + MIKMOD "Enable mikmod support" on \ + PHYSFS "Enable physfs support" on \ + SMPEG "Enable smpeg support" on \ + SPEEX "Enable speex support" on \ + MIDI "Enable MIDI support" on \ + VORBIS "Enable Ogg Vorbis support" on .include .if !defined(WITHOUT_FLAC) LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac .else -CONFIGURE_ARGS+= --disable-flac +CONFIGURE_ARGS+=--disable-flac .endif .if !defined(WITHOUT_MIKMOD) LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod .else -CONFIGURE_ARGS+= --disable-mikmod +CONFIGURE_ARGS+=--disable-mikmod .endif .if !defined(WITHOUT_PHYSFS) LIB_DEPENDS+= physfs-1.0.1:${PORTSDIR}/devel/physfs .else -CONFIGURE_ARGS+= --disable-physfs +CONFIGURE_ARGS+=--disable-physfs .endif .if !defined(WITHOUT_SMPEG) LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg +CONFIGURE_ARGS+=--disable-mpglib .else -CONFIGURE_ARGS+= --disable-smpeg +CONFIGURE_ARGS+=--disable-smpeg .endif .if !defined(WITHOUT_SPEEX) LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex .else -CONFIGURE_ARGS+= --disable-speex +CONFIGURE_ARGS+=--disable-speex .endif .if !defined(WITHOUT_MIDI) RUN_DEPENDS+= ${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity BUILD_DEPENDS+= ${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity .else -CONFIGURE_ARGS+= --disable-midi +CONFIGURE_ARGS+=--disable-midi .endif .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis .else -CONFIGURE_ARGS+= --disable-ogg +CONFIGURE_ARGS+=--disable-ogg .endif -pre-extract: -.if !defined(WITHOUT_FLAC) - @${ECHO_MSG} "You can disable support for flac by defining WITHOUT_FLAC." -.endif -.if !defined(WITHOUT_MIKMOD) - @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD." -.endif -.if !defined(WITHOUT_PHYSFS) - @${ECHO_MSG} "You can disable support for physfs by defining WITHOUT_PHYSFS." -.endif -.if !defined(WITHOUT_SMPEG) - @${ECHO_MSG} "You can disable support for smpeg by defining WITHOUT_SMPEG." -.endif -.if !defined(WITHOUT_SPEEX) - @${ECHO_MSG} "You can disable support for speex by defining WITHOUT_SPEEX." -.endif -.if !defined(WITHOUT_MIDI) - @${ECHO_MSG} "You can disable support for midi by defining WITHOUT_MIDI." -.endif -.if !defined(WITHOUT_VORBIS) - @${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS." +.if defined(WITHOUT_SMPEG) +pre-everything:: + @${ECHO_CMD} + @${ECHO_CMD} "WARNING: the built-in MP3 support is currently broken, consider enabling the SMPEG option to use that library instead." | ${FMT} + @${ECHO_CMD} .endif .include --- sdl_sound.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: