Date: Thu, 17 Jan 2002 20:58:37 +0100 From: Christian Weisgerber <naddy@freebsd.org> To: freebsd-ports@freebsd.org Subject: Need i386 testers for audio/flac update Message-ID: <20020117195837.GA64263@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
I have prepared an update of audio/flac to 1.0.2, patch attached.
I would appreciate if some people on i386 could try this, in
particular with SSE and 3Dnow! CPUs. There's some handcrafted
assembler code for i386 that I can't test here on alpha.
(Note that the appropriate MMX/SSE/3Dnow! routines will be picked
automatically at runtime depending on the actual CPU the code runs
on.)
--
Christian "naddy" Weisgerber naddy@mips.inka.de
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="flac.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/flac/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 6 Jan 2002 06:20:17 -0000 1.13
+++ Makefile 17 Jan 2002 19:27:36 -0000
@@ -1,4 +1,3 @@
-# ex:ts=8
# New ports collection makefile for: flac
# Date created: Mar 18, 2001
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
@@ -7,7 +6,7 @@
#
PORTNAME= flac
-PORTVERSION= 1.0
+PORTVERSION= 1.0.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,38 +14,43 @@
MAINTAINER= naddy@FreeBSD.org
+LIB_DEPENDS= ogg.3:${PORTSDIR}/audio/libogg
+
.if defined(WITH_XMMS)
BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
-LIB_DEPENDS+= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS+= xmms.3:${PORTSDIR}/audio/xmms
PLIST_SUB= XMMS=""
.else
+CONFIGURE_ENV+= XMMS_CONFIG=/usr/bin/false # must be absolute path
PLIST_SUB= XMMS="@comment "
.endif
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
+CONFIGURE_ARGS+= --enable-sse --enable-3dnow
.endif
-USE_AUTOMAKE_VER=14
-AUTOMAKE_ARGS= --include-deps
-USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV= INCLUDES="-I${WRKSRC}/include"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALLS_SHLIB= yes
MAN1= flac.1
-post-extract:
+pre-build:
@${RM} -r ${WRKSRC}/obj
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/flac
+ cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html ${PREFIX}/share/doc/flac
${MKDIR} ${PREFIX}/share/doc/flac/images
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/flac
-.for file in 1x1.gif cafebug.gif logo.jpg
- ${INSTALL_DATA} ${WRKSRC}/doc/images/${file} ${PREFIX}/share/doc/flac/images
-.endfor
+ cd ${WRKSRC}/doc/images; \
+ ${INSTALL_DATA} *.gif *.jpg ${PREFIX}/share/doc/flac/images
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/flac/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 3 Aug 2001 14:09:24 -0000 1.4
+++ distinfo 17 Jan 2002 19:27:36 -0000
@@ -1 +1 @@
-MD5 (flac-1.0-src.tar.gz) = 137a0f31ef41583e875928f84d9f8d11
+MD5 (flac-1.0.2-src.tar.gz) = 3b0c646f1e58d5345f3c555c3996885d
Index: pkg-comment
===================================================================
RCS file: /home/ncvs/ports/audio/flac/pkg-comment,v
retrieving revision 1.1
diff -u -r1.1 pkg-comment
--- pkg-comment 18 Mar 2001 05:08:04 -0000 1.1
+++ pkg-comment 17 Jan 2002 19:27:36 -0000
@@ -1 +1 @@
-FLAC stands for Free Lossless Audio Codec
+Free Lossless Audio Codec
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/flac/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 24 Sep 2001 09:53:12 -0000 1.5
+++ pkg-plist 17 Jan 2002 19:27:36 -0000
@@ -7,13 +7,14 @@
include/FLAC/format.h
include/FLAC/ordinals.h
include/FLAC/seek_table.h
+include/FLAC/seekable_stream_decoder.h
include/FLAC/stream_decoder.h
include/FLAC/stream_encoder.h
include/FLAC/utility.h
-@dirrm include/FLAC
lib/libFLAC.a
+lib/libFLAC.la
lib/libFLAC.so
-lib/libFLAC.so.1
+lib/libFLAC.so.2
%%PORTDOCS%%share/doc/flac/comparison.html
%%PORTDOCS%%share/doc/flac/developers.html
%%PORTDOCS%%share/doc/flac/documentation.html
@@ -22,11 +23,12 @@
%%PORTDOCS%%share/doc/flac/format.html
%%PORTDOCS%%share/doc/flac/goals.html
%%PORTDOCS%%share/doc/flac/id.html
-%%PORTDOCS%%share/doc/flac/index.html
-%%PORTDOCS%%share/doc/flac/news.html
%%PORTDOCS%%share/doc/flac/images/1x1.gif
%%PORTDOCS%%share/doc/flac/images/cafebug.gif
%%PORTDOCS%%share/doc/flac/images/logo.jpg
+%%PORTDOCS%%share/doc/flac/index.html
+%%PORTDOCS%%share/doc/flac/news.html
+@dirrm include/FLAC
%%PORTDOCS%%@dirrm share/doc/flac/images
%%PORTDOCS%%@dirrm share/doc/flac
%%XMMS%%@cwd %%X11BASE%%
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-configure 17 Jan 2002 19:27:36 -0000
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- configure.orig Thu Jan 17 15:47:34 2002
++++ configure Thu Jan 17 15:48:42 2002
+@@ -8240,13 +8240,13 @@
+ fi
+
+ SAVE_CFLAGS="$CFLAGS"
+-CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include -Wall -W'
++CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include'
+ if test x$debug = xtrue; then
+ CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+ else
+- CFLAGS="$CFLAGS -O3 -DNDEBUG"
++ CFLAGS="$CFLAGS -DNDEBUG"
+ if test x$GCC = xyes; then
+- CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -finline-functions -Winline -DFLaC__INLINE=__inline__"
++ CFLAGS="$CFLAGS -DFLaC__INLINE=__inline__"
+ fi
+ fi
+ CFLAGS="$CFLAGS $SAVE_CFLAGS"
Index: files/patch-configure.in
===================================================================
RCS file: files/patch-configure.in
diff -N files/patch-configure.in
--- files/patch-configure.in 24 Sep 2001 21:10:28 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-configure.in,v 1.7 2001/09/24 21:10:28 sf Exp $
-
---- configure.in.orig Sun Jul 22 19:43:15 2001
-+++ configure.in Tue Aug 28 17:00:19 2001
-@@ -136,13 +136,13 @@
- AC_SUBST(FLaC__USIZE64)
-
- SAVE_CFLAGS="$CFLAGS"
--CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include -Wall -W'
-+CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include'
- if test x$debug = xtrue; then
- CFLAGS="$CFLAGS -g -O0 -DDEBUG"
- else
-- CFLAGS="$CFLAGS -O3 -DNDEBUG"
-+ CFLAGS="$CFLAGS -DNDEBUG"
- if test x$GCC = xyes; then
-- CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -finline-functions -Winline -DFLaC__INLINE=__inline__"
-+ CFLAGS="$CFLAGS -DFLaC__INLINE=__inline__"
- fi
- fi
- CFLAGS="$CFLAGS $SAVE_CFLAGS"
Index: files/patch-src_flac_Makefile.am
===================================================================
RCS file: files/patch-src_flac_Makefile.am
diff -N files/patch-src_flac_Makefile.am
--- files/patch-src_flac_Makefile.am 24 Sep 2001 21:10:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_flac_Makefile.am,v 1.1 2001/09/24 21:10:28 sf Exp $
-
---- src/flac/Makefile.am.orig Tue Aug 28 15:58:11 2001
-+++ src/flac/Makefile.am Tue Aug 28 15:58:19 2001
-@@ -29,5 +29,4 @@
- encode.h \
- file.h
-
--flac_LDFLAGS = -lm
--flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
-+flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
Index: files/patch-src_test__streams_Makefile.am
===================================================================
RCS file: files/patch-src_test__streams_Makefile.am
diff -N files/patch-src_test__streams_Makefile.am
--- files/patch-src_test__streams_Makefile.am 24 Sep 2001 21:10:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_test__streams_Makefile.am,v 1.1 2001/09/24 21:10:28 sf Exp $
-
---- src/test_streams/Makefile.am.orig Tue Aug 28 16:00:17 2001
-+++ src/test_streams/Makefile.am Tue Aug 28 16:00:28 2001
-@@ -20,6 +20,6 @@
- noinst_PROGRAMS = test_streams
- test_streams_SOURCES = \
- main.c
--test_streams_LDFLAGS = -lm
-+test_streams_LDADD = -lm
-
- CLEANFILES = $(wildcard *.raw)
Index: files/patch-src_test__unit_Makefile.am
===================================================================
RCS file: files/patch-src_test__unit_Makefile.am
diff -N files/patch-src_test__unit_Makefile.am
--- files/patch-src_test__unit_Makefile.am 24 Sep 2001 21:10:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_test__unit_Makefile.am,v 1.1 2001/09/24 21:10:28 sf Exp $
-
---- src/test_unit/Makefile.am.orig Tue Aug 28 16:21:54 2001
-+++ src/test_unit/Makefile.am Tue Aug 28 16:22:05 2001
-@@ -19,8 +19,7 @@
- INCLUDES = -I$(top_srcdir)/src/libFLAC/include
-
- noinst_PROGRAMS = test_unit
--test_unit_LDFLAGS = -lm
--test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
-+test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
- test_unit_SOURCES = \
- bitbuffer.c \
- main.c \
--1yeeQ81UyVL57Vl7--
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?20020117195837.GA64263>