rpms/vlc/F-8 vlc-0.8.6i-ffmpeg-compat.patch, NONE, 1.1 vlc.spec, 1.2,
1.3
NicolasChauvet
kwizart at rpmfusion.org
Mon Sep 8 18:05:01 CEST 2008
Author: kwizart
Update of /cvs/free/rpms/vlc/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23886
Modified Files:
vlc.spec
Added Files:
vlc-0.8.6i-ffmpeg-compat.patch
Log Message:
Sync from F-9
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-8/vlc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vlc.spec 9 Aug 2008 18:46:53 -0000 1.2
+++ vlc.spec 8 Sep 2008 16:05:01 -0000 1.3
@@ -7,13 +7,9 @@
%define with_ffmpeg_compat 1
%define ffmpeg_date 20080113
%define with_internal_live555 0
-%define with_shared_live555 0
%define live555_date 2008.04.03
-%define vlc_git 0
-%define vlc_date 20080611
%define with_mozilla 1
%define with_python_vlc 1
-%define rpmfusion 0
%define with_dc1394 0
%define with_directfb 1
%define with_dirac 1
@@ -22,25 +18,14 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
-%if %vlc_git
-Version: 0.9.0
-%define release_tag 0.2
-%define _version %{version}-git
-Release: %{release_tag}.%{vlc_date}git%{?dist}
-%else
-Version: 0.8.6h
-%define release_tag 2
-%define _version %{version}
+Version: 0.8.7
+%define release_tag 0.1
+%define _version 0.8.6i
Release: %{release_tag}%{?dist}
-%endif
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
-%if %vlc_git
-Source0: http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0057/vlc-snapshot-%{vlc_date}.tar.bz2
-%else
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.bz2
-%endif
+Source0: http://download.videolan.org/pub/videolan/vlc/%{_version}/vlc-%{_version}.tar.bz2
%if %with_intern_ffmpeg
Source1: http://rpm.greysector.net/livna/ffmpeg-%{ffmpeg_date}.tar.bz2
%endif
@@ -50,7 +35,6 @@
%if %with_vlvc
Source3: https://pfe.epitech.net/frs/download.php/747/vlvc_source-0.8.tgz
%endif
-Patch1: vlc-0.8.6h-new_x-content.patch
Patch3: vlc-0.8.6-wx28compat.patch
Patch4: vlc-0.8.6f-shared_live555.patch
Patch5: vlc-0.8.6f-all_plugin.patch
@@ -63,13 +47,14 @@
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
Patch91: vlc-0.8.6-vlvcfix.patch
+# git-diff tags/vlc-0.8.6i HEAD > vlc-0.8.7-git_head-$(date +%Y%m%d ).patch
+# tar cjvf vlc-0.8.7-git_head-$(date +%Y%m%d ).patch.tar.bz2
+Patch99: vlc-0.8.7-git_head-20080908.patch.tar.bz2
Patch100: vlc-trunk-default_font.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,11 +127,7 @@
BuildConflicts: live-devel
BuildConflicts: live555-devel
%else
-%if %with_shared_live555
BuildRequires: live555-devel >= 0-0.19.2008.04.03
-%else
-BuildRequires: live-devel >= 0-0.11.2006.08.07
-%endif
%endif
BuildRequires: kernel-headers >= 2.6.20
BuildRequires: libGL-devel
@@ -211,24 +192,10 @@
# Now obsoleted as it will be built externally
Obsoletes: java-vlc < %{version}
+#Not in repos
+#BuildRequires: libgoom2-devel
+#BuildRequires: libggi-devel
-%if %vlc_git
-BuildRequires: opencv-devel
-BuildRequires: qt4-devel
-BuildRequires: dbus-devel
-BuildRequires: fluidsynth-devel
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: lua-devel
-BuildRequires: libXvMC-devel
-BuildRequires: taglib-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: zvbi-devel
-%endif
-
-%if %rpmfusion
-BuildRequires: libgoom2-devel
-BuildRequires: libggi-devel
-%endif
%if %with_dc1394
BuildRequires: compat-libdc1394-devel
@@ -254,6 +221,10 @@
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
+!!!BIG FAT WARNING!!!
+This vlc-0.8.7 pre-version is based on vlc-0.8.6-bugfix branch
+See http://mailman.videolan.org/pipermail/vlc/2008-August/015827.html
+
%description devel
This package contains development files for VLC Media Player.
@@ -330,10 +301,6 @@
%endif
-%if %vlc_git
-%patch100 -p1 -b .default_font
-%else
-%patch1 -p1 -b .new_x-content
%patch3 -p1 -b .wxGTK28compat
%patch4 -p1 -b .shared_live555
%patch5 -p1 -b .all_plugin
@@ -347,12 +314,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
@@ -364,8 +329,7 @@
%patch90 -p1 -b .vlvc
%patch91 -p1 -b .vlvcfix
%endif
-
-%endif
+%patch99 -p1 -b .vlc87
%{?_with_clinkcc:
#hack for clinkcc support - optional feature - under testing.
@@ -375,8 +339,6 @@
sed -i -e 's|MediaServer.h|media/server/MediaServer.h|' configure.ac configure
}
-%if %vlc_git
-%else
# Fix perms issues
chmod 644 mozilla/control/*
chmod 644 src/control/log.c
@@ -384,7 +346,6 @@
sh bootstrap
-%endif
%build
@@ -419,11 +380,7 @@
--enable-libxvid \
--enable-pp \
--enable-gpl \
-%{?_with_amr:--enable-libamr-nb --enable-libamr-wb } \
-%if %vlc_git
- --enable-swscaler \
-%endif
-
+%{?_with_amr:--enable-libamr-nb --enable-libamr-wb }
# Watch http://trac.videolan.org/vlc/ticket/865
# Planned to be enabled for 0.9.x
@@ -460,7 +417,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
@@ -534,10 +492,6 @@
--enable-ncurses \
--enable-xosd \
--enable-galaktos \
-%if %rpmfusion
- --enable-goom \
- --enable-ggi \
-%endif
--enable-slp \
--enable-lirc \
--disable-corba \
@@ -554,42 +508,11 @@
%if %with_mozilla
--enable-mozilla \
%endif
- --with-x264-tree=%{_includedir} \
-%if %vlc_git
- --enable-switcher \
- --enable-opencv \
- --enable-v4l \
- --enable-v4l2 \
- --enable-gnomevfs \
-%if 0%{?fedora} < 9
- --disable-swscale \
- --enable-imgresample \
-%endif
- --disable-dv \
- --disable-skins2 \
- --disable-wxwidgets \
- --enable-libcdio \
- --enable-cddax \
- --enable-vcdx \
- --enable-audioscrobbler \
- --enable-musicbrainz \
- --enable-taglib \
- --enable-dbus-control \
- --enable-qt4 \
- --enable-xvmc \
- --enable-ncurses
-%endif
-
+ --with-x264-tree=%{_includedir}
-%if %vlc_git
-# remove rpath from libtool
-sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%else
# clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-%endif
%if %{with_ffmpeg_compat}
sed -i -e 's|cflags="${cflags} -I/usr/include/ffmpeg-compat"|cflags="${cflags} -I%{_includedir}/ffmpeg-compat -I%{_includedir}/postproc-compat/"|' vlc-config
@@ -625,13 +548,10 @@
--mode 644 \
$RPM_BUILD_ROOT%{_datadir}/applications/vlc.desktop
-%if %vlc_git
-%else
%if %with_python_vlc
# Fix python shebang
sed -i -e 's|"""Wrapper|#!/usr/bin/python\n"""Wrapper|' $RPM_BUILD_ROOT%{_bindir}/vlcwrapper.py
%endif
-%endif
%find_lang %{name}
@@ -669,17 +589,8 @@
%endif
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/vlc.png
-%if %vlc_git
-%{_bindir}/cvlc
-%{_bindir}/nvlc
-%{_bindir}/qvlc
-%{_bindir}/rvlc
-%{_bindir}/vlc-wrapper
-%{_libdir}/vlc/gui/libqt4_plugin.so
-%else
%{_bindir}/wxvlc
%{_libdir}/vlc/gui/libwxwidgets_plugin.so
-%endif
%{_libdir}/vlc/access/libscreen_plugin.so
%{_libdir}/vlc/misc/libsvg_plugin.so
%{_libdir}/vlc/misc/libnotify_plugin.so
@@ -690,29 +601,20 @@
%{_libdir}/vlc/video_output/libx11_plugin.so
%{_libdir}/vlc/video_output/libxvideo_plugin.so
%{_libdir}/vlc/visualization/libgalaktos_plugin.so
-%if %vlc_git
-%{_libdir}/vlc/misc/libxosd_plugin.so
-%{_libdir}/vlc/codec/libxvmc_plugin.so
-%{_libdir}/vlc/video_output/libxvmc_plugin.so
-%else
+%{_libdir}/vlc/audio_output/libpulse_plugin.so
%{_libdir}/vlc/visualization/libxosd_plugin.so
%{_libdir}/vlc/gui/libskins2_plugin.so
%{_datadir}/vlc/skins2/
-%endif
%files core -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/vlc
%{_datadir}/vlc/
%{_libdir}/*.so.*
-%if %vlc_git
-%exclude %{_libdir}/vlc/gui/libqt4_plugin.so
-%else
%{_bindir}/svlc
%exclude %{_libdir}/vlc/gui/libwxwidgets_plugin.so
%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
%exclude %{_datadir}/vlc/skins2
-%endif
%exclude %{_libdir}/vlc/access/libscreen_plugin.so
%exclude %{_libdir}/vlc/misc/libsvg_plugin.so
%exclude %{_libdir}/vlc/misc/libnotify_plugin.so
@@ -723,13 +625,8 @@
%exclude %{_libdir}/vlc/video_output/libx11_plugin.so
%exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so
%exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so
-%if %vlc_git
-%exclude %{_libdir}/vlc/misc/libxosd_plugin.so
-%exclude %{_libdir}/vlc/codec/libxvmc_plugin.so
-%exclude %{_libdir}/vlc/video_output/libxvmc_plugin.so
-%else
+%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
%exclude %{_libdir}/vlc/visualization/libxosd_plugin.so
-%endif
%if %with_dc1394
%exclude %{_libdir}/vlc/access/libdc1394_plugin.so
%endif
@@ -749,12 +646,7 @@
%{_includedir}/vlc/*
%{_mandir}/man1/vlc-config.1*
%{_libdir}/*.so
-%if %vlc_git
-%{_libdir}/pkgconfig/vlc-plugin.pc
-%{_libdir}/pkgconfig/libvlc.pc
-%else
%{_bindir}/vlc-config
-%endif
%if %with_mozilla
%files -n mozilla-vlc
@@ -766,18 +658,41 @@
%files -n python-vlc
%defattr(-,root,root,-)
%{python_sitearch}/*
-%if %vlc_git
-%else
%{_bindir}/vlcwrapper.py
%exclude %{_bindir}/vlcwrapper.py?
%endif
-%endif
%changelog
-* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8.6h-2
-- rebuild
+* Mon Sep 8 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.1
+- Update to 0.8.6-bugfix
+Security updates:
+ * Fixed overflow in TTA demuxer (CVE-2008-3732)
+ * Fixed overflow in MMS module (CVE-2008-3794)
+ * Fixed overflow in Ogg demuxer
+Various bugfixes:
+ * Fixed support for large URLs in HTTPd scripts
+- Drop vlc-git support from this spec file
+
+* 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
More information about the rpmfusion-commits
mailing list