From 688a2e92547f3651193a332c927fb5da90837d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Oct 2022 18:11:19 +0700 Subject: [PATCH 1/2] MonkeysAudio: remove package - distfiles for 5.28 has been gone from upstream - its only dependent: asunder will be removed because of gtk+2.0 - license is non-free and restricted from at least 2008 [debian] - current license is obviously non-free and restricted: > The redistribution of Monkey's Audio is only allowed in cases where the original installer and components therein have not been modified. [debian]: https://lists.debian.org/debian-legal/2008/03/msg00070.html --- srcpkgs/MonkeysAudio/files/MAC.pc | 17 ----- srcpkgs/MonkeysAudio/patches/big-endian.patch | 30 --------- srcpkgs/MonkeysAudio/patches/endian.patch | 66 ------------------- srcpkgs/MonkeysAudio/patches/ppc64.patch | 39 ----------- srcpkgs/MonkeysAudio/template | 57 ---------------- 5 files changed, 209 deletions(-) delete mode 100644 srcpkgs/MonkeysAudio/files/MAC.pc delete mode 100644 srcpkgs/MonkeysAudio/patches/big-endian.patch delete mode 100644 srcpkgs/MonkeysAudio/patches/endian.patch delete mode 100644 srcpkgs/MonkeysAudio/patches/ppc64.patch delete mode 100644 srcpkgs/MonkeysAudio/template diff --git a/srcpkgs/MonkeysAudio/files/MAC.pc b/srcpkgs/MonkeysAudio/files/MAC.pc deleted file mode 100644 index cb2344a4d59a..000000000000 --- a/srcpkgs/MonkeysAudio/files/MAC.pc +++ /dev/null @@ -1,17 +0,0 @@ -V=%VER% -R=%REL% - -prefix=/usr -INSTALL_BIN=${prefix}/bin -INSTALL_INC=${prefix}/include -INSTALL_LIB=${prefix}/lib -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/MAC - -Name: MonkeysAudio library -Description: A fast and powerful lossless audio compressor and decompressor -Version: ${R} -Requires: -Libs: -L${libdir} -llibMAC -Cflags: -I${includedir} diff --git a/srcpkgs/MonkeysAudio/patches/big-endian.patch b/srcpkgs/MonkeysAudio/patches/big-endian.patch deleted file mode 100644 index 41255cccd4fe..000000000000 --- a/srcpkgs/MonkeysAudio/patches/big-endian.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cbace147456d6ccc1921f62582a791b340b8a88d Mon Sep 17 00:00:00 2001 -From: q66 -Date: Fri, 10 Apr 2020 20:31:00 +0200 -Subject: [PATCH] fix build on big endian - ---- - Source/MACLib/MD5.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git Source/MACLib/MD5.cpp Source/MACLib/MD5.cpp -index c122fb5..89079b2 100644 ---- a/Source/MACLib/MD5.cpp -+++ b/Source/MACLib/MD5.cpp -@@ -35,11 +35,11 @@ CopyToLittleEndian ( uint32_t* dst, - const uint8_t* src, - size_t length ) - { -- for ( ; length--; src += 4; dst++ ) { -- *dst = (( (uint32_t) src [3] ) << 24) | -- (( (uint32_t) src [2] ) << 16) | -- (( (uint32_t) src [1] ) << 8) | -- (( (uint32_t) src [0] ) << 0); -+ for ( ; length--; src += 4 ) { -+ *dst++ = (( (uint32_t) src [3] ) << 24) | -+ (( (uint32_t) src [2] ) << 16) | -+ (( (uint32_t) src [1] ) << 8) | -+ (( (uint32_t) src [0] ) << 0); - - - } diff --git a/srcpkgs/MonkeysAudio/patches/endian.patch b/srcpkgs/MonkeysAudio/patches/endian.patch deleted file mode 100644 index e5fbe8a10af1..000000000000 --- a/srcpkgs/MonkeysAudio/patches/endian.patch +++ /dev/null @@ -1,66 +0,0 @@ -From ba9bb2bccdf67a8a202c578fcf09a3aa6dda4c63 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Fri, 10 Apr 2020 20:22:17 +0200 -Subject: [PATCH] MonkeysAudio: patch out bad endian definitions breaking - builds - ---- - Shared/All.h | 8 +------- - Source/Shared/All.h | 8 +------- - 2 files changed, 2 insertions(+), 14 deletions(-) - -diff --git Shared/All.h Shared/All.h -index 6dfb669..cc9a988 100644 ---- a/Shared/All.h -+++ b/Shared/All.h -@@ -45,6 +45,7 @@ Global includes - #include - #include - #include -+ #include - #include "NoWindows.h" - #endif - #define ape_max(a,b) (((a) > (b)) ? (a) : (b)) -@@ -246,13 +247,6 @@ Global defines - #define APE_FILENAME_SLASH '/' - #endif - --/***************************************************************************************** --Byte order --*****************************************************************************************/ --#define __LITTLE_ENDIAN 1234 --#define __BIG_ENDIAN 4321 --#define __BYTE_ORDER __LITTLE_ENDIAN -- - /***************************************************************************************** - Macros - *****************************************************************************************/ -diff --git Source/Shared/All.h Source/Shared/All.h -index 6dfb669..cc9a988 100644 ---- a/Source/Shared/All.h -+++ b/Source/Shared/All.h -@@ -45,6 +45,7 @@ Global includes - #include - #include - #include -+ #include - #include "NoWindows.h" - #endif - #define ape_max(a,b) (((a) > (b)) ? (a) : (b)) -@@ -246,13 +247,6 @@ Global defines - #define APE_FILENAME_SLASH '/' - #endif - --/***************************************************************************************** --Byte order --*****************************************************************************************/ --#define __LITTLE_ENDIAN 1234 --#define __BIG_ENDIAN 4321 --#define __BYTE_ORDER __LITTLE_ENDIAN -- - /***************************************************************************************** - Macros - *****************************************************************************************/ --- -2.25.1 - diff --git a/srcpkgs/MonkeysAudio/patches/ppc64.patch b/srcpkgs/MonkeysAudio/patches/ppc64.patch deleted file mode 100644 index 5cfac477c67d..000000000000 --- a/srcpkgs/MonkeysAudio/patches/ppc64.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9b8a97da0946d01f60798a5636062141a61a92ac Mon Sep 17 00:00:00 2001 -From: q66 -Date: Fri, 10 Apr 2020 20:26:23 +0200 -Subject: [PATCH] add powerpc64 in 64-bit platforms to unbreak build - ---- - Shared/All.h | 2 +- - Source/Shared/All.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git Shared/All.h Shared/All.h -index cc9a988..615e3d1 100644 ---- a/Shared/All.h -+++ b/Shared/All.h -@@ -123,7 +123,7 @@ Global compiler settings (useful for porting) - #endif - #endif - --#if __x86_64__ || __aarch64__ -+#if __x86_64__ || __aarch64__ || __powerpc64__ - #ifndef PLATFORM_x64 - #define PLATFORM_x64 - #endif -diff --git Source/Shared/All.h Source/Shared/All.h -index cc9a988..615e3d1 100644 ---- a/Source/Shared/All.h -+++ b/Source/Shared/All.h -@@ -123,7 +123,7 @@ Global compiler settings (useful for porting) - #endif - #endif - --#if __x86_64__ || __aarch64__ -+#if __x86_64__ || __aarch64__ || __powerpc64__ - #ifndef PLATFORM_x64 - #define PLATFORM_x64 - #endif --- -2.25.1 - diff --git a/srcpkgs/MonkeysAudio/template b/srcpkgs/MonkeysAudio/template deleted file mode 100644 index 6b9f47eda5e6..000000000000 --- a/srcpkgs/MonkeysAudio/template +++ /dev/null @@ -1,57 +0,0 @@ -# Template file for 'MonkeysAudio' -pkgname=MonkeysAudio -version=5.28 -revision=3 -create_wrksrc=yes -build_style="gnu-makefile" -depends="libMAC>=${version}_${revision}" -short_desc="Fast and powerful lossless audio (de)compressor" -maintainer="Orphaned " -license="custom:MIT-like" -homepage="https://monkeysaudio.com/" -distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip - https://monkeysaudio.com/license.html" -checksum="0000cbfad5f008014bf3d963b72039c518a1e93ded55b23da715d912c830623e - 7d60dabaf760f32180e272b5955d5f1a2febcf9930eff13e49a1934a286a5819" -skip_extraction="license.html" - -do_build() { - cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/license.html ${wrksrc} - ln Source/Projects/NonWindows/Makefile . - vsed -i Makefile \ - -e "s;^VERSION.*;VERSION = 6.0.0;" \ - -e "s;^DLLLDOPTS.*;DLLLDOPTS = -shared -Wl,-soname,libMAC.so.6;" - make ${makejobs} -} - -do_install() { - make prefix="${DESTDIR}"/usr install - ln -s libMAC.so.6.0.0 "${DESTDIR}"/usr/lib/libMAC.so.6.0 - ln -s libMAC.so.6.0.0 "${DESTDIR}"/usr/lib/libMAC.so.6 - - vmkdir usr/lib/pkgconfig - sed ${FILESDIR}/MAC.pc \ - -e "s;%VER%;${version};" \ - -e "s;%REL%;${revision};" \ - > ${DESTDIR}/usr/lib/pkgconfig/MAC.pc - - vlicense license.html - vdoc Readme.txt -} - -libMAC-devel_package() { - short_desc+=" - development files" - depends="libMAC>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/libMAC.so - } -} - -libMAC_package() { - short_desc+=" - library" - pkg_install() { - vmove "usr/lib/libMAC.so.*" - } -} From 18faa3182bac759e0367ad9d72dd51fe7225dc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Oct 2022 18:13:47 +0700 Subject: [PATCH 2/2] asunder: remove package - needs gtk+2.0 - Monkeys-Audio is non-free and restricted. --- srcpkgs/asunder/template | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 srcpkgs/asunder/template diff --git a/srcpkgs/asunder/template b/srcpkgs/asunder/template deleted file mode 100644 index b176114f1f49..000000000000 --- a/srcpkgs/asunder/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'asunder' -pkgname=asunder -version=2.9.7 -revision=1 -build_style=gnu-configure -hostmakedepends="intltool pkg-config" -makedepends="gtk+-devel libcddb-devel" -depends="MonkeysAudio cdparanoia flac lame opus vorbis-tools wavpack" -short_desc="Graphical Audio CD ripper and encoder" -maintainer="Helmut Pozimski " -license="GPL-2.0-or-later" -homepage="http://littlesvr.ca/asunder/" -distfiles="http://littlesvr.ca/asunder/releases/asunder-${version}.tar.bz2" -checksum=c1c97cd34c04b8595e95df8a9a7dbc64a1e61f494b7a0cd2873802ad111874f4 - -pre_build() { - vsed -i 's:cd syslogng && $(MAKE) install:true:' Makefile.in -}