Author: thl Update of /cvs/free/rpms/ffmpeg-compat/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26846 Modified Files: .cvsignore sources Added Files: ffmpeg-asmreg.patch ffmpeg-compat.spec ffmpeg-pkgconfig.patch ffmpeg-snapshot.sh ffmpeg-suffix-20080113.patch Log Message: initial import from livna ffmpeg-asmreg.patch: --- NEW FILE ffmpeg-asmreg.patch --- diff -up ffmpeg-20070923/libavcodec/Makefile.asmreg ffmpeg-20070923/libavcodec/Makefile --- ffmpeg-20070923/libavcodec/Makefile.asmreg 2007-09-23 18:20:34.000000000 +0200 +++ ffmpeg-20070923/libavcodec/Makefile 2007-09-23 20:36:28.000000000 +0200 @@ -87,6 +87,11 @@ OBJS-$(CONFIG_H263I_DECODER) + OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o cabac.o golomb.o +# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# on ix86 in cabac.h +ifeq ($(ARCH_X86_32),yes) +h264.o: CFLAGS += -fomit-frame-pointer +endif OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o --- NEW FILE ffmpeg-compat.spec --- # TODO: add make test to %%check section %define svn 20080225 %define faad2min 1:2.6.1 %define _with_swscaler 0 %define _with_compat 1 %if 0%{?_with_compat:1} %define buildsuf -compat %endif Summary: Libraries for ffmpeg-compat Name: ffmpeg-compat Version: 0.4.9 Release: 0.48.%{svn}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://ffmpeg.org/ Source0: http://rpm.greysector.net/livna/ffmpeg-%{svn}.tar.bz2 Source1: ffmpeg-snapshot.sh Patch2: ffmpeg-pkgconfig.patch Patch4: ffmpeg-asmreg.patch Patch5: ffmpeg-suffix-20080113.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: a52dec-devel %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} BuildRequires: zlib-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel BuildRequires: libvorbis-devel BuildRequires: libtheora-devel BuildRequires: faad2-devel >= %{faad2min} BuildRequires: xvidcore-devel BuildRequires: SDL-devel BuildRequires: gsm-devel BuildRequires: imlib2-devel BuildRequires: texi2html BuildRequires: faac-devel BuildRequires: x264-devel %description FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix. It also includes a digital VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. This package contains the libraries for %{name} %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix. It also includes a digital VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. This package contains development files for %{name} !!! Developer Warning !!! This package contains a version of ffmpeg built without libswscale. Softwares that use ffmpeg-compat libaries need to be ported to the new swscaler API. (see libswscale/swscale-example.c from the doc section). ffmpeg-compat is deprecated and will be removed at some point. %prep %setup -q -n ffmpeg-%{svn} %patch2 -p1 -b .pkgconfig %patch4 -p1 -b .asmreg %if 0%{?_with_compat:1} %patch5 -p1 -b .suffix %endif %build ./configure \ --prefix=%{_prefix} \ %if 0%{?_with_compat:1} --disable-ffmpeg \ --disable-ffserver \ --disable-ffplay \ --disable-vhook \ --build-suffix=%{?buildsuf} \ --incdir=%{_includedir}/ffmpeg%{?buildsuf} \ --disable-swscaler \ %else --incdir=%{_includedir}/ffmpeg \ %endif --libdir=%{_libdir} \ --shlibdir=%{_libdir} \ --mandir=%{_mandir} \ --arch=%{_target_cpu} \ --extra-cflags="$RPM_OPT_FLAGS" \ %{?_with_amr: --enable-libamr-nb --enable-libamr-wb --enable-nonfree} \ --enable-libdc1394 \ --enable-liba52 \ --enable-libfaac \ --enable-libfaad \ --enable-libgsm \ --enable-libmp3lame \ --enable-libtheora \ --enable-libvorbis \ --enable-libxvid \ --enable-libx264 \ --enable-pp \ --enable-pthreads \ --disable-static \ --enable-shared \ --enable-gpl \ --disable-debug \ --disable-optimizations \ --disable-strip make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __doc make install DESTDIR=$RPM_BUILD_ROOT # We don't provide the doc for the compat-version %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING.GPL CREDITS Changelog README %{_libdir}/libavcodec%{?buildsuf}.so.* %{_libdir}/libavdevice%{?buildsuf}.so.* %{_libdir}/libavformat%{?buildsuf}.so.* %{_libdir}/libavutil%{?buildsuf}.so.* %{_libdir}/libpostproc%{?buildsuf}.so.* %files devel %defattr(-,root,root,-) # Note: as of 20070204, --incdir doesn't affect postproc. %doc libswscale/swscale-example.c %{_includedir}/ffmpeg%{?buildsuf} %{_prefix}/include/postproc%{?buildsuf} %{_libdir}/libavcodec%{?buildsuf}.so %{_libdir}/libavdevice%{?buildsuf}.so %{_libdir}/libavformat%{?buildsuf}.so %{_libdir}/libavutil%{?buildsuf}.so %{_libdir}/libpostproc%{?buildsuf}.so %{_libdir}/pkgconfig/libswscale%{?buildsuf}.pc %{_libdir}/pkgconfig/libavcodec%{?buildsuf}.pc %{_libdir}/pkgconfig/libavdevice%{?buildsuf}.pc %{_libdir}/pkgconfig/libavformat%{?buildsuf}.pc %{_libdir}/pkgconfig/libavutil%{?buildsuf}.pc %{_libdir}/pkgconfig/libpostproc%{?buildsuf}.pc %changelog * Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.9-0.48.20080225 - rebuild * Fri Jun 20 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.47.20080225 - Sync with ffmpeg - last snapshot before API change (20080225) * Sun Mar 02 2008 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.4.9-0.46.20080113 - Rebuild * Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.45.20080113 - Remove libnut conditional (deprecated). - Remove dirac conditional (they need to submit patch upstream). - Improve description for ffmpeg-compat. * Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.44.20080113 - Move to ffmpeg-compat - Disable swscaler - Disable vhook - Disable ffmpeg binaries. - Built with -compat SONAME suffix * Sun Jan 13 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.44.20080113 - 20080113 snapshot - drop unnecessary patch - enable libdc1394 support - enable swscaler * Mon Nov 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.43.20071111 - ensure that we use the correct faad2 version * Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.42.20071111 - 20071111 snapshot - current faad2 is good again * Thu Oct 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.41.20071011 - fix BRs and Requires for faad2 * Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.40.20071011 - 20071011 snapshot - don't link against faad2-2.5, it makes GPL'd binary non-distributable - go back to normal linking instead of dlopen() of liba52 * Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.39.20070923 - 20070923 snapshot - use faad2 2.5 - optional AMR support - dropped obsolete patch * Thu Jun 07 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.38.20070607 - 20070607 snapshot - libdca BR dropped (no longer supported) - drop gsm.h path hack, gsm in Fedora now provides a compatibility symlink - remove arch hacks, ffmpeg's configure is smart enough - enable cmov on x86_64 * Thu May 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.37.20070503 - require older faad2 to prevent bugreports like #1388 - prepare for libdc1394 support - enable pthreads - 20070503 snapshot * Thu Feb 08 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.35.20070204 - libswscale.pc is necessary regardless of --enable-swscaler * Sun Feb 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.34.20070204 - 2007-02-04 snapshot, enable libtheora. - Make swscaler optional, disabled again by default (#1379). * Fri Jan 05 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.34.20061214 - move vhooks to -libs * Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.33.20061214 - split -libs subpackage for multilib installs * Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.32.20061214 - new kino works with swscaler, re-enabled * Tue Dec 19 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.31.20061214 - disable swscaler, it breaks kino ffmpeg-pkgconfig.patch: --- NEW FILE ffmpeg-pkgconfig.patch --- diff -up ffmpeg-20080113/configure.pkgconfig ffmpeg-20080113/configure --- ffmpeg-20080113/configure.pkgconfig 2008-01-12 13:34:55.000000000 +0100 +++ ffmpeg-20080113/configure 2008-01-13 21:03:30.000000000 +0100 @@ -2122,7 +2122,7 @@ include=$6 cat <<EOF >$name.pc prefix=$PREFIX exec_prefix=\${prefix} -libdir=\${exec_prefix}/lib +libdir=$libdir includedir=\${prefix}/include Name: $name @@ -2161,13 +2161,13 @@ EOF pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version" -pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg +pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "libavutil = $lavu_version" ffmpeg pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version" -pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg +pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "libavcodec = $lavc_version" ffmpeg pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version" -pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg +pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "libavformat = $lavf_version" ffmpeg pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version" if enabled pp; then pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc @@ -2178,7 +2178,7 @@ if enabled swscaler; then pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version" else - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg + pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" apply libswscale.pc sed s/^Libs:.*$/Libs:/ apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/ --- NEW FILE ffmpeg-snapshot.sh --- #!/bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } unset CDPATH pwd=$(pwd) svn=$(date +%Y%m%d) cd "$tmp" svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn cd ffmpeg-$svn ./version.sh . find . -type d -name .svn -print0 | xargs -0r rm -rf sed -i -e '/^\.PHONY: version\.h$/d' Makefile cd .. tar jcf "$pwd"/ffmpeg-$svn.tar.bz2 ffmpeg-$svn cd - >/dev/null ffmpeg-suffix-20080113.patch: --- NEW FILE ffmpeg-suffix-20080113.patch --- diff -up ffmpeg-20080113/Makefile.ffmpeg-suffix ffmpeg-20080113/Makefile --- ffmpeg-20080113/Makefile.ffmpeg-suffix 2008-01-13 20:46:17.000000000 +0100 +++ ffmpeg-20080113/Makefile 2008-02-11 16:44:04.000000000 +0100 @@ -50,7 +50,7 @@ HOOKS-$(HAVE_FORK) += ppm HOOKS-$(HAVE_IMLIB2) += imlib2 HOOKS-$(HAVE_FREETYPE2) += drawtext -HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes))) +HOOKS = $(addprefix vhook$(BUILDSUF)/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes))) VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags` LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs` @@ -122,7 +122,7 @@ ffmpeg.o ffplay.o ffserver.o: version.h videohook: .libs $(HOOKS) -vhook/%$(SLIBSUF): vhook/%.o +vhook$(BUILDSUF)/%$(SLIBSUF): vhook/%.o $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F)) vhook/%.o: vhook/%.c @@ -163,8 +163,8 @@ install-man: install -m 644 $(MANPAGES) "$(MANDIR)/man1" install-vhook: videohook - install -d "$(SHLIBDIR)/vhook" - install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook" + install -d "$(SHLIBDIR)/vhook$(BUILDSUF)" + install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook$(BUILDSUF)" install-libs: $(MAKE) -C libavutil install-libs @@ -202,7 +202,7 @@ uninstall-man: uninstall-vhook: rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF))) - -rmdir "$(SHLIBDIR)/vhook/" + -rmdir "$(SHLIBDIR)/vhook$(BUILDSUF)/" uninstall-libs: $(MAKE) -C libavutil uninstall-libs diff -up ffmpeg-20080113/configure.ffmpeg-suffix ffmpeg-20080113/configure --- ffmpeg-20080113/configure.ffmpeg-suffix 2008-02-11 16:44:04.000000000 +0100 +++ ffmpeg-20080113/configure 2008-02-11 16:44:04.000000000 +0100 @@ -2158,27 +2158,27 @@ Cflags: -I\${includedir} EOF } -pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg +pkgconfig_generate libavutil${BUILDSUF} "FFmpeg utility library" "$lavu_version" -lavutil${BUILDSUF} "" ffmpeg${BUILDSUF} pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version" -pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "libavutil = $lavu_version" ffmpeg +pkgconfig_generate libavcodec${BUILDSUF} "FFmpeg codec library" "$lavc_version" "-lavcodec${BUILDSUF}" "libavutil${BUILDSUF} = $lavu_version" ffmpeg${BUILDSUF} pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version" -pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "libavcodec = $lavc_version" ffmpeg +pkgconfig_generate libavformat${BUILDSUF} "FFmpeg container format library" "$lavf_version" "-lavformat${BUILDSUF}" "libavcodec${BUILDSUF} = $lavc_version" ffmpeg${BUILDSUF} pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version" -pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "libavformat = $lavf_version" ffmpeg +pkgconfig_generate libavdevice${BUILDSUF} "FFmpeg device handling library" "$lavd_version" "-lavdevice${BUILDSUF} $extralibs" "libavformat${BUILDSUF} = $lavf_version" ffmpeg${BUILDSUF} pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version" if enabled pp; then - pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc + pkgconfig_generate libpostproc${BUILDSUF} "FFmpeg post processing library" "$pp_version" -lpostproc${BUILDSUF} "" postproc${BUILDSUF} pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version" fi if enabled swscaler; then - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg + pkgconfig_generate libswscale${BUILDSUF} "FFmpeg image rescaling library" "$sws_version" -lswscale${BUILDSUF} "libavutil${BUILDSUF} = $lavu_version" ffmpeg${BUILDSUF} pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version" else - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg + pkgconfig_generate libswscale${BUILDSUF} "FFmpeg image rescaling library" "$sws_version" "" "libavcodec${BUILDSUF} = $lavc_version" ffmpeg${BUILDSUF} pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" apply libswscale.pc sed s/^Libs:.*$/Libs:/ apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/ diff -up ffmpeg-20080113/common.mak.ffmpeg-suffix ffmpeg-20080113/common.mak --- ffmpeg-20080113/common.mak.ffmpeg-suffix 2007-12-06 00:15:24.000000000 +0100 +++ ffmpeg-20080113/common.mak 2008-02-11 16:44:04.000000000 +0100 @@ -83,7 +83,7 @@ install-headers: install -d "$(INCDIR)" install -d "$(LIBDIR)/pkgconfig" install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)" - install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" + install -m 644 $(BUILD_ROOT)/lib$(NAME)$(BUILDSUF).pc "$(LIBDIR)/pkgconfig" uninstall: uninstall-libs uninstall-headers diff -up ffmpeg-20080113/libpostproc/Makefile.ffmpeg-suffix ffmpeg-20080113/libpostproc/Makefile --- ffmpeg-20080113/libpostproc/Makefile.ffmpeg-suffix 2007-10-30 08:54:18.000000000 +0100 +++ ffmpeg-20080113/libpostproc/Makefile 2008-02-11 16:44:04.000000000 +0100 @@ -2,7 +2,7 @@ include ../config.mak # Overload incdir, postproc include files go in a different directory. -INCDIR=$(prefix)/include/postproc +INCDIR=$(prefix)/include/postproc$(BUILDSUF) EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) @@ -23,4 +23,4 @@ postprocess_pic.o: postprocess.c $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $< uninstall-headers:: - -rmdir "$(prefix)/include/postproc" + -rmdir "$(prefix)/include/postproc$(BUILDSUF)" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg-compat/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Aug 2008 08:48:58 -0000 1.1 +++ .cvsignore 9 Aug 2008 08:56:42 -0000 1.2 @@ -0,0 +1 @@ +ffmpeg-20080225.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg-compat/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Aug 2008 08:48:58 -0000 1.1 +++ sources 9 Aug 2008 08:56:42 -0000 1.2 @@ -0,0 +1 @@ +3eb49e193a0aa95908291fd7dac65114 ffmpeg-20080225.tar.bz2