Author: thl Update of /cvs/free/rpms/lame/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3445 Modified Files: .cvsignore sources Added Files: lame-as-needed.patch lame-noexecstack.patch lame.spec Log Message: initial import from livna lame-as-needed.patch: --- NEW FILE lame-as-needed.patch --- --- lame-3.97/libmp3lame/Makefile.am.no_undefined 2005-08-21 12:32:09.000000000 -0500 +++ lame-3.97/libmp3lame/Makefile.am 2006-10-20 12:06:51.000000000 -0500 @@ -18,7 +18,7 @@ decoder_ldadd = endif -libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) +libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) @CONFIG_MATH_LIB@ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ -no-undefined --- lame-3.97/configure.in.no_undefined 2006-09-24 08:53:31.000000000 -0500 +++ lame-3.97/configure.in 2006-10-20 12:07:15.000000000 -0500 @@ -1059,8 +1059,9 @@ CFLAGS="${OPTIMIZATION} ${CFLAGS}" LDADD="${LDADD}" -FRONTEND_LDADD="${FRONTEND_LDADD} ${CONFIG_MATH_LIB}" +FRONTEND_LDADD="${FRONTEND_LDADD}" +AC_SUBST(CONFIG_MATH_LIB) AC_SUBST(INCLUDES) lame-noexecstack.patch: --- NEW FILE lame-noexecstack.patch --- diff -ur lame-3.97.orig/libmp3lame/i386/choose_table.nas lame-3.97/libmp3lame/i386/choose_table.nas --- lame-3.97.orig/libmp3lame/i386/choose_table.nas 2000-10-27 13:19:05.000000000 +0200 +++ lame-3.97/libmp3lame/i386/choose_table.nas 2007-02-15 09:14:07.000000000 +0100 @@ -431,3 +431,7 @@ ret end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/cpu_feat.nas lame-3.97/libmp3lame/i386/cpu_feat.nas --- lame-3.97.orig/libmp3lame/i386/cpu_feat.nas 2003-11-10 16:41:00.000000000 +0100 +++ lame-3.97/libmp3lame/i386/cpu_feat.nas 2007-02-15 09:13:58.000000000 +0100 @@ -105,3 +105,7 @@ ret end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fft.nas lame-3.97/libmp3lame/i386/fft.nas --- lame-3.97.orig/libmp3lame/i386/fft.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fft.nas 2007-02-15 09:14:34.000000000 +0100 @@ -265,3 +265,7 @@ pop esi pop ebx ret + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fft3dn.nas lame-3.97/libmp3lame/i386/fft3dn.nas --- lame-3.97.orig/libmp3lame/i386/fft3dn.nas 2006-09-24 15:53:33.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fft3dn.nas 2007-02-15 09:14:18.000000000 +0100 @@ -275,3 +275,7 @@ add esp,16 popd ebp, ebx, esi, edi endproc + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fftfpu.nas lame-3.97/libmp3lame/i386/fftfpu.nas --- lame-3.97.orig/libmp3lame/i386/fftfpu.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fftfpu.nas 2007-02-15 09:14:35.000000000 +0100 @@ -617,3 +617,7 @@ endproc end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fftsse.nas lame-3.97/libmp3lame/i386/fftsse.nas --- lame-3.97.orig/libmp3lame/i386/fftsse.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fftsse.nas 2007-02-15 09:14:36.000000000 +0100 @@ -536,3 +536,7 @@ end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/ffttbl.nas lame-3.97/libmp3lame/i386/ffttbl.nas --- lame-3.97.orig/libmp3lame/i386/ffttbl.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/ffttbl.nas 2007-02-15 09:14:38.000000000 +0100 @@ -76,3 +76,7 @@ segment_code end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif --- NEW FILE lame.spec --- Name: lame Version: 3.97 Release: 7%{?dist} Summary: Free MP3 audio compressor Group: Applications/Multimedia License: GPLv2+ URL: http://lame.sourceforge.net/ Source0: http://downloads.sourceforge.net/lame/%{name}-%{version}.tar.gz Patch0: %{name}-as-needed.patch Patch1: %{name}-noexecstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: gtk+-devel # pkg-config should be pulled in by gtk+-devel but is not in EL-5 BuildRequires: pkgconfig %ifarch %{ix86} BuildRequires: nasm BuildRequires: gcc >= 3.2 %endif Requires: ncurses >= 5.0 Requires: %{name}-libs = %{version}-%{release} %description LAME is an open source MP3 encoder whose quality and speed matches commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding with both constant and variable bitrates. %package libs Summary: LAME MP3 encoding library Group: System Environment/Libraries %description libs LAME MP3 encoding library. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel This package development files for %{name}. %package mp3x Summary: MP3 frame analyzer Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description mp3x This package contains the mp3x frame analyzer. %prep %setup -q %patch0 -p1 -b .as-needed %patch1 -p1 -b .noexec iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && mv ChangeLog.tmp ChangeLog %build autoreconf sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure %ifarch %{ix86} export CFLAGS="$RPM_OPT_FLAGS -ffast-math" %endif %configure \ --disable-dependency-tracking \ --disable-static \ %ifarch %{ix86} --enable-nasm \ %endif --enable-mp3x \ --enable-mp3rtp \ --enable-decode-layer1 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # Some apps still expect to find <lame.h> ln -sf lame/lame.h $RPM_BUILD_ROOT%{_includedir}/lame.h rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %check make test %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root,-) %doc README TODO USAGE doc/html/*.html doc/html/*.css %{_bindir}/lame %{_bindir}/mp3rtp %{_mandir}/man1/lame.1* %files libs %defattr(-,root,root,-) %doc ChangeLog COPYING LICENSE %{_libdir}/libmp3lame.so.* %files devel %defattr (-,root,root,-) %doc API HACKING STYLEGUIDE %{_libdir}/libmp3lame.so %{_includedir}/lame/ %{_includedir}/lame.h %files mp3x %defattr (-,root,root,-) %{_bindir}/mp3x %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.97-7 - rebuild * Thu Oct 4 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; - 3.97-6 - Merge freshrpms spec into livna spec for rpmfusion: - Set release to 6 to be higher as both livna and freshrpms latest release - Update license tag for new license tag guidelines - Add --enable-decode-layer1 to configure flags - Make Source0 the advised sf.net download url - Make ChangeLog UTF-8 - Don't duplicate the COPYING ChangeLog and LICENSE docs betweent the main and the -libs package * Fri Sep 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.97-5 - BuildRequire pkgconfig for gtk+-devel in EL-5. * Sun Mar 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 3.97-4 - fix rpaths and SELinux noexec stack issue (patch by Hans de Goede) * Wed Nov 01 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-3 - fix FC6+ binutils issues (patch by Rex Dieter) * Thu Sep 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-2 - Split off -libs subpackage - Reenable parallel make * Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.97-1 - 3.97, 3DNow! asm patch applied upstream. * Wed Sep 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.96.1-7 - Avoid rpaths (from Ubuntu). - Don't ship static libraries. - Drop unneeded zero epochs. - Build with dependency tracking disabled. - Prune pre-2003 changelog entries. - Other specfile cleanups. * Sun May 14 2006 Noa Resare <noa(a)resare.com&gt; 3.96.1-6 - Adding a patch to fix the 3DNow! asm and re-enable it * Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 3.96.1-5 - Disabling nasm for now. (bug #892) * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.4 - add defattr to files of mp3x subpackage * Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.3 - Drop Epoch * Sat Sep 17 2005 W. Michael Petullo <mike[at]flyn.org> - 0:3.96.1-0.lvn.2 - Split mp3x into its own package to remove general gtk+ requirement. * Sun Jul 25 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96.1-0.lvn.1 - Updated to 3.96.1. * Thu Apr 15 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96-0.lvn.1 - Updated to 3.96. * Tue Jan 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.95.1-0.lvn.3 - Enable mp3x and mp3rtp. - Run tests in the %%check section. - Use "make install DESTDIR=..." instead of %%makeinstall. - s/fdr/lvn/ in release tag. * Tue Jan 27 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.2 - Disabled parallel make (#61). * Sat Jan 17 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.1 - Updated to 3.95.1. - Spec file edited to match current Fedora template. - Re-wrote descriptions. - Converted spec file to UTF-8. * Sat Aug 16 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.8 - Patch configure instead of configure.in to avoid regenerating build files (bug 223). * Mon Jul 21 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.7 - Rebuild to get source permissions right (bug 223). - Removed Requires: /usr/bin/find (bug 223). * Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.6 - Use RPM_BUILD_ROOT and RPM_OPT_FLAGS instead of macros. * Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.5 - Backed out Vorbis changes (bug 198, 223). * Fri May 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.4 - Fixed problems with Makefiles being removed from documentation upon installation. * Fri Apr 25 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.3 - Honour %%optflags. - Vorbis support (bug #198). - Added LICENSE to documentation. * Fri Apr 4 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.2 - Minor adjustments of optimisation flags and configure settings. - Killed some noise caused by a bad gtk macro. - Added epoch numbers to requires. * Wed Apr 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.1 - Initial Fedora RPM release. * Mon Mar 31 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net&gt; - Rebuilt for Red Hat Linux 9. - Exclude .la file. * Mon Jan 13 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net&gt; - Update to 3.93.1. - Removed Epoch: tag, upgrade by hand! :-/ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/lame/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:52:18 -0000 1.1 +++ .cvsignore 3 Aug 2008 17:32:49 -0000 1.2 @@ -0,0 +1 @@ +lame-3.97.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/lame/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:52:18 -0000 1.1 +++ sources 3 Aug 2008 17:32:49 -0000 1.2 @@ -0,0 +1 @@ +90a4acbb730d150dfe80de145126eef7 lame-3.97.tar.gz