Author: kwizart Update of /cvs/free/rpms/vlc/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13704 Modified Files: vlc.spec Added Files: vlc-0.8.6i-ffmpeg-compat.patch Log Message: fix for i vlc-0.8.6i-ffmpeg-compat.patch: --- NEW FILE vlc-0.8.6i-ffmpeg-compat.patch --- diff -up vlc-0.8.6i/configure.ac.compat vlc-0.8.6i/configure.ac --- vlc-0.8.6i/configure.ac.compat 2008-07-13 14:56:29.000000000 +0200 +++ vlc-0.8.6i/configure.ac 2008-07-13 15:00:53.000000000 +0200 @@ -2714,14 +2714,14 @@ dnl Look for a ffmpeg-config (we are on else dnl Trying with pkg-config - PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], + PKG_CHECK_MODULES(FFMPEG,[libavcodec-compat, libavformat-compat], [ CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}" - AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) - AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) - AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) - AC_CHECK_HEADERS(postproc/postprocess.h libpostproc/postprocess.h) + AC_CHECK_HEADERS(ffmpeg/avcodec.h avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h avutil.h) + AC_CHECK_HEADERS(postproc/postprocess.h postprocess.h) if test "${SYS}" = "darwin"; then VLC_ADD_BUILTINS([ffmpeg]) else @@ -2737,7 +2737,7 @@ dnl Trying with pkg-config VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) dnl newer ffmpeg have a separate libpostproc - PKG_CHECK_MODULES(POSTPROC, libpostproc,[ + PKG_CHECK_MODULES(POSTPROC, libpostproc-compat,[ VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}]) ],[ true ]) VLC_RESTORE_FLAGS @@ -2785,8 +2785,8 @@ if test "${enable_ffmpeg}" != "no" then CFLAGS="${CFLAGS} ${CFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS} ${LDFLAGS_ffmpeg}" - AC_CHECK_LIB(avcodec, img_resample, , - [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled])], -lavutil) + AC_CHECK_LIB(avcodec-compat, img_resample, , + [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled])], -lavutil-compat) VLC_RESTORE_FLAGS fi Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/vlc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vlc.spec 9 Aug 2008 18:46:20 -0000 1.3 +++ vlc.spec 3 Sep 2008 15:13:27 -0000 1.4 @@ -7,7 +7,7 @@ %define with_ffmpeg_compat 1 %define ffmpeg_date 20080113 %define with_internal_live555 0 -%define with_shared_live555 0 +%define with_shared_live555 1 %define live555_date 2008.04.03 %define vlc_git 0 %define vlc_date 20080611 @@ -28,8 +28,8 @@ %define _version %{version}-git Release: %{release_tag}.%{vlc_date}git%{?dist} %else -Version: 0.8.6h -%define release_tag 2 +Version: 0.8.6i +%define release_tag 3 %define _version %{version} Release: %{release_tag}%{?dist} %endif @@ -63,9 +63,7 @@ Patch17: vlc-0.8.6c-dts_to_dca_api.patch Patch19: vlc-0.8.6e-pulse.patch Patch20: vlc-0.8.6e-pulse_default.patch -Patch21: vlc-0.8.6e-directfb.patch -Patch50: vlc-0.8.6h-ffmpeg-compat.patch -Patch51: vlc-0.8.6c-ffmpeg_fix_for_compat.patch +Patch50: vlc-0.8.6i-ffmpeg-compat.patch Patch63: vlc-trunk-dirac_0_9_0-api.patch Patch80: vlc-0.8.6e-xulrunner.patch Patch90: vlc-0.8.6-vlvc_0.8.patch @@ -347,12 +345,10 @@ %patch17 -p1 -b .dts_dca %patch19 -p1 -b .pulse %patch20 -p1 -b .pulse_default -%patch21 -p1 -b .directfb %endif %if %{with_ffmpeg_compat} %patch50 -p1 -b .compat -#patch51 -p1 -b .fix_for_compat %endif %if 0%{?fedora} > 8 @@ -460,7 +456,8 @@ # Fake the ffmpeg installation ln -sf %{_includedir}/ffmpeg-compat temp/ffmpeg ln -sf %{_includedir}/postproc-compat temp/postproc -export FFMPEG_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp" +export FFMPEG_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp -I%{_builddir}/%{name}-%{_version}/temp/ffmpeg" +export POSTPROC_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp -I%{_builddir}/%{name}-%{_version}/temp/ffmpeg" export FFMPEG_LDFLAGS="$(pkg-config --libs libpostproc-compat libavcodec-compat libavutil-compat libavformat-compat)" %endif @@ -690,6 +687,7 @@ %{_libdir}/vlc/video_output/libx11_plugin.so %{_libdir}/vlc/video_output/libxvideo_plugin.so %{_libdir}/vlc/visualization/libgalaktos_plugin.so +%{_libdir}/vlc/audio_output/libpulse_plugin.so %if %vlc_git %{_libdir}/vlc/misc/libxosd_plugin.so %{_libdir}/vlc/codec/libxvmc_plugin.so @@ -723,6 +721,7 @@ %exclude %{_libdir}/vlc/video_output/libx11_plugin.so %exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so %exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so +%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so %if %vlc_git %exclude %{_libdir}/vlc/misc/libxosd_plugin.so %exclude %{_libdir}/vlc/codec/libxvmc_plugin.so @@ -776,8 +775,24 @@ %changelog -* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8.6h-2 -- rebuild +* Thu Aug 28 2008 kwizart < kwizart at gmail.com > - 0.8.6i-3 +- Import for RPMFusion +- Switch for live555 + +* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6i-2 +- Fix compilation with ffmpeg-compat + +* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6i-1 +- Update to 0.8.6i +Security updates: + * Fixed integer overflow in WAV demuxer (CVE-2008-2430) + +Various bugfixes: + * Fixed option to use shared memory within the GLX video output module + * Miscellaneous bugfixes in multiple modules and in libvlc + (transcode stream output, OSD menu video filter, VCD input, + SAP services discovery, http control interface) + * Updated Polish translation * Fri Jun 6 2008 kwizart < kwizart at gmail.com > - 0.8.6h-1 - Update to 0.8.6h