svn commit: r376724 - in head/audio: flac flac/files xmms-flac xmms-flac/files
Christian Weisgerber
naddy at FreeBSD.org
Sat Jan 10 20:16:40 UTC 2015
Author: naddy
Date: Sat Jan 10 20:16:37 2015
New Revision: 376724
URL: https://svnweb.freebsd.org/changeset/ports/376724
QAT: https://qat.redports.org/buildarchive/r376724/
Log:
Update to FLAC 1.3.1. No significant user-visible changes.
Drop iconv option again and always require iconv for flac.
Deleted:
head/audio/flac/files/patch-src_libFLAC_stream__decoder.c
head/audio/flac/files/patch-src_libFLAC_stream__encoder.c
head/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
Modified:
head/audio/flac/Makefile
head/audio/flac/distinfo
head/audio/flac/files/patch-configure (contents, props changed)
head/audio/flac/files/patch-man_flac.1 (contents, props changed)
head/audio/flac/pkg-plist
head/audio/xmms-flac/Makefile
head/audio/xmms-flac/distinfo
head/audio/xmms-flac/files/patch-configure
Modified: head/audio/flac/Makefile
==============================================================================
--- head/audio/flac/Makefile Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/flac/Makefile Sat Jan 10 20:16:37 2015 (r376724)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flac
-PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTVERSION= 1.3.1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/flac/
@@ -12,7 +11,8 @@ COMMENT= Free lossless audio codec
LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg
-USES= libtool pathfix pkgconfig tar:xz
+USES= iconv libtool pathfix pkgconfig tar:xz
+
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static \
@@ -22,26 +22,17 @@ CONFIGURE_ARGS= --enable-static \
--disable-thorough-tests \
--disable-xmms-plugin
-OPTIONS_DEFINE= DOCS ICONV
-OPTIONS_DEFAULT=ICONV
-
-ICONV_USES= iconv
-ICONV_CPPFLAGS= -I${ICONV_PREFIX}/include
-ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib
-ICONV_CONFIGURE_OFF= am_cv_func_iconv=no
-
.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
-pre-patch:
- @${REINPLACE_CMD} 's:^docdir = $$(datadir)/doc/$$(PACKAGE)-$$(VERSION):docdir = $$(datadir)/doc/$$(PACKAGE):' \
- `find ${WRKSRC}/doc -name Makefile.in`
-
-post-build:
- ${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
+post-install:
+ cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} ${DISTNAME} flac
+ ${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' \
+ ${STAGEDIR}${PREFIX}/man/man1/flac.1
+ ${RM} ${STAGEDIR}${PREFIX}/man/man1/flac.1.bak
regression-test: build
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
Modified: head/audio/flac/distinfo
==============================================================================
--- head/audio/flac/distinfo Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/flac/distinfo Sat Jan 10 20:16:37 2015 (r376724)
@@ -1,2 +1,2 @@
-SHA256 (flac-1.3.0.tar.xz) = fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
-SIZE (flac-1.3.0.tar.xz) = 1084256
+SHA256 (flac-1.3.1.tar.xz) = 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c
+SIZE (flac-1.3.1.tar.xz) = 941848
Modified: head/audio/flac/files/patch-configure
==============================================================================
--- head/audio/flac/files/patch-configure Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/flac/files/patch-configure Sat Jan 10 20:16:37 2015 (r376724)
@@ -1,14 +1,31 @@
-
-$FreeBSD$
-
---- configure.orig 2013-05-27 10:11:54.740045000 +0200
-+++ configure 2013-06-09 18:15:53.000000000 +0200
-@@ -19807,7 +19807,7 @@ else
+--- configure.orig 2014-11-27 02:46:58 UTC
++++ configure
+@@ -17885,7 +17885,7 @@ _ACEOF
+
+ asm_optimisation=no
+ case "$host_cpu" in
+- x86_64)
++ amd64|x86_64)
+ if test $ac_cv_sizeof_voidp = 4 ; then
+ # This must be a 32 bit user space running on 64 bit kernel so treat
+ # this as ia32.
+@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then
+ CFLAGS="-g $CFLAGS"
+ else
CPPFLAGS="-DNDEBUG $CPPFLAGS"
- if test "x$GCC" = xyes; then
- if test "x$user_cflags" = x; then
-- CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
-+ CFLAGS="-Wall -W"
- fi
- fi
+- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+- CFLAGS="-O3 -funroll-loops $CFLAGS"
++ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
++ #CFLAGS="-O3 -funroll-loops $CFLAGS"
fi
+
+
+@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj
+
+ fi
+
+- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
++ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5
+ $as_echo_n "checking if $CC accepts -msse2... " >&6; }
+ ac_add_cflags__old_cflags="$CFLAGS"
Modified: head/audio/flac/files/patch-man_flac.1
==============================================================================
--- head/audio/flac/files/patch-man_flac.1 Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/flac/files/patch-man_flac.1 Sat Jan 10 20:16:37 2015 (r376724)
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- man/flac.1.orig 2013-05-26 11:30:33.924201000 +0200
-+++ man/flac.1 2013-06-09 18:16:59.000000000 +0200
-@@ -380,7 +380,7 @@ These flags can be used to invert the se
+--- man/flac.1.orig 2014-11-25 03:40:14 UTC
++++ man/flac.1
+@@ -384,7 +384,7 @@ These flags can be used to invert the se
.PP
- metaflac(1).
+ metaflac(1)
.PP
-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
+The programs are documented fully by HTML format documentation, available in \fI%%PREFIX%%/share/doc/flac/html\fR.
.SH "AUTHOR"
.PP
- This manual page was written by Matt Zimmerman <mdz at debian.org> for the Debian GNU/Linux system (but may be used by others).
+ This manual page was initially written by Matt Zimmerman <mdz at debian.org> for the Debian GNU/Linux system (but may be used by others). It has been kept up-to-date by the Xiph.org Foundation.
Modified: head/audio/flac/pkg-plist
==============================================================================
--- head/audio/flac/pkg-plist Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/flac/pkg-plist Sat Jan 10 20:16:37 2015 (r376724)
@@ -30,90 +30,22 @@ share/aclocal/libFLAC++.m4
share/aclocal/libFLAC.m4
%%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__chopin_prelude_24.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__dream_theater_600.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__eddie_warner_titus.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__fanfare_de_l_eventail_de_jeanne.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__gloria_estefan_conga.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__hand_in_my_pocket.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__l_sub_raga_sivapriya.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__laetatus_sum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__mummified_in_barbed_wire.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__prokofiev_pcon3_3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__ravel_sq4_4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__scarlatti_k42.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__tool_forty_six_and_2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__white_room.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpudectime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpuenctime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procdectime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procenctime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_ratio.html
%%PORTDOCS%%%%DOCSDIR%%/html/developers.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_bugs.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_example_code.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_format_overview.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tasks.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_flac.html
%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_metaflac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%/html/download.html
%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
%%PORTDOCS%%%%DOCSDIR%%/html/favicon.ico
%%PORTDOCS%%%%DOCSDIR%%/html/features.html
%%PORTDOCS%%%%DOCSDIR%%/html/flac.css
%%PORTDOCS%%%%DOCSDIR%%/html/format.html
%%PORTDOCS%%%%DOCSDIR%%/html/id.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Blackbird_Front_low3_325x87.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MS300frontsmall_270x108.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MediaBox_Frt_170x325.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/SB_Hero_Black_325x182.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Sooloos-ControlOne_325x328.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Z500_front_325x94.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/a2_01_325x252.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/arcus_325x135.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/bmp-1430_325x241.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/cs505_front_lrg_325x113.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/escient_ProductLine_325x163.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/i-station-mini-dx_325x237.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/iwod-g10_325x257.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/knc_hr-2800_325x209.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/meizu_m6_325x206.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/musica_artwork_325x90.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/neodigits_x5000_325x124.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/onda-vx737_325x240.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/request_n_front_325x103.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/rio_karma_279x254.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/sonos_family_RGB_325x200.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/teclast-tl29_325x244.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/transporter_hero_grey_325x208.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/tvix-4000_325x204.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/logo100.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/logo.svg
%%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/itunes.html
%%PORTDOCS%%%%DOCSDIR%%/html/license.html
-%%PORTDOCS%%%%DOCSDIR%%/html/links.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news.html
%%PORTDOCS%%%%DOCSDIR%%/html/ogg_mapping.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/authors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/comparison.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/developers.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/download.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/features.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/goals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/id.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/links.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/news.html
Modified: head/audio/xmms-flac/Makefile
==============================================================================
--- head/audio/xmms-flac/Makefile Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/xmms-flac/Makefile Sat Jan 10 20:16:37 2015 (r376724)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xmms-flac
-PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTVERSION= 1.3.1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/flac/
DISTNAME= flac-${PORTVERSION}
Modified: head/audio/xmms-flac/distinfo
==============================================================================
--- head/audio/xmms-flac/distinfo Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/xmms-flac/distinfo Sat Jan 10 20:16:37 2015 (r376724)
@@ -1,2 +1,2 @@
-SHA256 (flac-1.3.0.tar.xz) = fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
-SIZE (flac-1.3.0.tar.xz) = 1084256
+SHA256 (flac-1.3.1.tar.xz) = 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c
+SIZE (flac-1.3.1.tar.xz) = 941848
Modified: head/audio/xmms-flac/files/patch-configure
==============================================================================
--- head/audio/xmms-flac/files/patch-configure Sat Jan 10 19:45:01 2015 (r376723)
+++ head/audio/xmms-flac/files/patch-configure Sat Jan 10 20:16:37 2015 (r376724)
@@ -1,11 +1,31 @@
---- configure.orig 2013-05-27 10:11:54.740045000 +0200
-+++ configure 2013-06-09 18:15:53.000000000 +0200
-@@ -19807,7 +19807,7 @@ else
+--- configure.orig 2014-11-27 02:46:58 UTC
++++ configure
+@@ -17885,7 +17885,7 @@ _ACEOF
+
+ asm_optimisation=no
+ case "$host_cpu" in
+- x86_64)
++ amd64|x86_64)
+ if test $ac_cv_sizeof_voidp = 4 ; then
+ # This must be a 32 bit user space running on 64 bit kernel so treat
+ # this as ia32.
+@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then
+ CFLAGS="-g $CFLAGS"
+ else
CPPFLAGS="-DNDEBUG $CPPFLAGS"
- if test "x$GCC" = xyes; then
- if test "x$user_cflags" = x; then
-- CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
-+ CFLAGS="-Wall -W"
- fi
- fi
+- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+- CFLAGS="-O3 -funroll-loops $CFLAGS"
++ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
++ #CFLAGS="-O3 -funroll-loops $CFLAGS"
fi
+
+
+@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj
+
+ fi
+
+- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
++ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5
+ $as_echo_n "checking if $CC accepts -msse2... " >&6; }
+ ac_add_cflags__old_cflags="$CFLAGS"
More information about the svn-ports-all
mailing list