Author: kwizart Update of /cvs/nonfree/rpms/mac/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv4935/devel Modified Files: .cvsignore sources Added Files: mac-3.99-u4-b5-analyse.patch mac-3.99-u4-b5-gcc44.patch mac-permission_to_redistribute.txt mac.spec Log Message: Initial import for Rawhide mac-3.99-u4-b5-analyse.patch: --- NEW FILE mac-3.99-u4-b5-analyse.patch --- --- mac-3.99-u4-b5/src/Examples/Analyze/Sample1/Sample1.cpp~ 2006-06-01 05:00:58.000000000 -0400 +++ mac-3.99-u4-b5/src/Examples/Analyze/Sample1/Sample1.cpp 2009-03-13 11:48:50.000000000 -0400 @@ -81,15 +81,15 @@ int main(int argc, char* argv[]) // audio format information printf("Audio Format:\r\n"); - printf("\tSamples per second: %d\r\n", pAPEDecompress->GetInfo(APE_INFO_SAMPLE_RATE)); - printf("\tBits per sample: %d\r\n", pAPEDecompress->GetInfo(APE_INFO_BITS_PER_SAMPLE)); - printf("\tNumber of channels: %d\r\n", pAPEDecompress->GetInfo(APE_INFO_CHANNELS)); - printf("\tPeak level: %d\r\n\r\n", pAPEDecompress->GetInfo(APE_INFO_PEAK_LEVEL)); + printf("\tSamples per second: %zd\r\n", pAPEDecompress->GetInfo(APE_INFO_SAMPLE_RATE)); + printf("\tBits per sample: %zd\r\n", pAPEDecompress->GetInfo(APE_INFO_BITS_PER_SAMPLE)); + printf("\tNumber of channels: %zd\r\n", pAPEDecompress->GetInfo(APE_INFO_CHANNELS)); + printf("\tPeak level: %zd\r\n\r\n", pAPEDecompress->GetInfo(APE_INFO_PEAK_LEVEL)); // size and duration information printf("Size and Duration:\r\n"); - printf("\tLength of file (s): %d\r\n", pAPEDecompress->GetInfo(APE_INFO_LENGTH_MS) / 1000); - printf("\tFile Size (kb): %d\r\n\r\n", pAPEDecompress->GetInfo(APE_INFO_APE_TOTAL_BYTES) / 1024); + printf("\tLength of file (s): %zd\r\n", pAPEDecompress->GetInfo(APE_INFO_LENGTH_MS) / 1000); + printf("\tFile Size (kb): %zd\r\n\r\n", pAPEDecompress->GetInfo(APE_INFO_APE_TOTAL_BYTES) / 1024); // tag information printf("Tag Information:\r\n"); mac-3.99-u4-b5-gcc44.patch: --- NEW FILE mac-3.99-u4-b5-gcc44.patch --- diff -up mac-3.99-u4-b5/src/MACLib/APELink.cpp.gcc44 mac-3.99-u4-b5/src/MACLib/APELink.cpp --- mac-3.99-u4-b5/src/MACLib/APELink.cpp.gcc44 2006-06-01 11:00:57.000000000 +0200 +++ mac-3.99-u4-b5/src/MACLib/APELink.cpp 2009-03-13 16:08:05.000000000 +0100 @@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pD if (pData != NULL) { // parse out the information - char * pHeader = strstr(pData, APE_LINK_HEADER); - char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG); - char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG); - char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG); + const char * pHeader = strstr(pData, APE_LINK_HEADER); + const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG); + const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG); + const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG); if (pHeader && pImageFile && pStartBlock && pFinishBlock) { @@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pD // get the path char cImageFile[MAX_PATH + 1]; int nIndex = 0; - char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)]; + const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)]; while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n')) cImageFile[nIndex++] = *pImageCharacter++; cImageFile[nIndex] = 0; --- NEW FILE mac-permission_to_redistribute.txt --- Delivered-To: ogetbilo(a)gmail.com Received: by 10.90.34.1 with SMTP id h1cs188794agh; Mon, 2 Feb 2009 09:33:34 -0800 (PST) Received: by 10.64.63.16 with SMTP id l16mr2760800qba.6.1233596013505; Mon, 02 Feb 2009 09:33:33 -0800 (PST) Return-Path: <matt(a)jriver.com&gt; Received: from linux.jriver.com (nm.jriver.com [204.29.156.98]) by mx.google.com with SMTP id k29si6326715qba.7.2009.02.02.09.33.33; Mon, 02 Feb 2009 09:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of matt(a)jriver.com designates 204.29.156.98 as permitted sender) client-ip=204.29.156.98; Authentication-Results: mx.google.com; spf=pass (google.com: domain of matt(a)jriver.com designates 204.29.156.98 as permitted sender) smtp.mail=matt(a)jriver.com Received: (qmail 23096 invoked from network); 2 Feb 2009 17:33:34 -0000 Received: from unknown (HELO ?199.242.131.144?) (199.242.131.144) by 0 with SMTP; 2 Feb 2009 17:33:34 -0000 Message-ID: <49872E6E.5090609(a)jriver.com&gt; Date: Mon, 02 Feb 2009 11:33:34 -0600 From: Matt Ashland <matt(a)jriver.com&gt; User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: "Orcan B. Ogetbil" <ogetbilo(a)gmail.com&gt; Subject: Re: Including MAC at rpmfusion? References: <200812121517.16055.ogetbilo(a)gmail.com&gt; <4942C9D9.1000301(a)jriver.com&gt; <200902021215.15415.ogetbilo(a)gmail.com&gt; In-Reply-To: <200902021215.15415.ogetbilo(a)gmail.com&gt; Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Length: 3296 X-UID: 1187 Hi Orcan, Here's the license: http://www.monkeysaudio.com/license.html Like I said, my intent is to make the code free without restrictions and complications. Per the language of the license, consider this "express written consent" to do as you like. I'm not too interested in getting into a horse-trading arrangement to give code away. I hope you understand. Best, -Matt Orcan B. Ogetbil wrote: --- NEW FILE mac.spec --- Name: mac Version: 3.99 Release: 6.u4b5%{?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/ Source0: http://supermmx.org/resources/linux/mac/mac-%{version}-u4-b5.tar.gz Source1: mac-permission_to_redistribute.txt Patch0: mac-3.99-u4-b5-gcc44.patch Patch1: mac-3.99-u4-b5-analyse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch i686 x86_64 BuildRequires: yasm %endif BuildRequires: prelink Requires: %{name}-libs = %{version}-%{release} %description Monkey’s Audio is a fast and easy way to compress digital music. Unlike traditional methods such as mp3, ogg, or lqt that permanently discard quality to save space, Monkey’s Audio only makes perfect, bit-for-bit copies of your music. That means it always sounds perfect – exactly the same as the original. Even though the sound is perfect, it still saves a lot of space. Permission to redistribute is granted by the AUTHOR to rpmfusion.org only. See mac-permission_to_redistribute.txt %package libs Summary: Library for Monkey's Audio Codec Group: System Environment/Libraries # Introduced in F-9 to solve multilib transition Obsoletes: %{name} < 3.99-3 %description libs The %{name}-libs package contains library for Monkey's Audio Codec. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q -n %{name}-%{version}-u4-b5 %patch0 -p1 -b .gcc44 %patch1 -p1 -b .an #Copy permission to redistribute cp -p %{SOURCE1} . # 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 %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 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 %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/mac %files libs %defattr(-,root,root,-) %doc mac-permission_to_redistribute.txt %doc src/License.htm %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc TODO src/Readme.htm src/Credits.txt src/History.txt %{_includedir}/mac/ %{_libdir}/*.so %changelog * Fri Mar 13 2009 kwizart < kwizart at gmail.com > - 3.99-6.u4b5 - Add permission to redistribute for RPM Fusion. (bundled with -libs) - Fix for gcc44 * Mon Feb 2 2009 kwizart < kwizart at gmail.com > - 3.99-4.u4b5 - Fix the main package category - Fix the execstack on libmac.so.2 - Move some docs from main to -devel * Fri Dec 12 2008 kwizart < kwizart at gmail.com > - 3.99-3.u4b5 - Multilib compliance - Disable rpath (libtool patch) - Fix doc encoding - Enable asm optimization with yasm when possible - Disable CXXFLAGS override * Mon Jul 10 2006 Matthias Saou <http://freshrpms.net/> 3.99-2.u4b5 - Update to 3.99-u4-b5. - Remove no longer needed 64bit patch. * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 3.99-2.u4b4 - Release bump to drop the disttag number in FC5 build. * Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 3.99-1.u4b4 - Update to 3.99-u4-b4. - Port over 64bit patch from the gstreamer-monkeysaudio package. * Thu May 26 2005 Matthias Saou <http://freshrpms.net/> 3.99-1.u4b3 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mac/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2009 18:52:59 -0000 1.1 +++ .cvsignore 17 Mar 2009 10:33:35 -0000 1.2 @@ -0,0 +1 @@ +mac-3.99-u4-b5.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mac/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2009 18:52:59 -0000 1.1 +++ sources 17 Mar 2009 10:33:35 -0000 1.2 @@ -0,0 +1 @@ +75716b342e07deae58f56a2522362006 mac-3.99-u4-b5.tar.gz