Changes - j0ke.net Open Build Service

Changes of Revision 30

[-] [+]	Changed	ffmpeg.spec
@@ -1,8 +1,9 @@ + # norootforbuild %define name ffmpeg %define version 0.4.9 -%define release 10.svn20080413 +%define release 10.svn20080512 %define major 0 %define lib libffmpeg %define libname %{lib}%{major} @@ -16,7 +17,7 @@ Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder URL: http://ffmpeg.sourceforge.net -Source0: ffmpeg-0.4.9-svn20080413.tar.bz2 +Source0: ffmpeg-0.4.9-svn20080512.tar.bz2 Patch0: ffmpeg_configure.diff BuildRoot: %{_tmppath}/%{name}-buildroot @@ -33,7 +34,7 @@ Requires: freetype2 Requires: SDL Requires: slang -%if %suse_version >= 920 +%if 0%{?suse_version} >= 920 Requires: xorg-x11-libs %else Requires: XFree86-libs @@ -43,12 +44,12 @@ Requires: libfaac0 >= 1.25 Requires: amrnb Requires: amrwb -%if %suse_version >= 930 +%if 0%{?suse_version} >= 930 BuildRequires: libdca-devel BuildRequires: libdca0 Requires: libdca0 %endif -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 BuildRequires: libgsm BuildRequires: libgsm-devel %endif @@ -66,7 +67,7 @@ BuildRequires: freetype2-devel BuildRequires: SDL-devel BuildRequires: slang-devel -%if %suse_version >= 920 +%if 0%{?suse_version} >= 920 BuildRequires: xorg-x11-devel %else BuildRequires: XFree86-devel @@ -81,10 +82,10 @@ BuildRequires: texinfo BuildRequires: amrnb-devel BuildRequires: amrwb-devel -BuildRequires: a52dec +BuildRequires: liba52dec-devel BuildRequires: libdc1394 BuildRequires: libdc1394-devel -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 BuildRequires: libdc1394_control12-devel %endif #BuildRequires: G.729-devel @@ -126,7 +127,7 @@ Requires: amrnb Requires: amrwb Requires: libdc1394 -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 Requires: libgsm %endif Obsoletes: libpostproc @@ -154,7 +155,7 @@ Installieren sie libffmpeg, wenn Sie Multimdia-Streamd encoden wollen. %package -n %{lib}-devel -Group: System/Libraries +Group: Development/Libraries/C and C++ Summary: Header files and static library for the ffmpeg library Summary(de): Header Dateien und statische Bibliotheken für die ffmpeg Bibliothek Requires: %{libname} = %{version}-%{release} @@ -173,15 +174,16 @@ Requires: libx264-devel Requires: amrnb-devel Requires: amrwb-devel -%if %suse_version > 930 +Requires: liba52dec-devel +%if 0%{?suse_version} > 930 Requires: libdca-devel %endif -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 Requires: libgsm-devel %endif Requires: libdc1394 Requires: libdc1394-devel -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 Requires: libdc1394_control12-devel %endif Provides: %{libname}-devel = %{version}-%{release} @@ -245,21 +247,21 @@ %endif CFLAGS="$RPM_OPT_FLAGS $archflags" -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 CFLAGS="${CFLAGS} -I%{_includedir}/gsm" %endif export archflags export CFLAGS ./configure --shlibdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} \ -%if %suse_version == 910 +%if 0%{?suse_version} == 910 --enable-memalign-hack \ %endif --libdir=%{_libdir} --enable-shared --enable-libmp3lame \ --enable-libvorbis --enable-libtheora --enable-libfaad \ --enable-libfaac --enable-libxvid --enable-liba52 --enable-swscale \ --enable-postproc --enable-gpl --enable-vhook --enable-x11grab \ -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 --enable-libgsm \ %endif %ifarch ppc
[-] [+]	Changed	ffmpeg_configure.diff ^
@@ -1,6 +1,6 @@ ---- configure.orig 2008-03-26 16:16:54.000000000 +0100 -+++ configure 2008-03-26 16:27:54.000000000 +0100 -@@ -1567,11 +1567,11 @@ +--- configure.orig 2008-05-12 18:58:41.000000000 +0200 ++++ configure 2008-05-12 19:05:19.000000000 +0200 +@@ -1560,11 +1560,11 @@ # --- # check availability of some header files @@ -16,7 +16,7 @@ check_func fork check_func gethrtime -@@ -1803,10 +1803,10 @@ +@@ -1807,10 +1807,10 @@ optimizations="small" elif enabled optimizations; then if $cc -v 2>&1 \| grep -q xlc; then @@ -30,3 +30,21 @@ fi fi check_cflags -fno-math-errno +@@ -2169,7 +2169,7 @@ + Conflicts: + Libs: -L\${libdir} -l${shortname} + Libs.private: $libs +-Cflags: -I\${includedir} ++Cflags: -I\${includedir} -I\${includedir}/$name + EOF + cat <<EOF >$name-uninstalled.pc + prefix= +@@ -2184,7 +2184,7 @@ + Conflicts: + Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} + Libs.private: $libs +-Cflags: -I\${includedir} ++Cflags: -I\${includedir} -I\${includedir}/$name + EOF + } +
	Changed	ffmpeg-0.4.9-svn20080512.tar.bz2 ^