3:25 p.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9218/devel
Modified Files:
vlc.spec
Added Files:
vlc-1.0-bugfix-duplicate.patch
Log Message:
- Cherry pick from 1.0-bugfix
- Move xcb modules into main
- Move -devel Requirement from main to -core (Mutlilib fix)
vlc-1.0-bugfix-duplicate.patch:
--- NEW FILE vlc-1.0-bugfix-duplicate.patch ---
diff --git a/src/Makefile.am b/src/Makefile.am
index b620179..5f74792 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,6 @@ pkginclude_HEADERS = \
../include/vlc/deprecated.h \
../include/vlc/libvlc.h \
../include/vlc/libvlc_events.h \
- ../include/vlc/libvlc_media_list.h \
../include/vlc/libvlc_media.h \
../include/vlc/libvlc_media_discoverer.h \
../include/vlc/libvlc_media_library.h \
diff --git a/modules/gui/qt4/components/open_panels.cpp
b/modules/gui/qt4/components/open_panels.cpp
index 06056e5..b143a75 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1139,14 +1141,14 @@ void CaptureOpenPanel::updateMRL()
case V4L_DEVICE:
fileList << "v4l://";
mrl += " :v4l-vdev=" + v4lVideoDevice->text();
- mrl += " :v4l-adev=" + v4lAudioDevice->text();
+ mrl += " :input-slave=alsa://" + v4lAudioDevice->text();
mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex()
);
mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
break;
case V4L2_DEVICE:
fileList << "v4l2://";
mrl += " :v4l2-dev=" + v4l2VideoDevice->text();
- mrl += " :v4l2-adev=" + v4l2AudioDevice->text();
+ mrl += " :input-slave=alsa://" + v4l2AudioDevice->text();
mrl += " :v4l2-standard=" + QString::number(
v4l2StdBox->currentIndex() );
break;
case JACK_DEVICE:
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vlc.spec 18 Jun 2009 11:32:41 -0000 1.42
+++ vlc.spec 2 Jul 2009 15:24:45 -0000 1.43
@@ -13,7 +13,7 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
Version: 1.0.0
-Release: 0.12rc4%{?dist}
+Release: 0.14rc4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -29,6 +29,7 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
+Patch5: vlc-1.0-bugfix-duplicate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -167,7 +168,7 @@
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-core = %{version}-%{release}
%description
@@ -253,6 +254,7 @@
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
+%patch5 -p1 -b .dup
rm modules/access/videodev2.h
@@ -282,6 +284,7 @@
--disable-dependency-tracking \
--disable-rpath \
--enable-release \
+ --with-binary-version=%{version}-%{release} \
--with-tuning=no \
--enable-switcher \
--enable-lua \
@@ -464,6 +467,9 @@
%{_libdir}/vlc/video_output/libglx_plugin.so
%{_libdir}/vlc/video_output/libopengl_plugin.so
%{_libdir}/vlc/video_output/libx11_plugin.so
+%{_libdir}/vlc/video_output/libxcb_plugin.so
+%{_libdir}/vlc/video_output/libxcb_window_plugin.so
+%{_libdir}/vlc/video_output/libxcb_xv_plugin.so
%{_libdir}/vlc/video_output/libxvideo_plugin.so
%{_libdir}/vlc/visualization/libgalaktos_plugin.so
%{_libdir}/vlc/misc/libxosd_plugin.so
@@ -499,6 +505,9 @@
%exclude %{_libdir}/vlc/video_output/libglx_plugin.so
%exclude %{_libdir}/vlc/video_output/libopengl_plugin.so
%exclude %{_libdir}/vlc/video_output/libx11_plugin.so
+%exclude %{_libdir}/vlc/video_output/libxcb_plugin.so
+%exclude %{_libdir}/vlc/video_output/libxcb_window_plugin.so
+%exclude %{_libdir}/vlc/video_output/libxcb_xv_plugin.so
%exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so
%exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so
%exclude %{_libdir}/vlc/misc/libxosd_plugin.so
@@ -562,6 +571,11 @@
%changelog
+* Thu Jul 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.14rc4
+- Cherry pick from 1.0-bugfix
+- Move xcb modules into main
+- Move -devel Requirement from main to -core (Mutlilib fix)
+
* Wed Jun 17 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.12rc4
- Update to 1.0.0-rc4