Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	faad2.spec
@@ -1,47 +1,34 @@ -#!BuildIgnore: post-build-checks # norootforbuild -%define name faad2 -%define version 2.7 -%define release 15 %define major 2 -%define oldversion 2.6.1 -%define oldmajor 0 %define lib libfaad %define libname %{lib}%{major} -%define oldlibname %{lib}%{oldmajor} -%define libmp4ff libmp4ff%{oldmajor} -Name: %{name} -Version: %{version} -Release: %{release} +%bcond_without xmms +%bcond_without mpeg4ip + +Name: faad2 +Version: 2.7 +Release: 3 Summary: C library and frontend for decoding MPEG2/4 AAC Summary(de): C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC License: GPL v2 or later Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://www.audiocoding.com/ - -Source0: faad2-2.7.tar.bz2 -Source1: faad2-2.6.1.tar.bz2 - -Patch0: faad2-libmp4ff.patch -Patch1: faad2-main_overflow.diff +Source0: http://downloads.sourceforge.net/project/faac/faad2-src/faad2-%{version}/faad2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} Requires: %{libname} = %{version}-%{release} -Requires: libmp4v2 +%if %{with mpeg4ip} BuildRequires: libmp4v2-devel +%endif BuildRequires: glibc-devel BuildRequires: libogg-devel +%if %{with xmms} BuildRequires: xmms-devel +%endif BuildRequires: id3lib-devel BuildRequires: gcc-c++ BuildRequires: SDL-devel -%if 0%{?suse_version} < 1000 && 0%{?suse_version} > 0 -BuildRequires: glib -BuildRequires: glib-devel -BuildRequires: gtk -BuildRequires: gtk-devel -%endif #Obsoletes: faad2-drm #Provides: faad2-drm @@ -64,45 +51,22 @@ Obsoletes: libfaad-2 < %{version}-%{release} %description -n %{libname} -Shared library part of faad2 +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely +written from scratch. FAAD 2 is licensed under the GPL. +The shared library part of faad2 %description -n %{libname} -l de -Bibliotheken zu faad2 - -%package -n %{oldlibname} -Group: System/Libraries -Summary: Shared library part of faad2 -Summary(de): Bibliotheken zu faad2 -Provides: %{lib} = %{version}-%{release} -Provides: libfaad2_0 = %{version}-%{release} -Obsoletes: libfaad2_0 < %{version}-%{release} -Provides: libfaad-0 = %{version}-%{release} -Obsoletes: libfaad-0 < %{version}-%{release} - -%description -n %{oldlibname} -Shared library part of faad2 - -%description -n %{oldlibname} -l de -Bibliotheken zu faad2 - -%package -n %{libmp4ff} -Group: System/Libraries -Summary: Shared library libmp4ff -Summary(de): Bibliotheken libmp4ff -Provides: libmp4ff = %{version}-%{release} - -%description -n %{libmp4ff} -Shared library libmp4ff - -%description -n %{libmp4ff} -l de -Bibliotheken libmp4ff +FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder. +Die Bibliotheken zu faad2 %package -n %{lib}-devel -Summary: Development files of the FAAD 2 AAC decoder. -Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders. +Summary: Development files of the FAAD 2 AAC decoder +Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +%if %{with mpeg4ip} Requires: libmp4v2-devel +%endif Obsoletes: libfaad2-devel < %{version}-%{release} Provides: libfaad2-devel = %{version}-%{release} Obsoletes: faad2-devel < %{version}-%{release} @@ -111,73 +75,63 @@ Provides: faad2-drm-devel = %{version}-%{release} %description -n %{lib}-devel +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely +written from scratch. FAAD 2 is licensed under the GPL. Header files and development documentation for libfaad. %description -n %{lib}-devel -l de +FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder. Header-Dateien und Entwicklerdokumtation zur libfaad. -%package xmms-plugin -Summary: faad2 Xmms input plugin -Summary(de): faad2 Xmms input plugin +%if %{with xmms} +%package -n xmms-faad2 +Summary: Xmms faad2 input plugin +Summary(de): Xmms faad2 Eingabeplugin Group: Productivity/Multimedia/Sound/Players Requires: %{libname} = %{version}-%{release} Requires: xmms >= 1.2.8 +Obsoletes: faad2-xmms-plugin < %{version}-%{release} +Provides: faad2-xmms-plugin = %{version}-%{release} -%description xmms-plugin +%description -n xmms-faad2 The plugin read aac files with and without ID3tag(version 2.x), AAC files are MPEG2 or MPEG4 files that could be found in MPEG4 audio files (.mp4). -%description -l de xmms-plugin -Das plugin liest AAC Dateien für xmms. - -%debug_package +%description -l de -n xmms-faad2 +Das plugin für xmms liest AAC Dateien mit und ohne ID3-Tags (version 2.x). +AAC Dateien sind MPEG2 oder MPEG4 Dateien, sie finden Verwendung in MPEG4 +Audodateien (.mp4). +%endif %prep -%setup -qn faad2-%{version} -b 1 -cd ../faad2 -%patch0 -%patch1 -p1 +%setup -qn faad2-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" %{__mkdir_p} plugins/bmp autoreconf -vif -%if 0%{?suse_version} %suse_update_libdir plugins/xmms/src/Makefile.am +%configure \ +%if %{with xmms} + --with-xmms \ %endif -%configure --with-xmms --with-pic + --with-pic \ + --enable-shared \ + --disable-static %{__make} %{?jobs:-j%{jobs}} -cd ../faad2 -export CFLAGS="$RPM_OPT_FLAGS" -%{__mkdir_p} plugins/bmp -%if 0%{?suse_version} >= 1100 -%__sed -i -e "s\|dnl AC_PROG_CXX\|AC_PROG_CXX\|g" configure.in -%endif -autoreconf -vif -%if 0%{?suse_version} -%suse_update_libdir plugins/xmms/src/Makefile.am -%endif -%configure -%{__make} %{?jobs:-j%{jobs}} - - %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} -cd ../faad2 -%__make DESTDIR=%{buildroot} install -cd - -%__make DESTDIR=%{buildroot} install x 1 @@ -1,47 +1,34 @@ 2 -#!BuildIgnore: post-build-checks 3 # norootforbuild 4 5 -%define name faad2 6 -%define version 2.7 7 -%define release 15 8 %define major 2 9 -%define oldversion 2.6.1 10 -%define oldmajor 0 11 %define lib libfaad 12 %define libname %{lib}%{major} 13 -%define oldlibname %{lib}%{oldmajor} 14 -%define libmp4ff libmp4ff%{oldmajor} 15 16 -Name: %{name} 17 -Version: %{version} 18 -Release: %{release} 19 +%bcond_without xmms 20 +%bcond_without mpeg4ip 21 + 22 +Name: faad2 23 +Version: 2.7 24 +Release: 3 25 Summary: C library and frontend for decoding MPEG2/4 AAC 26 Summary(de): C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC 27 License: GPL v2 or later 28 Group: Productivity/Multimedia/Video/Editors and Convertors 29 URL: http://www.audiocoding.com/ 30 - 31 -Source0: faad2-2.7.tar.bz2 32 -Source1: faad2-2.6.1.tar.bz2 33 - 34 -Patch0: faad2-libmp4ff.patch 35 -Patch1: faad2-main_overflow.diff 36 +Source0: http://downloads.sourceforge.net/project/faac/faad2-src/faad2-%{version}/faad2-%{version}.tar.bz2 37 BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} 38 Requires: %{libname} = %{version}-%{release} 39 -Requires: libmp4v2 40 +%if %{with mpeg4ip} 41 BuildRequires: libmp4v2-devel 42 +%endif 43 BuildRequires: glibc-devel 44 BuildRequires: libogg-devel 45 +%if %{with xmms} 46 BuildRequires: xmms-devel 47 +%endif 48 BuildRequires: id3lib-devel 49 BuildRequires: gcc-c++ 50 BuildRequires: SDL-devel 51 -%if 0%{?suse_version} < 1000 && 0%{?suse_version} > 0 52 -BuildRequires: glib 53 -BuildRequires: glib-devel 54 -BuildRequires: gtk 55 -BuildRequires: gtk-devel 56 -%endif 57 #Obsoletes: faad2-drm 58 #Provides: faad2-drm 59 60 @@ -64,45 +51,22 @@ 61 Obsoletes: libfaad-2 < %{version}-%{release} 62 63 %description -n %{libname} 64 -Shared library part of faad2 65 +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely 66 +written from scratch. FAAD 2 is licensed under the GPL. 67 +The shared library part of faad2 68 69 %description -n %{libname} -l de 70 -Bibliotheken zu faad2 71 - 72 -%package -n %{oldlibname} 73 -Group: System/Libraries 74 -Summary: Shared library part of faad2 75 -Summary(de): Bibliotheken zu faad2 76 -Provides: %{lib} = %{version}-%{release} 77 -Provides: libfaad2_0 = %{version}-%{release} 78 -Obsoletes: libfaad2_0 < %{version}-%{release} 79 -Provides: libfaad-0 = %{version}-%{release} 80 -Obsoletes: libfaad-0 < %{version}-%{release} 81 - 82 -%description -n %{oldlibname} 83 -Shared library part of faad2 84 - 85 -%description -n %{oldlibname} -l de 86 -Bibliotheken zu faad2 87 - 88 -%package -n %{libmp4ff} 89 -Group: System/Libraries 90 -Summary: Shared library libmp4ff 91 -Summary(de): Bibliotheken libmp4ff 92 -Provides: libmp4ff = %{version}-%{release} 93 - 94 -%description -n %{libmp4ff} 95 -Shared library libmp4ff 96 - 97 -%description -n %{libmp4ff} -l de 98 -Bibliotheken libmp4ff 99 +FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder. 100 +Die Bibliotheken zu faad2 101 102 %package -n %{lib}-devel 103 -Summary: Development files of the FAAD 2 AAC decoder. 104 -Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders. 105 +Summary: Development files of the FAAD 2 AAC decoder 106 +Summary(de): Entwicklerdateien des FAAD 2 AAC Dekoders 107 Group: Development/Libraries/C and C++ 108 -Requires: %{libname} = %{version}-%{release} 109 +Requires: %{name} = %{version}-%{release} 110 +%if %{with mpeg4ip} 111 Requires: libmp4v2-devel 112 +%endif 113 Obsoletes: libfaad2-devel < %{version}-%{release} 114 Provides: libfaad2-devel = %{version}-%{release} 115 Obsoletes: faad2-devel < %{version}-%{release} 116 @@ -111,73 +75,63 @@ 117 Provides: faad2-drm-devel = %{version}-%{release} 118 119 %description -n %{lib}-devel 120 +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely 121 +written from scratch. FAAD 2 is licensed under the GPL. 122 Header files and development documentation for libfaad. 123 124 %description -n %{lib}-devel -l de 125 +FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder. 126 Header-Dateien und Entwicklerdokumtation zur libfaad. 127 128 129 -%package xmms-plugin 130 -Summary: faad2 Xmms input plugin 131 -Summary(de): faad2 Xmms input plugin 132 +%if %{with xmms} 133 +%package -n xmms-faad2 134 +Summary: Xmms faad2 input plugin 135 +Summary(de): Xmms faad2 Eingabeplugin 136 Group: Productivity/Multimedia/Sound/Players 137 Requires: %{libname} = %{version}-%{release} 138 Requires: xmms >= 1.2.8 139 +Obsoletes: faad2-xmms-plugin < %{version}-%{release} 140 +Provides: faad2-xmms-plugin = %{version}-%{release} 141 142 -%description xmms-plugin 143 +%description -n xmms-faad2 144 The plugin read aac files with and without ID3tag(version 2.x), AAC files 145 are MPEG2 or MPEG4 files that could be found in MPEG4 audio files (.mp4). 146 147 -%description -l de xmms-plugin 148 -Das plugin liest AAC Dateien für xmms. 149 - 150 -%debug_package 151 +%description -l de -n xmms-faad2 152 +Das plugin für xmms liest AAC Dateien mit und ohne ID3-Tags (version 2.x). 153 +AAC Dateien sind MPEG2 oder MPEG4 Dateien, sie finden Verwendung in MPEG4 154 +Audodateien (.mp4). 155 +%endif 156 157 %prep 158 -%setup -qn faad2-%{version} -b 1 159 -cd ../faad2 160 -%patch0 161 -%patch1 -p1 162 +%setup -qn faad2-%{version} 163 164 %build 165 -export CFLAGS="$RPM_OPT_FLAGS -fPIC" 166 +export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" 167 %{__mkdir_p} plugins/bmp 168 autoreconf -vif 169 -%if 0%{?suse_version} 170 %suse_update_libdir plugins/xmms/src/Makefile.am 171 +%configure \ 172 +%if %{with xmms} 173 + --with-xmms \ 174 %endif 175 -%configure --with-xmms --with-pic 176 + --with-pic \ 177 + --enable-shared \ 178 + --disable-static 179 %{__make} %{?jobs:-j%{jobs}} 180 181 -cd ../faad2 182 -export CFLAGS="$RPM_OPT_FLAGS" 183 -%{__mkdir_p} plugins/bmp 184 -%if 0%{?suse_version} >= 1100 185 -%__sed -i -e "s\|dnl AC_PROG_CXX\|AC_PROG_CXX\|g" configure.in 186 -%endif 187 -autoreconf -vif 188 -%if 0%{?suse_version} 189 -%suse_update_libdir plugins/xmms/src/Makefile.am 190 -%endif 191 -%configure 192 -%{__make} %{?jobs:-j%{jobs}} 193 - 194 - 195 %install 196 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} 197 -cd ../faad2 198 -%__make DESTDIR=%{buildroot} install 199 -cd - 200 -%__make DESTDIR=%{buildroot} install 201
[-] [+]	Deleted	faad2-libmp4ff.patch ^
@@ -1,9 +0,0 @@ ---- common/mp4ff/Makefile.am.orig 2006-05-07 20:09:00.000000000 +0200 -+++ common/mp4ff/Makefile.am 2008-07-05 14:56:14.000000000 +0200 -@@ -1,4 +1,5 @@ --noinst_LTLIBRARIES = libmp4ff.la -+#noinst_LTLIBRARIES = libmp4ff.la -+lib_LTLIBRARIES = libmp4ff.la - - libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 -
[-] [+]	Deleted	faad2-main_overflow.diff ^
@@ -1,13 +0,0 @@ -diff -ur faad2.orig/frontend/main.c faad2/frontend/main.c ---- faad2.orig/frontend/main.c 2007-11-01 13:33:29.000000000 +0100 -+++ faad2/frontend/main.c 2008-09-20 10:05:59.000000000 +0200 -@@ -914,6 +914,8 @@ - sample_count = frameInfo.samples; - } else { - sample_count = (unsigned int)(dur * frameInfo.channels); -+ if (sample_count > frameInfo.samples) -+ sample_count = frameInfo.samples; - - if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples)) - { -Nur in faad2/frontend: main.c~.
	Deleted	faad2-2.6.1.tar.bz2 ^