Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	lame.spec
@@ -1,35 +1,45 @@ # vim: set ts=4 sw=4 et: +# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org> +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.links2linux.org/ + %define soname 0 -%if %{suse_version} > 1120 +%if 0%{?suse_version} > 1120 %bcond_with gtk1 %else %bcond_without gtk1 %endif -Summary: LAME Ain't an MP3 Encoder Name: lame -Version: 3.98.4 -Release: 7.1 -License: GNU Library General Public License version 2 (LGPL v2) +Version: 3.99.5 +Release: 1002.4 +License: LGPL-2.0+ URL: http://lame.sourceforge.net/ +Summary: LAME Ain't an MP3 Encoder Group: Productivity/Multimedia/Sound/Editors and Convertors -# http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz -Source: lame-%{version}.tar.bz2 -Patch2: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/lame/files/lame-3.98-shared-frontend.patch -Patch4: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/lame/files/lame-3.98.2-get_audio.patch -Patch5: lame-tgetstr.patch +Source: http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz Source99: lame-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc glibc-devel make pkgconfig ncurses-devel nasm -BuildRequires: flac-devel -# BuildRequires: libsndfile-devel +%ifarch %{ix86} +BuildRequires: nasm +%endif +BuildRequires: ncurses-devel +BuildRequires: pkgconfig %if %{with gtk1} BuildRequires: gtk-devel %endif -BuildRequires: autoconf automake libtool -Requires: libmp3lame%{soname} = %{version} +Requires: libmp3lame%{soname} >= %{version} %description LAME is an educational tool to be used for learning about MP3 encoding. @@ -51,13 +61,11 @@ a patent free audio compression codec for the GNU project. This package contains additional documentation files in - %{_docdir}/%{name}/ + %{_defaultdocdir}/%{name}/ %package -n libmp3lame%{soname} Summary: LAME Ain't an MP3 Encoder Group: System/Libraries -Provides: liblame = %{version}-%{release} -Provides: libmp3lame = %{version}-%{release} %description -n libmp3lame%{soname} LAME is an educational tool to be used for learning about MP3 encoding. @@ -70,7 +78,6 @@ Summary: LAME Ain't an MP3 Encoder Group: Development/Libraries/C and C++ Requires: libmp3lame%{soname} = %{version} -Provides: liblame-devel = %{version} %description -n libmp3lame-devel LAME is an educational tool to be used for learning about MP3 encoding. @@ -82,8 +89,7 @@ %package -n lame-mp3rtp Summary: MP3 Encoder for RTP Streaming Group: Productivity/Multimedia/Sound/Editors and Convertors -Requires: libmp3lame%{soname} = %{version} -Provides: mp3rtp = %{version} +Requires: libmp3lame%{soname} >= %{version} %description -n lame-mp3rtp LAME is an educational tool to be used for learning about MP3 encoding. @@ -98,8 +104,7 @@ %package -n lame-mp3x Summary: MP3 Frame Analyzer Group: Productivity/Multimedia/Sound/Visualization -Requires: libmp3lame%{soname} = %{version} -Provides: mp3x = %{version} +Requires: libmp3lame%{soname} >= %{version} %description -n lame-mp3x LAME is an educational tool to be used for learning about MP3 encoding. @@ -114,9 +119,12 @@ %prep %setup -q -%patch2 -p1 -%patch4 -%patch5 +%if 0%{?suse_version} > 1210 +find . -type f $ -name configure.in -o -name Makefile.am $ \| while read f; do + perl -n -i.orig -e 's/\s+\Sansi2knr// if /^AUTOMAKE_OPTIONS/ ; print unless /^AM_C_PROTOTYPES/' "$f" +done +%endif + %if !%{with gtk1} # dirty sed -i -e 's/AM_PATH_GTK./HAVE_GTK=no/' configure.in @@ -124,8 +132,6 @@ %endif %build -autoreconf -fiv - LIBS="-lm" \ CFLAGS="%{optflags}" \ %configure \ @@ -140,53 +146,42 @@ --enable-mp3x \ %endif --with-fileio=lame \ + --enable-dynamic-frontends \ + --disable-rpath \ --disable-static -%__make %{?_smp_flags} +%__make %{?_smp_flags} pkgdocdir=%{_defaultdocdir}/%{name}/ %install -%makeinstall -rm -rf "%{buildroot}%{_datadir}/doc" +%__make install pkgdocdir=%{_defaultdocdir}/%{name}/ DESTDIR="%{buildroot}" rm -f %{buildroot}%{_libdir}/libmp3lame.la -%__install -d "%{buildroot}%{_docdir}/%{name}" -DOC_MAIN="$PWD/lame.main.doc.lst" -DOC_DOC="$PWD/lame.doc.doc.lst" -echo -n >"$DOC_MAIN" -echo -n >"$DOC_DOC" -for f in LICENSE COPYING; do - echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_MAIN" - %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" -done -for f in USAGE API TODO README* HACKING ChangeLog; do - echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_DOC" - %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" +for f in ChangeLog README TODO USAGE; do + install -m0644 "$f" "%{buildroot}%{_defaultdocdir}/%{name}/" done %post -n libmp3lame%{soname} -p /sbin/ldconfig %postun -n libmp3lame%{soname} -p /sbin/ldconfig -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%files -f lame.main.doc.lst +%files %defattr(-,root,root) -%doc %dir %{_docdir}/%{name} %{_bindir}/lame -%doc %{_mandir}/man1/lame.1%{ext_man} +%{_mandir}/man1/lame.1* -%files doc -f lame.doc.doc.lst +%files doc %defattr(-,root,root) -%doc %dir %{_docdir}/%{name} +%{_defaultdocdir}/%{name} %files -n libmp3lame%{soname} -%defattr(-,root,root) +%defattr(0644,root,root,0755) +%doc COPYING LICENSE %{_libdir}/libmp3lame.so.%{soname} %{_libdir}/libmp3lame.so.%{soname}.* %files -n libmp3lame-devel %defattr(-,root,root) -%{_includedir}/lame +%doc API HACKING STYLEGUIDE +%{_includedir}/lame/ %{_libdir}/libmp3lame.so %files -n lame-mp3rtp @@ -200,77 +195,3 @@ %endif x 1 @@ -1,35 +1,45 @@ 2 # vim: set ts=4 sw=4 et: 3 4 +# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org> 5 +# 6 +# All modifications and additions to the file contributed by third parties 7 +# remain the property of their copyright owners, unless otherwise agreed 8 +# upon. The license for this file, and modifications and additions to the 9 +# file, is the same license as for the pristine package itself (unless the 10 +# license for the pristine package is not an Open Source License, in which 11 +# case the license is the MIT License). An "Open Source License" is a 12 +# license that conforms to the Open Source Definition (Version 1.9) 13 +# published by the Open Source Initiative. 14 + 15 +# Please submit bugfixes or comments via http://bugs.links2linux.org/ 16 + 17 %define soname 0 18 19 -%if %{suse_version} > 1120 20 +%if 0%{?suse_version} > 1120 21 %bcond_with gtk1 22 %else 23 %bcond_without gtk1 24 %endif 25 26 -Summary: LAME Ain't an MP3 Encoder 27 Name: lame 28 -Version: 3.98.4 29 -Release: 7.1 30 -License: GNU Library General Public License version 2 (LGPL v2) 31 +Version: 3.99.5 32 +Release: 1002.4 33 +License: LGPL-2.0+ 34 URL: http://lame.sourceforge.net/ 35 +Summary: LAME Ain't an MP3 Encoder 36 Group: Productivity/Multimedia/Sound/Editors and Convertors 37 -# http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz 38 -Source: lame-%{version}.tar.bz2 39 -Patch2: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/lame/files/lame-3.98-shared-frontend.patch 40 -Patch4: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/lame/files/lame-3.98.2-get_audio.patch 41 -Patch5: lame-tgetstr.patch 42 +Source: http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz 43 Source99: lame-rpmlintrc 44 BuildRoot: %{_tmppath}/%{name}-%{version}-build 45 -BuildRequires: gcc glibc-devel make pkgconfig ncurses-devel nasm 46 -BuildRequires: flac-devel 47 -# BuildRequires: libsndfile-devel 48 +%ifarch %{ix86} 49 +BuildRequires: nasm 50 +%endif 51 +BuildRequires: ncurses-devel 52 +BuildRequires: pkgconfig 53 %if %{with gtk1} 54 BuildRequires: gtk-devel 55 %endif 56 -BuildRequires: autoconf automake libtool 57 -Requires: libmp3lame%{soname} = %{version} 58 +Requires: libmp3lame%{soname} >= %{version} 59 60 %description 61 LAME is an educational tool to be used for learning about MP3 encoding. 62 @@ -51,13 +61,11 @@ 63 a patent free audio compression codec for the GNU project. 64 65 This package contains additional documentation files in 66 - %{_docdir}/%{name}/ 67 + %{_defaultdocdir}/%{name}/ 68 69 %package -n libmp3lame%{soname} 70 Summary: LAME Ain't an MP3 Encoder 71 Group: System/Libraries 72 -Provides: liblame = %{version}-%{release} 73 -Provides: libmp3lame = %{version}-%{release} 74 75 %description -n libmp3lame%{soname} 76 LAME is an educational tool to be used for learning about MP3 encoding. 77 @@ -70,7 +78,6 @@ 78 Summary: LAME Ain't an MP3 Encoder 79 Group: Development/Libraries/C and C++ 80 Requires: libmp3lame%{soname} = %{version} 81 -Provides: liblame-devel = %{version} 82 83 %description -n libmp3lame-devel 84 LAME is an educational tool to be used for learning about MP3 encoding. 85 @@ -82,8 +89,7 @@ 86 %package -n lame-mp3rtp 87 Summary: MP3 Encoder for RTP Streaming 88 Group: Productivity/Multimedia/Sound/Editors and Convertors 89 -Requires: libmp3lame%{soname} = %{version} 90 -Provides: mp3rtp = %{version} 91 +Requires: libmp3lame%{soname} >= %{version} 92 93 %description -n lame-mp3rtp 94 LAME is an educational tool to be used for learning about MP3 encoding. 95 @@ -98,8 +104,7 @@ 96 %package -n lame-mp3x 97 Summary: MP3 Frame Analyzer 98 Group: Productivity/Multimedia/Sound/Visualization 99 -Requires: libmp3lame%{soname} = %{version} 100 -Provides: mp3x = %{version} 101 +Requires: libmp3lame%{soname} >= %{version} 102 103 %description -n lame-mp3x 104 LAME is an educational tool to be used for learning about MP3 encoding. 105 @@ -114,9 +119,12 @@ 106 107 %prep 108 %setup -q 109 -%patch2 -p1 110 -%patch4 111 -%patch5 112 +%if 0%{?suse_version} > 1210 113 +find . -type f $ -name configure.in -o -name Makefile.am $ \| while read f; do 114 + perl -n -i.orig -e 's/\s+\Sansi2knr// if /^AUTOMAKE_OPTIONS/ ; print unless /^AM_C_PROTOTYPES/' "$f" 115 +done 116 +%endif 117 + 118 %if !%{with gtk1} 119 # dirty 120 sed -i -e 's/AM_PATH_GTK./HAVE_GTK=no/' configure.in 121 @@ -124,8 +132,6 @@ 122 %endif 123 124 %build 125 -autoreconf -fiv 126 - 127 LIBS="-lm" \ 128 CFLAGS="%{optflags}" \ 129 %configure \ 130 @@ -140,53 +146,42 @@ 131 --enable-mp3x \ 132 %endif 133 --with-fileio=lame \ 134 + --enable-dynamic-frontends \ 135 + --disable-rpath \ 136 --disable-static 137 138 -%__make %{?_smp_flags} 139 +%__make %{?_smp_flags} pkgdocdir=%{_defaultdocdir}/%{name}/ 140 141 %install 142 -%makeinstall 143 -rm -rf "%{buildroot}%{_datadir}/doc" 144 +%__make install pkgdocdir=%{_defaultdocdir}/%{name}/ DESTDIR="%{buildroot}" 145 rm -f %{buildroot}%{_libdir}/libmp3lame.la 146 147 -%__install -d "%{buildroot}%{_docdir}/%{name}" 148 -DOC_MAIN="$PWD/lame.main.doc.lst" 149 -DOC_DOC="$PWD/lame.doc.doc.lst" 150 -echo -n >"$DOC_MAIN" 151 -echo -n >"$DOC_DOC" 152 -for f in LICENSE COPYING; do 153 - echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_MAIN" 154 - %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" 155 -done 156 -for f in USAGE API TODO README* HACKING ChangeLog; do 157 - echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_DOC" 158 - %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" 159 +for f in ChangeLog README TODO USAGE; do 160 + install -m0644 "$f" "%{buildroot}%{_defaultdocdir}/%{name}/" 161 done 162 163 %post -n libmp3lame%{soname} -p /sbin/ldconfig 164 %postun -n libmp3lame%{soname} -p /sbin/ldconfig 165 166 -%clean 167 -%{?buildroot:%__rm -rf "%{buildroot}"} 168 - 169 -%files -f lame.main.doc.lst 170 +%files 171 %defattr(-,root,root) 172 -%doc %dir %{_docdir}/%{name} 173 %{_bindir}/lame 174 -%doc %{_mandir}/man1/lame.1%{ext_man} 175 +%{_mandir}/man1/lame.1* 176 177 -%files doc -f lame.doc.doc.lst 178 +%files doc 179 %defattr(-,root,root) 180 -%doc %dir %{_docdir}/%{name} 181 +%{_defaultdocdir}/%{name} 182 183 %files -n libmp3lame%{soname} 184 -%defattr(-,root,root) 185 +%defattr(0644,root,root,0755) 186 +%doc COPYING LICENSE 187 %{_libdir}/libmp3lame.so.%{soname} 188 %{_libdir}/libmp3lame.so.%{soname}.* 189 190 %files -n libmp3lame-devel 191 %defattr(-,root,root) 192 -%{_includedir}/lame 193 +%doc API HACKING STYLEGUIDE 194 +%{_includedir}/lame/ 195 %{_libdir}/libmp3lame.so 196 197 %files -n lame-mp3rtp 198 @@ -200,77 +195,3 @@ 199 %endif 200 201
[-] [+]	Deleted	lame-3.98-shared-frontend.patch ^
@@ -1,24 +0,0 @@ -diff -ur lame-398.old/frontend/Makefile.am lame-398.new/frontend/Makefile.am ---- lame-398.old/frontend/Makefile.am 2006-09-30 11:17:05.000000000 +0200 -+++ lame-398.new/frontend/Makefile.am 2008-07-06 12:36:25.000000000 +0200 -@@ -52,7 +52,7 @@ - endif - - CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - - INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) - -diff -ur lame-398.old/frontend/Makefile.in lame-398.new/frontend/Makefile.in ---- lame-398.old/frontend/Makefile.in 2008-06-25 14:17:51.000000000 +0200 -+++ lame-398.new/frontend/Makefile.in 2008-07-06 12:36:39.000000000 +0200 -@@ -152,7 +152,7 @@ - $(top_builddir)/libmp3lame/libmp3lame.la \ - @FRONTEND_LDADD@ - --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@
[-] [+]	Deleted	lame-3.98.2-get_audio.patch ^
@@ -1,25 +0,0 @@ -Read and write from std* when sndfile is used - ---- frontend/get_audio.c -+++ frontend/get_audio.c -@@ -605,12 +605,17 @@ - } - #endif - #ifdef HAVE_MPGLIB -- if ((musicin = fopen(lpszFileName, "rb")) == NULL) { -+ if (!strcmp(lpszFileName, "-")) { -+ lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */ -+ } -+ else { -+ if ((musicin = fopen(lpszFileName, "rb")) == NULL) { - if (silent < 10) { -- error_printf("Could not find \"%s\".\n", lpszFileName); -+ error_printf("Could not find \"%s\".\n", lpszFileName); - } - exit(1); -- } -+ } -+ } - if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) { - if (silent < 10) { - error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName);
[-] [+]	Deleted	lame-tgetstr.patch ^
@@ -1,15 +0,0 @@ ---- configure.in.orig 2011-11-22 07:14:20.235001024 +0100 -+++ configure.in 2011-11-22 07:19:03.175001144 +0100 -@@ -367,8 +367,10 @@ - AC_CHECK_HEADERS(termcap.h) - AC_CHECK_HEADERS(ncurses/termcap.h) - AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap") --AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses") --AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses") -+AC_CHECK_LIB(ncursesw, initscr, HAVE_TERMCAP="ncursesw") -+AC_CHECK_LIB(ncursesw, tgetstr) -+AC_CHECK_LIB(termcap, tgetstr) -+AC_CHECK_LIB(tinfo, tgetstr) - - dnl math lib - AC_CHECK_LIB(m, cos, USE_LIBM="-lm")
	Changed	lame-3.99.5.tar.gz ^