Attachment 242967 Details for Bug 272185 – Patch for flac

[patch] Patch for flac

flac143v2.patch (text/plain), 4.24 KB, created by Daniel Engberg on 2023-06-24 15:47:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-06-24 15:47:59 UTC

Size: 4.24 KB

patch

obsolete

>diff --git a/audio/flac/Makefile b/audio/flac/Makefile
>index 7a2684acdde5..765ecaa4ab43 100644
>--- a/audio/flac/Makefile
>+++ b/audio/flac/Makefile
>@@ -1,7 +1,8 @@
> PORTNAME=	flac
>-PORTVERSION=	1.4.2
>+DISTVERSION=	1.4.3
> CATEGORIES=	audio
>-MASTER_SITES=	https://downloads.xiph.org/releases/flac/
>+MASTER_SITES=	https://github.com/xiph/${PORTNAME}/releases/download/${DISTVERSION}/ \
>+		https://downloads.xiph.org/releases/${PORTNAME}/
> 
> MAINTAINER=	naddy@FreeBSD.org
> COMMENT=	Free lossless audio codec
>@@ -14,37 +15,33 @@ LICENSE_FILE_GFDL=	${WRKSRC}/COPYING.FDL
> 
> LIB_DEPENDS=	libogg.so:audio/libogg
> 
>-USES=		compiler:c11 cpe iconv libtool pathfix pkgconfig tar:xz
>-
>+USES=		cmake:testing compiler:c11 cpe gettext-runtime iconv \
>+		pathfix pkgconfig tar:xz
> CPE_VENDOR=	flac_project
>+USE_LDCONFIG=	yes
> 
> # Preserve UTF-8 filenames in test/flac-to-flac-metadata-test-files/.
> # They are referenced by the test suite.
> EXTRACT_CMD=	${SETENV} LC_ALL=C.UTF-8 ${TAR}
> 
>-USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-static \
>-		--with-ogg="${LOCALBASE}" \
>-		--disable-doxygen-docs \
>-		--disable-thorough-tests \
>-		--disable-xmms-plugin
>-INSTALL_TARGET=	install-strip
>-TEST_TARGET=	check
>+CMAKE_TESTING_ARGS=	-DCMAKE_CTEST_ARGUMENTS="-E;libFLAC"
> 
>-OPTIONS_DEFINE=	DOCS
>+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
>+CMAKE_OFF=	BUILD_DOCS BUILD_TESTING WITH_STACK_PROTECTOR
>+CMAKE_ON=	BUILD_SHARED_LIBS
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=	DOCS
> 
>-.if ${ARCH} != powerpc64le
>-CONFIGURE_ARGS+=--disable-vsx
>-.endif
>+post-install:
>+	${INSTALL_DATA} ${WRKSRC}/src/*/*.m4 ${STAGEDIR}${PREFIX}/share/aclocal
> 
>-# test_libFLAC:
>-# "iterator claims file is writable when tester thinks it should not be"
>-.if ${UID} == 0
>-do-test:
>-	@${ECHO_MSG} "The tests cannot be run as root, skipping."
>-.endif
>+post-install-DOCS-on:
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}/api
>+	${INSTALL_MAN} ${WRKSRC}/doc/api/* ${STAGEDIR}${DOCSDIR}/api
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}/images
>+	${INSTALL_MAN} ${WRKSRC}/doc/images/*.gif ${STAGEDIR}${DOCSDIR}/images
>+	${INSTALL_MAN} ${WRKSRC}/doc/images/*.svg ${STAGEDIR}${DOCSDIR}/images
>+	${INSTALL_MAN} ${WRKSRC}/doc/*.tag ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_MAN} ${WRKSRC}/doc/isoflac.txt ${STAGEDIR}${DOCSDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/audio/flac/distinfo b/audio/flac/distinfo
>index fc1c468e3fdd..8c9c588b9a07 100644
>--- a/audio/flac/distinfo
>+++ b/audio/flac/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1666882895
>-SHA256 (flac-1.4.2.tar.xz) = e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4
>-SIZE (flac-1.4.2.tar.xz) = 1013700
>+TIMESTAMP = 1687505819
>+SHA256 (flac-1.4.3.tar.xz) = 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70
>+SIZE (flac-1.4.3.tar.xz) = 1006728
>diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
>deleted file mode 100644
>index 1f47882210cc..000000000000
>--- a/audio/flac/files/patch-configure
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- configure.orig	2022-10-27 15:10:23 UTC
>-+++ configure
>-@@ -21455,8 +21455,8 @@ fi
>- if test "x${ax_enable_debug}" = "xno"
>- then :
>- 
>--	CFLAGS="-O3 -funroll-loops $CFLAGS"
>--	CXXFLAGS="-O3 $CXXFLAGS"
>-+	#CFLAGS="-O3 -funroll-loops $CFLAGS"
>-+	#CXXFLAGS="-O3 $CXXFLAGS"
>- 
>- fi
>- 
>diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
>index e879d8ededcb..5837a1560a61 100644
>--- a/audio/flac/pkg-plist
>+++ b/audio/flac/pkg-plist
>@@ -14,14 +14,16 @@ include/FLAC/metadata.h
> include/FLAC/ordinals.h
> include/FLAC/stream_decoder.h
> include/FLAC/stream_encoder.h
>-lib/libFLAC++.a
>+lib/cmake/FLAC/flac-config-version.cmake
>+lib/cmake/FLAC/flac-config.cmake
>+lib/cmake/FLAC/targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/FLAC/targets.cmake
> lib/libFLAC++.so
> lib/libFLAC++.so.10
>-lib/libFLAC++.so.10.0.0
>-lib/libFLAC.a
>+lib/libFLAC++.so.10.0.1
> lib/libFLAC.so
> lib/libFLAC.so.12
>-lib/libFLAC.so.12.0.0
>+lib/libFLAC.so.12.1.0
> libdata/pkgconfig/flac++.pc
> libdata/pkgconfig/flac.pc
> man/man1/flac.1.gz
>@@ -29,6 +31,7 @@ man/man1/metaflac.1.gz
> share/aclocal/libFLAC++.m4
> share/aclocal/libFLAC.m4
> %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
>+%%PORTDOCS%%%%DOCSDIR%%/isoflac.txt
> %%PORTDOCS%%%%DOCSDIR%%/api/FLAC_09_09_2all_8h_source.html
> %%PORTDOCS%%%%DOCSDIR%%/api/FLAC_09_09_2export_8h.html
> %%PORTDOCS%%%%DOCSDIR%%/api/FLAC_09_09_2export_8h_source.html

Actions: View | Diff

Attachments on bug 272185: 242967