5:34 p.m.
commit 17de29a898a2a889aa0e744e4a80f7219799dca3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 27 17:34:21 2023 +0000
Update to 9.04
.gitignore | 1 +
License.htm | 44 --------------------
license.html | 99 ++++++++++++++++++++++++++++++++++++++++++++
mac-4.11-u4-b5-s7-gcc6.patch | 98 -------------------------------------------
mac.spec | 73 ++++++++------------------------
sources | 2 +-
6 files changed, 119 insertions(+), 198 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb3b048..c7cf357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
mac-3.99-u4-b5.tar.gz
/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
+/MAC_904_SDK.zip
diff --git a/license.html b/license.html
new file mode 100644
index 0000000..3e9f07b
--- /dev/null
+++ b/license.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+
+<!-- head -->
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8"
>
+<title>Monkey's Audio - a fast and powerful lossless audio
compressor</title>
+<link href="style.css" rel="stylesheet" type="text/css"
media="screen" >
+</head>
+
+<!-- body -->
+<body>
+<div id="wrapper">
+ <!-- header -->
+ <!-- logo -->
+ <div id="logo">
+ <h1>
+ <a href="index.html"><img src="images/banner.png"
alt="Monkey's Audio - a fast and powerful lossless audio compressor"
width="980" height="80" ></a>
+ </h1>
+ </div>
+
+ <!-- menu -->
+ <div id="menu">
+ <ul>
+ <li class="(none)"><a
href="index.html">Home</a></li>
+ <li class="(none)"><a
href="theory.html">Theory</a></li>
+ <li class="(none)"><a
href="help.html">Help</a></li>
+ <li class="(none)"><a
href="developers.html">Developers</a></li>
+ <li class="(none)"><a
href="versionhistory.html">Version History</a></li>
+ <li class="(none)"><a
href="links.html">Links</a></li>
+ <li class="(none)"><a
href="download.html">Download</a></li>
+ </ul>
+ </div>
+
+
+ <!-- page -->
+ <div id="page">
+ <div id="page-bgtop">
+ <div id="page-bgbtm">
+
+ <!-- left column -->
+ <div id="sidebar">
+ <h2>License</h2>
+ <p>
+ This is the license agreement for Monkey's Audio. The goal is to make it free
and easy for anyone or any company to use Monkey's Audio.
+ </p>
+ </div>
+
+ <!-- content -->
+ <div id="content">
+ <h2>Monkey's Audio Program License Agreement</h2>
+ <ol>
+ <li>Monkey's Audio is completely free for personal, educational, or
commercial use.</li>
+ <li>Although the software has been tested thoroughly, the
author is in no way responsible for damages due to bugs or misuse. </li>
+ <li>The redistribution of Monkey's Audio is only
allowed in cases where the original installer and components therein have not been
modified.</li>
+ <li>The use of Monkey's Audio or any component thereof
from another program requires compliance with the 'Monkey's Audio SDK and Source
Code License Agreement'.</li>
+ <li>Installing and using Monkey's Audio signifies the
acceptance of these terms. If you do not agree with any of the above terms, you must cease
using Monkey's Audio and remove it from your storage device.</li>
+ </ol>
+
+ <h2>Monkey's Audio SDK and Source Code License Agreement</h2>
+ <ol>
+ <li>The Monkey's Audio SDK and source code can be
freely used to add APE format playback, encoding, or tagging support to any product, free
or commercial.</li>
+ <li>Monkey's Audio source can be included in GPL and
open-source software, although Monkey's Audio itself will not be subjected to external
licensing requirements or other viral source restrictions.</li>
+ <li>Any source code, ideas, or libraries used must be
plainly acknowledged in the software using the code.</li>
+ <li>Although the software has been tested thoroughly, the
author is in no way responsible for damages due to bugs or misuse.</li>
+ <li>If you do not completely agree with all of the previous
stipulations, you must cease using this source code and remove it from your storage
device.</li>
+ </ol>
+
+ <h2>Contact</h2>
+ <p>
+ Please use the details <a href="contact.html">here</a> for
licensing questions or requests.
+ </p>
+ </div>
+
+ <div style="clear: both;"></div>
+ </div>
+ </div>
+ </div>
+
+ <!-- footer -->
+ <!-- footer -->
+ <div id="footer">
+ <div class="left">
+ <p><b>Thank You</b></p>
+ <p>Thank you for your support through 23 great years of Monkey's
Audio.</p>
+ </div>
+ <div class="right">
+ <ul class="grid">
+ <li>All materials and programs copyrighted ©2000-2023 by Matt
Ashland</li>
+ <li>Site by Matt Ashland, portions contributed by KiM</li>
+ <li>All rights reserved</li>
+ </ul>
+ </div>
+ </div>
+
+</div>
+</body>
+
+</html>
diff --git a/mac.spec b/mac.spec
index 3a9bdb8..cb7f8bd 100644
--- a/mac.spec
+++ b/mac.spec
@@ -1,26 +1,19 @@
Name: mac
-Version: 4.11
-Release: 14.u4b5%{?dist}
+Version: 9.04
+Release: 1%{?dist}
Summary: Monkey's Audio Codec (MAC) utility
Group: Applications/Multimedia
License: Monkey's Audio Source Code License Agreement
-URL: http://supermmx.org/linux/mac/
+URL: https://www.monkeysaudio.com/index.html
# use debian multimedia source
-Source0:
ftp://ftp.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_%{ve...
+Source0: https://monkeysaudio.com/files/MAC_904_SDK.zip
Source1: mac-permission_to_redistribute.txt
-Source2: License.htm
-Patch0: mac-4.11-u4-b5-s7-gcc6.patch
+Source2: https://www.monkeysaudio.com/license.html
BuildRequires: gcc-c++
-%ifarch i686 x86_64
-BuildRequires: yasm
-%endif
-%if 0%{?fedora} > 22
-BuildRequires: execstack
-%else
-BuildRequires: prelink
-%endif
+BuildRequires: make
+BuildRequires: python3-html2text
Requires: %{name}-libs = %{version}-%{release}
@@ -56,71 +49,41 @@ developing applications that use %{name}.
%prep
-%setup -q -n monkeys-audio-%{version}-u4-b5-s7
-%patch0 -p1 -b .gcc6
+%autosetup -c -n MAC_904_SDK
#Copy permission to redistribute
cp -p %{SOURCE1} .
-cp -p %{SOURCE2} src/
-
-# Fix encoding issues:
-for txtfile in src/Credits.txt ; do
- iconv -f iso-8859-1 -t UTF8 $txtfile -o $txtfile.utf8
- touch -r $txtfile $txtfile.utf8
- mv -f $txtfile.utf8 $txtfile
-done
-
-# Disable CXXFLAGS override
-sed -i.cxxflags -e 's/ -O3 -Wall -pedantic -Wno-long-long//g' configure
configure.in
-touch -r configure.in.cxxflags configure.in
-touch -r configure.cxxflags configure
+cp -p %{SOURCE2} .
%build
-%configure --disable-static \
-%ifarch i686 x86_64
- --enable-assembly=yes
-%endif
-
-
-# remove rpath from libtool
-sed -i.rpath
's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-
-make %{?_smp_mflags}
+%make_build -C Source/Projects/NonWindows
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-execstack -c $RPM_BUILD_ROOT%{_libdir}/libmac.so.2.0.0
-
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%make_install prefix=%{_prefix} libdir=%{_libdir} -C Source/Projects/NonWindows
+# generate license
+html2text --ignore-links "license.html" | sed -n '/^## License$/,$p'
>> LICENSE.md
%files
-%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/mac
%files libs
%doc mac-permission_to_redistribute.txt
-%doc src/License.htm
+%doc LICENSE.md
%{_libdir}/*.so.*
%files devel
-%doc TODO src/Credits.txt src/History.txt
-%{_includedir}/mac/
+%{_includedir}/MAC/
%{_libdir}/*.so
%changelog
+* Mon Feb 27 2023 Leigh Scott <leigh123linux(a)gmail.com> - 9.04-1
+- Update to 9.04
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
4.11-14.u4b5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 723ad17..04c0a8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c438547f6336f2eda3ca820c08664aea monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
+SHA512 (MAC_904_SDK.zip) =
d104421e9bfa8c36dee89bd292c06629ff39a33e84569a5578f4a255432238a0cf09a7d03c5f7df3daf0e41d5cf3ac88f3b58581daf09a94935de91056334681