rpms/xine-lib-extras-freeworld/devel xine-lib-extras-freeworld.spec, 1.5, 1.6
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3603
Modified Files:
xine-lib-extras-freeworld.spec
Log Message:
* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-3
- drop "nonfree" verbage from summary/description
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xine-lib-extras-freeworld.spec 23 Sep 2008 13:16:56 -0000 1.5
+++ xine-lib-extras-freeworld.spec 25 Sep 2008 12:12:41 -0000 1.6
@@ -8,9 +8,9 @@
%endif
Name: xine-lib-extras-freeworld
-Summary: Non-free extra codecs for the Xine library
+Summary: Extra codecs for the Xine multimedia library
Version: 1.1.15
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -49,8 +49,10 @@
Obsoletes: xine-lib-moles < 1.1.12-2
%description
-This package adds extra functionality to the Xine library. Those
-plugins may contain patented code.
+This package contains extra codecs for the Xine multimedia library. These
+are free and opensource but left out of the official Fedora repository for
+one reason or another. Once installed, applications using the xine library
+will automatically regcognize and use these additional codecs.
%prep
@@ -175,6 +177,9 @@
%changelog
+* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-3
+- drop "nonfree" verbage from summary/description
+
* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-2
- bump Obsoletes: xine-lib-extras-nonfree
- spec cosmetics
16 years, 5 months
rpms/mythtv/devel mythmusic-busted-cdparanoia-workaround.patch, NONE, 1.1 mythtv.spec, 1.7, 1.8
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15576
Modified Files:
mythtv.spec
Added Files:
mythmusic-busted-cdparanoia-workaround.patch
Log Message:
* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
- Work-around for broken cdparanoia header (rhbz#463009)
mythmusic-busted-cdparanoia-workaround.patch:
--- NEW FILE mythmusic-busted-cdparanoia-workaround.patch ---
diff -Naurp mythplugins-0.21/mythmusic.orig/mythmusic/cddecoder.h mythplugins-0.21/mythmusic/mythmusic/cddecoder.h
--- mythplugins-0.21/mythmusic.orig/mythmusic/cddecoder.h 2007-12-19 18:36:13.000000000 -0500
+++ mythplugins-0.21/mythmusic/mythmusic/cddecoder.h 2008-09-23 13:55:40.000000000 -0400
@@ -12,8 +12,11 @@
#ifdef __linux__
#include <cdaudio.h>
extern "C" {
+// temporary hack for busted cdparanoia header
+#define private cdparanoia_private
#include <cdda_interface.h>
#include <cdda_paranoia.h>
+#undef private
}
#endif
diff -Naurp mythplugins-0.21/mythmusic.orig/mythmusic/cdrip.cpp mythplugins-0.21/mythmusic/mythmusic/cdrip.cpp
--- mythplugins-0.21/mythmusic.orig/mythmusic/cdrip.cpp 2007-11-19 11:44:58.000000000 -0500
+++ mythplugins-0.21/mythmusic/mythmusic/cdrip.cpp 2008-09-23 13:55:10.000000000 -0400
@@ -13,8 +13,11 @@
#ifdef HAVE_CDAUDIO
#include <cdaudio.h>
extern "C" {
+// temporary hack for busted cdparanoia header
+#define private cdparanoia_private
#include <cdda_interface.h>
#include <cdda_paranoia.h>
+#undef private
}
#endif
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mythtv.spec 17 Sep 2008 17:38:02 -0000 1.7
+++ mythtv.spec 23 Sep 2008 19:08:04 -0000 1.8
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 10%{?dist}
+Release: 11%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -47,6 +47,7 @@
#Patch102: mythtv-0.21-fedora-settings.patch
Patch200: mythplugins-0.21-svnfixes.patch
#Patch201: mythplugins-0.21-fedora-settings.patch
+Patch202: mythmusic-busted-cdparanoia-workaround.patch
#
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: freetype-devel >= 2
@@ -527,6 +528,7 @@
cd mythplugins-%{version}
%patch200 -p1 -b .svnfixes
#patch201 -p1 -b .settings
+%patch202 -p1
mv mytharchive/mythburn/themes/Simple\ -\ Autoplay \
mytharchive/mythburn/themes/Simple_-_Autoplay
@@ -1014,6 +1016,9 @@
%endif
%changelog
+* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
+- Work-around for broken cdparanoia header (rhbz#463009)
+
* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-10
- Nuke a bunch of configure flags that really shouldn't be
enabled anymore, per discussion with mythtv devs.
16 years, 5 months
rpms/vcdimager/EL-5 vcdimager.spec,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vcdimager/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5339
Modified Files:
vcdimager.spec
Log Message:
Fix for chrono changelog
Index: vcdimager.spec
===================================================================
RCS file: /cvs/free/rpms/vcdimager/EL-5/vcdimager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vcdimager.spec 23 Sep 2008 15:49:40 -0000 1.5
+++ vcdimager.spec 23 Sep 2008 15:53:57 -0000 1.6
@@ -120,9 +120,7 @@
- Fix URL
- vcdimager-devel Requires libcdio-devel
- Split libs (multilibs compliance)
-
-* Tue Sep 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7.1
-- s/popt-devel/popt/ for EL
+- BR popt instead of popt-devel in EL-5
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7
- merge a few bits from livna spec
16 years, 5 months
rpms/vcdimager/EL-5 vcdimager.spec,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vcdimager/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4996
Modified Files:
vcdimager.spec
Log Message:
-EL5 world
Index: vcdimager.spec
===================================================================
RCS file: /cvs/free/rpms/vcdimager/EL-5/vcdimager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vcdimager.spec 23 Sep 2008 15:41:34 -0000 1.4
+++ vcdimager.spec 23 Sep 2008 15:49:40 -0000 1.5
@@ -30,7 +30,7 @@
Summary: Libraries for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-# Introduced in F-9 to solve multilibs transition
+# Introduced in EL-5 to solve multilibs transition
Obsoletes: vcdimager < 0.7.23-8
%description libs
@@ -120,7 +120,9 @@
- Fix URL
- vcdimager-devel Requires libcdio-devel
- Split libs (multilibs compliance)
-- BR popt instead of popt-devel in EL-5
+
+* Tue Sep 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7.1
+- s/popt-devel/popt/ for EL
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7
- merge a few bits from livna spec
16 years, 5 months
rpms/vcdimager/EL-5 vcdimager.spec,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vcdimager/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4138
Modified Files:
vcdimager.spec
Log Message:
-EL-5 tweaking
Index: vcdimager.spec
===================================================================
RCS file: /cvs/free/rpms/vcdimager/EL-5/vcdimager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vcdimager.spec 23 Sep 2008 15:38:41 -0000 1.3
+++ vcdimager.spec 23 Sep 2008 15:41:34 -0000 1.4
@@ -13,7 +13,7 @@
BuildRequires: libxml2-devel >= 2.3.8
BuildRequires: zlib-devel
BuildRequires: pkgconfig >= 0.9
-BuildRequires: popt-devel
+BuildRequires: popt
Requires: %{name}-libs = %{version}-%{release}
@@ -120,6 +120,7 @@
- Fix URL
- vcdimager-devel Requires libcdio-devel
- Split libs (multilibs compliance)
+- BR popt instead of popt-devel in EL-5
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7
- merge a few bits from livna spec
16 years, 5 months
rpms/vcdimager/EL-5 vcdimager.spec,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vcdimager/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3600/EL-5
Modified Files:
vcdimager.spec
Log Message:
Re-import for the multilibs compliance feature
Index: vcdimager.spec
===================================================================
RCS file: /cvs/free/rpms/vcdimager/EL-5/vcdimager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vcdimager.spec 9 Sep 2008 18:41:39 -0000 1.2
+++ vcdimager.spec 23 Sep 2008 15:38:41 -0000 1.3
@@ -1,19 +1,21 @@
Summary: VideoCD (pre-)mastering and ripping tool
Name: vcdimager
Version: 0.7.23
-Release: 7%{?dist}.1
+Release: 8%{?dist}
License: GPLv2+
Group: Applications/Multimedia
-URL: http://www.vcdimager.org/
+URL: http://www.gnu.org/software/vcdimager/
Source: ftp://ftp.gnu.org/pub/gnu/vcdimager/vcdimager-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(post): info, /sbin/ldconfig
+Requires(post): info
Requires(preun): info
BuildRequires: libcdio-devel >= 0.72
BuildRequires: libxml2-devel >= 2.3.8
BuildRequires: zlib-devel
BuildRequires: pkgconfig >= 0.9
-BuildRequires: popt
+BuildRequires: popt-devel
+
+Requires: %{name}-libs = %{version}-%{release}
%description
VCDImager allows you to create VideoCD BIN/CUE CD images from MPEG
@@ -24,12 +26,23 @@
rip MPEG streams from images or burned VideoCDs and to show
information about a VideoCD.
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+# Introduced in F-9 to solve multilibs transition
+Obsoletes: vcdimager < 0.7.23-8
+
+%description libs
+The %{name}-libs package contains shared libraries for %{name}.
%package devel
Summary: Header files and static library for VCDImager
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+
Requires: pkgconfig
+Requires: libcdio-devel
%description devel
VCDImager allows you to create VideoCD BIN/CUE CD images from mpeg
@@ -51,7 +64,9 @@
%install
%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install INSTALL="install -p"
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
# Sometimes this file gets created... but we don't want it!
%{__rm} -f %{buildroot}%{_infodir}/dir
@@ -60,8 +75,9 @@
%{__rm} -rf %{buildroot}
+%post libs -p /sbin/ldconfig
+
%post
-/sbin/ldconfig
for infofile in vcdxrip.info vcdimager.info vcd-info.info; do
/sbin/install-info %{_infodir}/${infofile} %{_infodir}/dir 2>/dev/null || :
done
@@ -74,7 +90,7 @@
done
fi
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
@@ -82,25 +98,28 @@
%doc AUTHORS BUGS ChangeLog* COPYING FAQ NEWS README THANKS TODO
%doc frontends/xml/videocd.dtd
%{_bindir}/*
-%{_libdir}/libvcdinfo.so.*
%{_infodir}/vcdxrip.info*
%{_infodir}/vcdimager.info*
%{_infodir}/vcd-info.info*
-#{_infodir}/vcddump.info*
%{_mandir}/man1/*
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libvcdinfo.so.*
+
%files devel
%defattr(-,root,root,-)
%doc HACKING
%{_includedir}/libvcd/
-%exclude %{_libdir}/libvcdinfo.la
%{_libdir}/libvcdinfo.so
%{_libdir}/pkgconfig/libvcdinfo.pc
%changelog
-* Tue Sep 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7.1
-- s/popt-devel/popt/ for EL
+* Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 0.7.23-8
+- Fix URL
+- vcdimager-devel Requires libcdio-devel
+- Split libs (multilibs compliance)
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.23-7
- merge a few bits from livna spec
16 years, 5 months
rpms/vlc/F-8 vlc.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27381
Modified Files:
vlc.spec
Log Message:
Fix tag version
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-8/vlc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vlc.spec 23 Sep 2008 13:36:20 -0000 1.7
+++ vlc.spec 23 Sep 2008 13:37:50 -0000 1.8
@@ -20,7 +20,7 @@
Name: vlc
Version: 0.8.7
%define _version 0.8.6i
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
16 years, 5 months
rpms/vlc/F-8 vlc.spec, 1.6, 1.7 vlc-0.8.7-rpmfusion2_head.patch, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27225
Modified Files:
vlc.spec vlc-0.8.7-rpmfusion2_head.patch
Log Message:
- libaccess is no more in -core
- More HEAD bugfixes (live555)
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-8/vlc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vlc.spec 16 Sep 2008 08:53:00 -0000 1.6
+++ vlc.spec 23 Sep 2008 13:36:20 -0000 1.7
@@ -20,7 +20,7 @@
Name: vlc
Version: 0.8.7
%define _version 0.8.6i
-Release: 0.3%{?dist}.1
+Release: 0.3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -591,6 +591,7 @@
%{_datadir}/icons/hicolor/*/apps/vlc.png
%{_bindir}/wxvlc
%{_libdir}/vlc/gui/libwxwidgets_plugin.so
+%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%{_libdir}/vlc/access/libscreen_plugin.so
%{_libdir}/vlc/misc/libsvg_plugin.so
%{_libdir}/vlc/misc/libnotify_plugin.so
@@ -615,6 +616,7 @@
%exclude %{_libdir}/vlc/gui/libwxwidgets_plugin.so
%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
%exclude %{_datadir}/vlc/skins2
+%exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%exclude %{_libdir}/vlc/access/libscreen_plugin.so
%exclude %{_libdir}/vlc/misc/libsvg_plugin.so
%exclude %{_libdir}/vlc/misc/libnotify_plugin.so
@@ -665,6 +667,10 @@
%changelog
+* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.4
+- libaccess is no more in -core
+- More HEAD bugfixes (live555)
+
* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.3
- Update to 20080915 from 0.8.6-bugfix
- BR live555-devel only
vlc-0.8.7-rpmfusion2_head.patch:
Index: vlc-0.8.7-rpmfusion2_head.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-8/vlc-0.8.7-rpmfusion2_head.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-0.8.7-rpmfusion2_head.patch 15 Sep 2008 20:12:32 -0000 1.1
+++ vlc-0.8.7-rpmfusion2_head.patch 23 Sep 2008 13:36:20 -0000 1.2
@@ -122,6 +122,46 @@
if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) )
{
+diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
+index 90040d3..89ff69b 100644
+--- a/modules/demux/live555.cpp
++++ b/modules/demux/live555.cpp
+@@ -110,7 +110,7 @@ vlc_module_begin();
+ N_("Port to use for tunneling the RTSP/RTP over HTTP."),
+ VLC_TRUE );
+ #endif
+- add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
++ add_integer("rtsp-caching", 12 * DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ add_bool( "rtsp-kasenna", VLC_FALSE, NULL, KASENNA_TEXT,
+ KASENNA_LONGTEXT, VLC_TRUE );
+@@ -1201,6 +1201,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ {
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int64_t *pi64;
++ int64_t i_time, i_caching;
+ double *pf, f;
+ vlc_bool_t *pb, b_bool;
+
+@@ -1208,8 +1209,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ {
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+- *pi64 = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start;
+- return VLC_SUCCESS;
++ i_time = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start;
++ i_caching = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
++ if( i_time < i_caching )
++ return VLC_EGENERIC;
++ else
++ {
++ *pi64 = i_time - i_caching;
++ printf("time %zd\n", *pi64);
++ return VLC_SUCCESS;
++ }
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 31e8f2e..85d6513 100644
--- a/modules/mux/mp4.c
16 years, 5 months
rpms/vlc/F-9 vlc.spec, 1.8, 1.9 vlc-0.8.7-rpmfusion2_head.patch, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26835
Modified Files:
vlc.spec vlc-0.8.7-rpmfusion2_head.patch
Log Message:
- libaccess_gnomevfs_plugin is no more in -core
- More HEAD bugfixes (live555)
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-9/vlc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vlc.spec 15 Sep 2008 20:06:50 -0000 1.8
+++ vlc.spec 23 Sep 2008 13:33:59 -0000 1.9
@@ -20,7 +20,7 @@
Name: vlc
Version: 0.8.7
%define _version 0.8.6i
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -589,6 +589,7 @@
%{_datadir}/icons/hicolor/*/apps/vlc.png
%{_bindir}/wxvlc
%{_libdir}/vlc/gui/libwxwidgets_plugin.so
+%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%{_libdir}/vlc/access/libscreen_plugin.so
%{_libdir}/vlc/misc/libsvg_plugin.so
%{_libdir}/vlc/misc/libnotify_plugin.so
@@ -613,6 +614,7 @@
%exclude %{_libdir}/vlc/gui/libwxwidgets_plugin.so
%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
%exclude %{_datadir}/vlc/skins2
+%exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%exclude %{_libdir}/vlc/access/libscreen_plugin.so
%exclude %{_libdir}/vlc/misc/libsvg_plugin.so
%exclude %{_libdir}/vlc/misc/libnotify_plugin.so
@@ -663,6 +665,10 @@
%changelog
+* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.4
+- libaccess_gnomevfs_plugin is no more in -core
+- More HEAD bugfixes (live555)
+
* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.3
- Update to 20080915 from 0.8.6-bugfix
- BR live555-devel only
vlc-0.8.7-rpmfusion2_head.patch:
Index: vlc-0.8.7-rpmfusion2_head.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-9/vlc-0.8.7-rpmfusion2_head.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-0.8.7-rpmfusion2_head.patch 15 Sep 2008 20:08:33 -0000 1.1
+++ vlc-0.8.7-rpmfusion2_head.patch 23 Sep 2008 13:33:59 -0000 1.2
@@ -122,6 +122,46 @@
if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) )
{
+diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
+index 90040d3..89ff69b 100644
+--- a/modules/demux/live555.cpp
++++ b/modules/demux/live555.cpp
+@@ -110,7 +110,7 @@ vlc_module_begin();
+ N_("Port to use for tunneling the RTSP/RTP over HTTP."),
+ VLC_TRUE );
+ #endif
+- add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
++ add_integer("rtsp-caching", 12 * DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ add_bool( "rtsp-kasenna", VLC_FALSE, NULL, KASENNA_TEXT,
+ KASENNA_LONGTEXT, VLC_TRUE );
+@@ -1201,6 +1201,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ {
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int64_t *pi64;
++ int64_t i_time, i_caching;
+ double *pf, f;
+ vlc_bool_t *pb, b_bool;
+
+@@ -1208,8 +1209,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ {
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+- *pi64 = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start;
+- return VLC_SUCCESS;
++ i_time = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start;
++ i_caching = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
++ if( i_time < i_caching )
++ return VLC_EGENERIC;
++ else
++ {
++ *pi64 = i_time - i_caching;
++ printf("time %zd\n", *pi64);
++ return VLC_SUCCESS;
++ }
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 31e8f2e..85d6513 100644
--- a/modules/mux/mp4.c
16 years, 5 months
rpms/xine-lib-extras-freeworld/devel xine-lib-extras-freeworld.spec, 1.4, 1.5
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26014
Modified Files:
xine-lib-extras-freeworld.spec
Log Message:
sync changes from EL-5 branch
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xine-lib-extras-freeworld.spec 4 Sep 2008 12:23:10 -0000 1.4
+++ xine-lib-extras-freeworld.spec 23 Sep 2008 13:16:56 -0000 1.5
@@ -3,6 +3,10 @@
%define abiver 1.24
+%if 0%{?fedora} > 6
+%define _with_external_ffmpeg --with-external-ffmpeg
+%endif
+
Name: xine-lib-extras-freeworld
Summary: Non-free extra codecs for the Xine library
Version: 1.1.15
@@ -19,7 +23,7 @@
BuildRequires: zlib-devel
BuildRequires: gawk
# External libs
-BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
+%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804}
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -65,7 +69,6 @@
# Keep order of options the same as in ./configure --help for easy maintenance
%configure \
--disable-dependency-tracking \
- --with-external-ffmpeg \
--enable-ipv6 \
--disable-opengl \
--disable-xvmc \
@@ -85,7 +88,7 @@
--disable-gnomevfs \
--disable-gdkpixbuf \
--disable-samba \
- --with-external-ffmpeg \
+ %{?_with_external_ffmpeg} \
--with-external-a52dec \
--with-external-libmad \
--with-external-libdts
16 years, 5 months