Changes - j0ke.net Open Build Service

Changes of Revision 7

[-] [+]	Changed	faad2.spec
@@ -2,10 +2,10 @@ %define name faad2 %define version 2.6.1 -%define release 1 +%define release 8 %define major 0 -%define lib libfaad2 -%define libname %{lib}_%{major} +%define lib libfaad +%define libname %{lib}%{major} Name: %{name} Version: %{version} @@ -16,9 +16,10 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://www.audiocoding.com/ -Source0: faad2-2.6.1.tar.bz2 +Source0: http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2 Patch0: faad2-libmp4ff.patch +Patch1: faad2-main_overflow.diff BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} Requires: %{libname} = %{version}-%{release} Requires: libmp4v2 @@ -29,19 +30,14 @@ BuildRequires: id3lib-devel BuildRequires: gcc-c++ BuildRequires: SDL-devel -%if 0%{?suse_version} < 1000 && 0%{?suse_version} > 0 +%if %suse_version < 1000 BuildRequires: glib BuildRequires: glib-devel BuildRequires: gtk BuildRequires: gtk-devel %endif -%if 0%{?centos_version} \|\| 0%{?rhel_version} \|\| 0%{?fedora_version} -BuildRequires: gtk+-devel -BuildRequires: glib-devel -%endif - -Obsoletes: faad2-drm -Provides: faad2-drm +#Obsoletes: faad2-drm +#Provides: faad2-drm %description FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely @@ -57,6 +53,10 @@ Summary(de): Bibliotheken zu faad2 Requires: libmp4v2 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 %{libname} Shared library part of faad2 @@ -70,10 +70,12 @@ Group: Development/Libraries/C and C++ Requires: %{libname} = %{version}-%{release} Requires: libmp4v2-devel -Obsoletes: faad2-devel -Provides: faad2-devel -Obsoletes: faad2-drm-devel -Provides: faad2-drm-devel +Obsoletes: libfaad2-devel < %{version}-%{release} +Provides: libfaad2-devel = %{version}-%{release} +Obsoletes: faad2-devel < %{version}-%{release} +Provides: faad2-devel = %{version}-%{release} +Obsoletes: faad2-drm-devel < %{version}-%{release} +Provides: faad2-drm-devel = %{version}-%{release} %description -n %{lib}-devel Header files and development documentation for libfaad. @@ -101,37 +103,31 @@ %prep %setup -qn faad2 %patch0 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" %{__mkdir_p} plugins/bmp +%if %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 --with-xmms --with-drm +%configure --with-xmms %{__make} %{?jobs:-j%{jobs}} %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} -%__make DESTDIR=%{buildroot} install +%makeinstall %{__install} -m 644 common/mp4ff/mp4ff.h %{buildroot}%{_includedir}/ %{__install} -m 644 common/mp4ff/mp4ff_int_types.h %{buildroot}%{_includedir}/ -%post -%if 0%{?suse_version} -%run_ldconfig -%else -/sbin/ldconfig -%endif +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%postun -%if 0%{?suse_version} -%run_ldconfig -%else -/sbin/ldconfig -%endif +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} x 1 @@ -2,10 +2,10 @@ 2 3 %define name faad2 4 %define version 2.6.1 5 -%define release 1 6 +%define release 8 7 %define major 0 8 -%define lib libfaad2 9 -%define libname %{lib}_%{major} 10 +%define lib libfaad 11 +%define libname %{lib}%{major} 12 13 Name: %{name} 14 Version: %{version} 15 @@ -16,9 +16,10 @@ 16 Group: Productivity/Multimedia/Video/Editors and Convertors 17 URL: http://www.audiocoding.com/ 18 19 -Source0: faad2-2.6.1.tar.bz2 20 +Source0: http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2 21 22 Patch0: faad2-libmp4ff.patch 23 +Patch1: faad2-main_overflow.diff 24 BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} 25 Requires: %{libname} = %{version}-%{release} 26 Requires: libmp4v2 27 @@ -29,19 +30,14 @@ 28 BuildRequires: id3lib-devel 29 BuildRequires: gcc-c++ 30 BuildRequires: SDL-devel 31 -%if 0%{?suse_version} < 1000 && 0%{?suse_version} > 0 32 +%if %suse_version < 1000 33 BuildRequires: glib 34 BuildRequires: glib-devel 35 BuildRequires: gtk 36 BuildRequires: gtk-devel 37 %endif 38 -%if 0%{?centos_version} \|\| 0%{?rhel_version} \|\| 0%{?fedora_version} 39 -BuildRequires: gtk+-devel 40 -BuildRequires: glib-devel 41 -%endif 42 - 43 -Obsoletes: faad2-drm 44 -Provides: faad2-drm 45 +#Obsoletes: faad2-drm 46 +#Provides: faad2-drm 47 48 %description 49 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely 50 @@ -57,6 +53,10 @@ 51 Summary(de): Bibliotheken zu faad2 52 Requires: libmp4v2 53 Provides: %{lib} = %{version}-%{release} 54 +Provides: libfaad2_0 = %{version}-%{release} 55 +Obsoletes: libfaad2_0 < %{version}-%{release} 56 +Provides: libfaad-0 = %{version}-%{release} 57 +Obsoletes: libfaad-0 < %{version}-%{release} 58 59 %description -n %{libname} 60 Shared library part of faad2 61 @@ -70,10 +70,12 @@ 62 Group: Development/Libraries/C and C++ 63 Requires: %{libname} = %{version}-%{release} 64 Requires: libmp4v2-devel 65 -Obsoletes: faad2-devel 66 -Provides: faad2-devel 67 -Obsoletes: faad2-drm-devel 68 -Provides: faad2-drm-devel 69 +Obsoletes: libfaad2-devel < %{version}-%{release} 70 +Provides: libfaad2-devel = %{version}-%{release} 71 +Obsoletes: faad2-devel < %{version}-%{release} 72 +Provides: faad2-devel = %{version}-%{release} 73 +Obsoletes: faad2-drm-devel < %{version}-%{release} 74 +Provides: faad2-drm-devel = %{version}-%{release} 75 76 %description -n %{lib}-devel 77 Header files and development documentation for libfaad. 78 @@ -101,37 +103,31 @@ 79 %prep 80 %setup -qn faad2 81 %patch0 82 +%patch1 -p1 83 84 %build 85 export CFLAGS="$RPM_OPT_FLAGS" 86 %{__mkdir_p} plugins/bmp 87 +%if %suse_version >= 1100 88 +%__sed -i -e "s\|dnl AC_PROG_CXX\|AC_PROG_CXX\|g" configure.in 89 +%endif 90 autoreconf -vif 91 -%if 0%{?suse_version} 92 %suse_update_libdir plugins/xmms/src/Makefile.am 93 -%endif 94 -%configure --with-xmms --with-drm 95 +%configure --with-xmms 96 97 %{__make} %{?jobs:-j%{jobs}} 98 99 %install 100 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} 101 -%__make DESTDIR=%{buildroot} install 102 +%makeinstall 103 %{__install} -m 644 common/mp4ff/mp4ff.h %{buildroot}%{_includedir}/ 104 %{__install} -m 644 common/mp4ff/mp4ff_int_types.h %{buildroot}%{_includedir}/ 105 106 -%post 107 -%if 0%{?suse_version} 108 -%run_ldconfig 109 -%else 110 -/sbin/ldconfig 111 -%endif 112 +%post -p /sbin/ldconfig 113 +%postun -p /sbin/ldconfig 114 115 -%postun 116 -%if 0%{?suse_version} 117 -%run_ldconfig 118 -%else 119 -/sbin/ldconfig 120 -%endif 121 +%post -n %{libname} -p /sbin/ldconfig 122 +%postun -n %{libname} -p /sbin/ldconfig 123 124 %clean 125 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} 126
[-] [+]	Added	faad2-main_overflow.diff ^
@@ -0,0 +1,13 @@ +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 ^