[ffmpeg] Update to 6.0 release
by Leigh Scott
commit a673ff08e68de2e19478e5653c5497f497e62d38
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 27 22:24:09 2023 +0000
Update to 6.0 release
ffmpeg-snapshot.sh | 4 ++--
ffmpeg.spec | 16 +++++++++++-----
sources | 2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh
index 0c9cc4e..48e5370 100755
--- a/ffmpeg-snapshot.sh
+++ b/ffmpeg-snapshot.sh
@@ -17,7 +17,7 @@ date=$(date +%Y%m%d)
pushd "$tmp"
git clone git://git.ffmpeg.org/ffmpeg.git
cd ffmpeg
-git checkout release/5.0
+git checkout release/6.0
git rev-parse HEAD
-git archive --prefix="ffmpeg-${date}/" --format=tar release/5.0 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
+git archive --prefix="ffmpeg-${date}/" --format=tar release/6.0 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
popd
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 897c0cd..4ed702c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,8 +1,8 @@
# TODO: add make test to %%check section
#global branch oldabi-
-#global date 20220104
-#global commit 311ea9c529117fb8e38abd6ca7e81782b6b21257
+#global date 20230221
+#global commit 691d01989936d4b0681aa226aea8a19f06c04cea
#global rel %(c=%{commit}; echo ${c:0:7})
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9
@@ -43,7 +43,8 @@
%global _without_vulkan 1
%endif
%ifarch x86_64
-%global _with_mfx 1
+#global _with_mfx 1
+%global _with_vpl 1
%global _with_svtav1 1
%global _with_vapoursynth 1
%global _with_vmaf 1
@@ -110,8 +111,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 5.1.2
-Release: 9%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Version: 6.0
+Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -212,6 +213,7 @@ BuildRequires: pkgconfig(srt)
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_vmaf:BuildRequires: libvmaf-devel >= 1.5.2}
+%{?_with_vpl:BuildRequires: pkgconfig(vpl) >= 2.6}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_vulkan:BuildRequires: vulkan-loader-devel pkgconfig(shaderc)}
@@ -416,6 +418,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
--cpu=%{_target_cpu} \
%endif
%{?_with_mfx:--enable-libmfx} \
+ %{?_with_vpl:--enable-libvpl} \
%ifarch %{ix86} x86_64 %{power64}
--enable-runtime-cpudetect \
%endif
@@ -520,6 +523,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Tue Feb 21 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0-1
+- Update to 6.0 release
+
* Sun Jan 08 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.2-9
- Enable libplacebo (rfbz#6549)
diff --git a/sources b/sources
index 7fc373f..9b86570 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-5.1.2.tar.xz) = 04d9ae2a0e9238c469941d2bb9929d59b58f4be3830846cf91b02a440da17803a04b147a4e0168c9ffd6f62ca82187508bc7b53255de9787a97168278e903b9b
+SHA512 (ffmpeg-6.0.tar.xz) = 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980
1 year, 9 months
[mac/f38] Revert "Update to 9.04"
by Leigh Scott
Summary of changes:
a3b57fe... Revert "Update to 9.04" (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months
[mac] Revert "Update to 9.04"
by Leigh Scott
commit a3b57fe2982e8f8d006f9dc7252489a6e1791974
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 27 22:13:48 2023 +0000
Revert "Update to 9.04"
This reverts commit 17de29a898a2a889aa0e744e4a80f7219799dca3.
.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, 198 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7cf357..bb3b048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
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.htm b/License.htm
new file mode 100644
index 0000000..3081335
--- /dev/null
+++ b/License.htm
@@ -0,0 +1,44 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
+<meta name="ProgId" content="FrontPage.Editor.Document">
+<title>Well</title>
+</head>
+
+<body>
+
+<p align="center"><font face="Verdana" size="4">Monkey's Audio Source Code
+License Agreement</font></p>
+<p><font face="Verdana" size="2"><b>License Agreement</b></font></p>
+<p><font face="Verdana" size="2">1. 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. Use of the code for proprietary efforts that
+don't support the official APE format require written consent of the author.</font></p>
+<p><font face="Verdana" size="2">2. 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.</font></p>
+<p><font face="Verdana" size="2">3. Code changes and improvements must be
+contributed back to the Monkey's Audio project free from restrictions or
+royalties for the sake of the common good, unless exempted by express written
+consent of the author.</font></p>
+<p><font face="Verdana" size="2">4. Any source code, ideas, or libraries used
+must be plainly acknowledged in the software using the code.</font></p>
+<p><font face="Verdana" size="2">5. Although the software has been tested thoroughly, the author is in no way responsible for damages due to
+bugs or misuse. </font></p>
+<p><font face="Verdana" size="2">6. 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.</font></p>
+<p align="center" style="margin:0in;margin-bottom:.0001pt;text-align:center"> </p>
+<p align="center" style="margin:0in;margin-bottom:.0001pt;text-align:center"><i><font face="Verdana" size="2">All
+rights not expressly granted here are reserved by Matthew T. Ashland.</font></i></p>
+<p align="center" style="margin:0in;margin-bottom:.0001pt;text-align:center"><font size="2"><font face="Verdana"><span style="mso-bidi-font-family: Arial Unicode MS"> </span></font></font></p>
+<p align="center" style="margin:0in;margin-bottom:.0001pt;text-align:center"><font face="Verdana" size="2">-
+All materials and programs copyrighted �2000-2006 by Matthew T. Ashland -</font></p>
+<p align="center" style="margin:0in;margin-bottom:.0001pt;text-align:center"><font face="Verdana" size="2">-
+All rights reserved. -</font></p>
+
+</body>
+
+</html>
diff --git a/mac-4.11-u4-b5-s7-gcc6.patch b/mac-4.11-u4-b5-s7-gcc6.patch
new file mode 100644
index 0000000..07d4961
--- /dev/null
+++ b/mac-4.11-u4-b5-s7-gcc6.patch
@@ -0,0 +1,98 @@
+--- a/src/MACLib/APECompress.cpp
++++ b/src/MACLib/APECompress.cpp
+@@ -3,6 +3,7 @@
+ #include IO_HEADER_FILE
+ #include "APECompressCreate.h"
+ #include "WAVInputSource.h"
++#define min(a,b) (((a) < (b)) ? (a) : (b))
+
+ CAPECompress::CAPECompress()
+ {
+
+--- a/src/MACLib/APEDecompress.cpp
++++ b/src/MACLib/APEDecompress.cpp
+@@ -7,6 +7,7 @@
+ #include "NewPredictor.h"
+
+ #define DECODE_BLOCK_SIZE 4096
++#define min(a,b) (((a) < (b)) ? (a) : (b))
+
+ CAPEDecompress::CAPEDecompress(int * pErrorCode, CAPEInfo * pAPEInfo, int nStartBlock, int nFinishBlock)
+ {
+
+--- a/src/MACLib/APESimple.cpp
++++ b/src/MACLib/APESimple.cpp
+@@ -14,6 +14,7 @@
+ #define UNMAC_DECODER_OUTPUT_APE 2
+
+ #define BLOCKS_PER_DECODE 9216
++#define min(a,b) (((a) < (b)) ? (a) : (b))
+
+ int DecompressCore(const str_utf16 * pInputFilename, const str_utf16 * pOutputFilename, int nOutputMode, int nCompressionLevel, IAPEProgressCallback * pProgressCallback);
+
+
+--- a/src/MACLib/BitArray.cpp
++++ b/src/MACLib/BitArray.cpp
+@@ -20,6 +20,8 @@
+ #define SHIFT_BITS (CODE_BITS - 9)
+ #define EXTRA_BITS ((CODE_BITS - 2) % 8 + 1)
+ #define BOTTOM_VALUE (TOP_VALUE >> 8)
++#define min(a,b) (((a) < (b)) ? (a) : (b))
++#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+ /************************************************************************************
+ Lookup tables
+
+--- a/src/MACLib/APETag.cpp
++++ b/src/MACLib/APETag.cpp
+@@ -4,6 +4,7 @@
+ #include "CharacterHelper.h"
+ #include "IO.h"
+ #include IO_HEADER_FILE
++#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+ /*****************************************************************************************
+ CAPETagField
+
+--- a/src/MACLib/MACProgressHelper.cpp
++++ b/src/MACLib/MACProgressHelper.cpp
+@@ -1,6 +1,7 @@
+ #include "All.h"
+ #include "MACProgressHelper.h"
+ #include "MACLib.h"
++#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+ CMACProgressHelper::CMACProgressHelper(int nTotalSteps, IAPEProgressCallback * pProgressCallback)
+ {
+
+--- a/src/MACLib/UnBitArray.cpp
++++ b/src/MACLib/UnBitArray.cpp
+@@ -23,6 +23,7 @@
+ #define BOTTOM_VALUE (TOP_VALUE >> 8)
+
+ #define MODEL_ELEMENTS 64
++#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+ /***********************************************************************************
+ Construction
+
+--- a/src/MACLib/Prepare.cpp
++++ b/src/MACLib/Prepare.cpp
+@@ -1,5 +1,6 @@
+ #include "All.h"
+ #include "Prepare.h"
++#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+ const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,
+ 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,
+
+--- b/src/Shared/CircleBuffer.cpp
++++ b/src/Shared/CircleBuffer.cpp
+@@ -1,5 +1,6 @@
+ #include "All.h"
+ #include "CircleBuffer.h"
++#define min(a,b) (((a) < (b)) ? (a) : (b))
+
+ CCircleBuffer::CCircleBuffer()
+ {
+
diff --git a/mac.spec b/mac.spec
index cb7f8bd..3a9bdb8 100644
--- a/mac.spec
+++ b/mac.spec
@@ -1,19 +1,26 @@
Name: mac
-Version: 9.04
-Release: 1%{?dist}
+Version: 4.11
+Release: 14.u4b5%{?dist}
Summary: Monkey's Audio Codec (MAC) utility
Group: Applications/Multimedia
License: Monkey's Audio Source Code License Agreement
-URL: https://www.monkeysaudio.com/index.html
+URL: http://supermmx.org/linux/mac/
# use debian multimedia source
-Source0: https://monkeysaudio.com/files/MAC_904_SDK.zip
+Source0: ftp://ftp.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_%{ve...
Source1: mac-permission_to_redistribute.txt
-Source2: https://www.monkeysaudio.com/license.html
+Source2: License.htm
+Patch0: mac-4.11-u4-b5-s7-gcc6.patch
BuildRequires: gcc-c++
-BuildRequires: make
-BuildRequires: python3-html2text
+%ifarch i686 x86_64
+BuildRequires: yasm
+%endif
+%if 0%{?fedora} > 22
+BuildRequires: execstack
+%else
+BuildRequires: prelink
+%endif
Requires: %{name}-libs = %{version}-%{release}
@@ -49,41 +56,71 @@ developing applications that use %{name}.
%prep
-%autosetup -c -n MAC_904_SDK
+%setup -q -n monkeys-audio-%{version}-u4-b5-s7
+%patch0 -p1 -b .gcc6
#Copy permission to redistribute
cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
+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
%build
-%make_build -C Source/Projects/NonWindows
+%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}
%install
-%make_install prefix=%{_prefix} libdir=%{_libdir} -C Source/Projects/NonWindows
+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
-# 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 LICENSE.md
+%doc src/License.htm
%{_libdir}/*.so.*
%files devel
-%{_includedir}/MAC/
+%doc TODO src/Credits.txt src/History.txt
+%{_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 04c0a8f..723ad17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (MAC_904_SDK.zip) = d104421e9bfa8c36dee89bd292c06629ff39a33e84569a5578f4a255432238a0cf09a7d03c5f7df3daf0e41d5cf3ac88f3b58581daf09a94935de91056334681
+c438547f6336f2eda3ca820c08664aea monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
1 year, 9 months
[mac/f38] Update to 9.04
by Leigh Scott
Summary of changes:
17de29a... Update to 9.04 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months
[mac] Update to 9.04
by Leigh Scott
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
1 year, 9 months
[qmmp-plugins-freeworld] disable ffmpeg as ffmpeg-free is now in Fedora
by Karel Volný
commit 6978482530df5e5130d27caa2e7faf686955a8be
Author: Karel Volný <kvolny(a)redhat.com>
Date: Mon Feb 27 10:34:56 2023 +0100
disable ffmpeg as ffmpeg-free is now in Fedora
qmmp-plugins-freeworld.spec | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index 8c7c9ca..46e7d81 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -12,7 +12,6 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: enca-devel
BuildRequires: faad2-devel
-BuildRequires: ffmpeg-devel
BuildRequires: libcurl-devel
BuildRequires: libmms-devel
BuildRequires: qt6-qtmultimedia-devel
@@ -33,14 +32,6 @@ and also the mplayer plugin for video playback.
%prep
%setup -q -n qmmp-%{version}
-# adjust includes for the header move in latest ffmpeg
-sed -i \
- -e 's|<avcodec.h|<libavcodec/avcodec.h|g' \
- -e 's|g/avcodec.h|g/libavcodec/avcodec.h|g' \
- -e 's|<avformat.h|<libavformat/avformat.h|g' \
- -e 's|g/avformat.h|g/libavformat/avformat.h|g' \
- src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
%build
@@ -49,6 +40,7 @@ sed -i \
%cmake \
-D USE_CURL:BOOL=FALSE \
\
+ -D USE_FFMPEG:BOOL=FALSE \
-D USE_FLAC:BOOL=FALSE \
-D USE_VORBIS:BOOL=FALSE \
-D USE_MAD:BOOL=FALSE \
@@ -115,14 +107,12 @@ sed -i \
make VERBOSE=1 %{?_smp_mflags} -C %{_vpath_builddir}/src/plugins/Engines/mplayer
make VERBOSE=1 %{?_smp_mflags} -C %{_vpath_builddir}/src/plugins/Input/aac
-make VERBOSE=1 %{?_smp_mflags} -C %{_vpath_builddir}/src/plugins/Input/ffmpeg
make VERBOSE=1 %{?_smp_mflags} -C %{_vpath_builddir}/src/plugins/Transports/mms
%install
make DESTDIR=%{buildroot} install -C %{_vpath_builddir}/src/plugins/Engines/mplayer
make DESTDIR=%{buildroot} install -C %{_vpath_builddir}/src/plugins/Input/aac
-make DESTDIR=%{buildroot} install -C %{_vpath_builddir}/src/plugins/Input/ffmpeg
make DESTDIR=%{buildroot} install -C %{_vpath_builddir}/src/plugins/Transports/mms
## install .desktop files for MimeType associations
mkdir -p %{buildroot}/%{_datadir}/applications/
@@ -135,16 +125,6 @@ sed -e "/MimeType/c\MimeType=audio/aac;audio/aacp;audio/x-aac;audio/m4a;audio/x-
> %{buildroot}/%{_datadir}/applications/%{name}-aac-enqueue.desktop
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-aac.desktop
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-aac-enqueue.desktop
-# ffmpeg
-sed -e "/MimeType/c\MimeType=audio/aac;audio/aacp;audio/x-ms-wma;audio/mpeg;audio/x-ffmpeg-shorten;audio/3gpp;audio/3gpp2;audio/mp4;audio/MP4A-LATM;audio/mpeg4-generic;audio/m4a;audio/ac3;audio/eac3;audio/dts;audio/true-hd;audio/x-matroska;audio/x-aac;audio/x-m4a;" \
- -e "/Actions/,$ c\NoDisplay=true" \
- src/app/qmmp.desktop \
- > %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg.desktop
-sed -e "/MimeType/c\MimeType=audio/aac;audio/aacp;audio/x-ms-wma;audio/mpeg;audio/x-ffmpeg-shorten;audio/3gpp;audio/3gpp2;audio/mp4;audio/MP4A-LATM;audio/mpeg4-generic;audio/m4a;audio/ac3;audio/eac3;audio/dts;audio/true-hd;audio/x-matroska;audio/x-aac;audio/x-m4a;" \
- src/app/qmmp-enqueue.desktop \
- > %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enqueue.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enqueue.desktop
%files
@@ -156,8 +136,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enque
%{_libdir}/qmmp/Transports/*.so
%{_datadir}/applications/%{name}-aac.desktop
%{_datadir}/applications/%{name}-aac-enqueue.desktop
-%{_datadir}/applications/%{name}-ffmpeg.desktop
-%{_datadir}/applications/%{name}-ffmpeg-enqueue.desktop
%post
@@ -168,6 +146,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enque
%changelog
+* Mon Feb 27 2023 Karel Volný <kvolny(a)redhat.com> 2.1.2-2
+- disable ffmpeg as ffmpeg-free is now in Fedora
+
* Sat Feb 25 2023 Sérgio Basto <sergio(a)serjux.com> - 2.1.2-1
- Update qmmp-plugins-freeworld to 2.1.2
1 year, 9 months
[xorg-x11-drv-nvidia] remove simpledrm option
by Leigh Scott
commit f63b9a1271bf00d8c6b22f1f62a17f5070f31d23
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Feb 26 21:26:58 2023 +0000
remove simpledrm option
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 96f1e77..98dc191 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -10,7 +10,7 @@
%global _firmwarepath %{_prefix}/lib/firmware
%global _winedir %{_libdir}/nvidia/wine
%if 0%{?fedora} || 0%{?rhel} > 7
-%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1 initcall_blacklist=simpledrm_platform_driver_init
+%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
%else
%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau nvidia-drm.modeset=1
%global _modprobedir %{_prefix}/lib/modprobe.d
1 year, 9 months
