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
[-] [+]	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 ^