Attachment 235193 Details for Bug 265155 – Patch for wavpack

[patch] Patch for wavpack

wavpack-550-cmake-v3.patch (text/plain), 3.72 KB, created by Daniel Engberg on 2022-07-11 16:36:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-07-11 16:36:39 UTC

Size: 3.72 KB

patch

obsolete

>diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
>index 4d9a285798fc..412b68583a3d 100644
>--- a/audio/wavpack/Makefile
>+++ b/audio/wavpack/Makefile
>@@ -1,9 +1,10 @@
> # Created by: Koop Mast <kwm@FreeBSD.org>
> 
> PORTNAME=	wavpack
>-DISTVERSION=	5.4.0
>+DISTVERSION=	5.5.0
> CATEGORIES=	audio
>-MASTER_SITES=	http://www.wavpack.com/
>+MASTER_SITES=	https://github.com/dbry/WavPack/releases/download/${DISTVERSION}/ \
>+		http://www.wavpack.com/
> 
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Audio codec for lossless, lossy, and hybrid compression
>@@ -11,19 +12,15 @@ COMMENT=	Audio codec for lossless, lossy, and hybrid compression
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cpe iconv libtool pathfix pkgconfig tar:bzip2
>+USES=		cmake:testing cpe iconv pathfix pkgconfig ssl tar:xz
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
>-INSTALL_TARGET=	install-strip
>+
>+CMAKE_OFF=	BUILD_TESTING WAVPACK_BUILD_DOCS
>+CMAKE_ON=	BUILD_SHARED_LIBS
> 
> OPTIONS_DEFINE=	ASM
>-OPTIONS_DEFAULT_amd64=	ASM
>-OPTIONS_DEFAULT_armv6=	ASM
>-OPTIONS_DEFAULT_armv7=	ASM
>+OPTIONS_DEFAULT=ASM
> 
>-ASM_CONFIGURE_OFF=	--disable-asm
>-ASM_DESC=	Optimized assembler routines (requires MMX on x86)
>+ASM_CMAKE_BOOL=	WAVPACK_ENABLE_ASM
> 
> .include <bsd.port.mk>
>diff --git a/audio/wavpack/distinfo b/audio/wavpack/distinfo
>index d863d499912a..5a477ef6a670 100644
>--- a/audio/wavpack/distinfo
>+++ b/audio/wavpack/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1610607585
>-SHA256 (wavpack-5.4.0.tar.bz2) = 0716a6dcf9a72d61005e1b09bbbd61aaf49837cb4e4a351992a6daed16cac034
>-SIZE (wavpack-5.4.0.tar.bz2) = 863429
>+TIMESTAMP = 1657482310
>+SHA256 (wavpack-5.5.0.tar.xz) = ef749d98df46925bc2916993e601cc7ee9114d99653e63e0e304f031ba73b8e6
>+SIZE (wavpack-5.5.0.tar.xz) = 797996
>diff --git a/audio/wavpack/files/patch-CMakeLists.txt b/audio/wavpack/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..6d2348a82ec5
>--- /dev/null
>+++ b/audio/wavpack/files/patch-CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2022-07-11 12:43:53 UTC
>++++ CMakeLists.txt
>+@@ -617,7 +617,7 @@ install(TARGETS ${WAVPACK_INSTALL_TARGETS}
>+     RUNTIME DESTINATION         ${CMAKE_INSTALL_BINDIR}
>+     ARCHIVE DESTINATION         ${CMAKE_INSTALL_LIBDIR}
>+     LIBRARY DESTINATION         ${CMAKE_INSTALL_LIBDIR}
>+-    PUBLIC_HEADER DESTINATION   ${CMAKE_INSTALL_INCLUDEDIR}
>++    PUBLIC_HEADER DESTINATION   ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}
>+ )
>+ 
>+ if(WAVPACK_INSTALL_CMAKE_MODULE)
>diff --git a/audio/wavpack/files/patch-configure b/audio/wavpack/files/patch-configure
>deleted file mode 100644
>index 0f1d66781dd8..000000000000
>--- a/audio/wavpack/files/patch-configure
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- configure.orig	2017-01-17 04:32:28 UTC
>-+++ configure
>-@@ -13715,7 +13715,7 @@ $as_echo_n "checking if assembly optimiz
>-   i386|i486|i586|i686|i786) :
>-     $as_echo "#define OPT_ASM_X86 1" >>confdefs.h
>-  asm_selected=x86 ;; #(
>--  x86_64) :
>-+  x86_64|amd64) :
>-     $as_echo "#define OPT_ASM_X64 1" >>confdefs.h
>-  asm_selected=x64 ;; #(
>-   arm*) :
>diff --git a/audio/wavpack/pkg-plist b/audio/wavpack/pkg-plist
>index 4c2a0d2782a9..2764fdeb4444 100644
>--- a/audio/wavpack/pkg-plist
>+++ b/audio/wavpack/pkg-plist
>@@ -3,12 +3,12 @@ bin/wvgain
> bin/wvtag
> bin/wvunpack
> include/wavpack/wavpack.h
>-lib/libwavpack.a
>+lib/cmake/WavPack/wavpack-config-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/WavPack/wavpack-config-version.cmake
>+lib/cmake/WavPack/wavpack-config.cmake
> lib/libwavpack.so
>-lib/libwavpack.so.1
>-lib/libwavpack.so.1.2.3
> libdata/pkgconfig/wavpack.pc
>-man/man1/wavpack.1.gz
>-man/man1/wvgain.1.gz
>-man/man1/wvtag.1.gz
>-man/man1/wvunpack.1.gz
>+share/man/man1/wavpack.1.gz
>+share/man/man1/wvgain.1.gz
>+share/man/man1/wvtag.1.gz
>+share/man/man1/wvunpack.1.gz

Actions: View | Diff

Attachments on bug 265155: 235193 | 235194