rpms/vlc/devel vlc-0.9.2-pulse_default.patch, NONE, 1.1 sources, 1.2,
1.3 .cvsignore, 1.2, 1.3 vlc.spec, 1.3, 1.4
NicolasChauvet
kwizart at rpmfusion.org
Mon Sep 15 11:24:29 CEST 2008
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11839
Modified Files:
sources .cvsignore vlc.spec
Added Files:
vlc-0.9.2-pulse_default.patch
Log Message:
Update to 0.9.2 (final)
vlc-0.9.2-pulse_default.patch:
--- NEW FILE vlc-0.9.2-pulse_default.patch ---
diff -up vlc-0.9.2/modules/audio_output/pulse.c.pulse_default vlc-0.9.2/modules/audio_output/pulse.c
--- vlc-0.9.2/modules/audio_output/pulse.c.pulse_default 2008-09-15 11:05:23.000000000 +0200
+++ vlc-0.9.2/modules/audio_output/pulse.c 2008-09-15 11:05:52.000000000 +0200
@@ -95,7 +95,7 @@ static void uninit(aout_instance_t *p_ao
vlc_module_begin();
set_shortname( "Pulse Audio" );
set_description( N_("Pulseaudio audio output") );
- set_capability( "audio output", 40 );
+ set_capability( "audio output", 200 );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_shortcut( "pulseaudio" );
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 10:01:16 -0000 1.2
+++ sources 15 Sep 2008 09:24:28 -0000 1.3
@@ -1,2 +1 @@
-32e7bd2fdb04d0b05462b24d42409ec7 live.2008.07.25.tar.gz
-d8884f1b2db22a01e81ff53edef1b063 vlc-snapshot-20080802.tar.bz2
+f7d843d0725abb57196c4012eeb0e636 vlc-0.9.2.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 10:01:16 -0000 1.2
+++ .cvsignore 15 Sep 2008 09:24:28 -0000 1.3
@@ -1,2 +1 @@
-live.2008.07.25.tar.gz
-vlc-snapshot-20080802.tar.bz2
+vlc-0.9.2.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vlc.spec 14 Sep 2008 17:50:20 -0000 1.3
+++ vlc.spec 15 Sep 2008 09:24:28 -0000 1.4
@@ -1,44 +1,45 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
+%define _default_patch_fuzz 2
-%define with_internal_live555 1
-%define with_shared_live555 0
+%define with_internal_live555 0
%define live555_date 2008.07.25
-%define vlc_git 1
-%define vlc_date 20080802
+%define vlc_git 0
+%define vlc_date 20080915
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
-%define with_dirac 1
+%define with_dirac 0
+
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
-Version: 0.9.0
-%define release_tag 0.5
%if %vlc_git
-%define _version %{version}-test3
-Release: %{release_tag}.%{vlc_date}git%{?dist}.2
+Version: 1.0.0
+%define _version %{version}-git
+%define release_tag 0.1.%{vlc_date}git
%else
+Version: 0.9.2
%define _version %{version}
-Release: %{release_tag}%{?dist}
+%define release_tag 1
%endif
+Release: %{release_tag}.%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
%if %vlc_git
-Source0: http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0012/vlc-snapshot-%{vlc_date}.tar.bz2
+Source0: http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0024/vlc-snapshot-%{vlc_date}.tar.bz2
%else
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.bz2
+Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}.tar.bz2
%endif
%if %with_internal_live555
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
Patch0: vlc-trunk-default_font.patch
-Patch1: vlc-git-opencvfix.patch
+Patch1: vlc-0.9.2-pulse_default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
%if 0
-BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
@@ -96,17 +97,13 @@
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
BuildRequires: libGLU-devel
BuildRequires: libmusicbrainz-devel
-BuildRequires: lua-devel
+%{?_with_lua:BuildRequires: lua-devel}
BuildRequires: mpeg2dec-devel >= 0.3.2
BuildRequires: ncurses-devel
BuildRequires: opencv-devel
@@ -160,8 +157,8 @@
# Now obsoleted as it will be built externally
-Obsoletes: java-vlc < %{version}
-Obsoletes: python-vlc < %{version}
+Obsoletes: java-vlc < 0.9.0
+Obsoletes: python-vlc < 0.9.0
%if 0
BuildRequires: libgoom2-devel
@@ -246,7 +243,8 @@
%setup -q -D -T -a 2 -n %{name}-%{_version}
%endif
%patch0 -p1 -b .default_font
-%patch1 -p1 -b .opencvfix
+%patch1 -p1 -b .pulse_default
+
%build
@@ -268,6 +266,7 @@
--with-PIC \
--enable-switcher \
--enable-shout \
+ %{?_with_lua:--enable-lua --enable-lua} \
--enable-live555 \
--enable-musicbrainz \
%if %with_internal_live555
@@ -497,11 +496,8 @@
%changelog
-* Sun Sep 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.9.0-0.5.20080802git.2
-- rebuild for new x264
-
-* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.9.0-0.5.20080802git.1
-- rebuild
+* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.9.2-1
+- Update to 0.9.2 (final)
* Sat Aug 2 2008 kwizart < kwizart at gmail.com > - 0.9.0-0.5.20080802git
- Update to 0.9.0-20080802git
More information about the rpmfusion-commits
mailing list