rpms/vlc/devel 0001-Default-libv4l2-to-true.patch, NONE,
1.1 0002-Default-aout-for-pulse.patch, NONE, 1.1 .cvsignore,
1.13, 1.14 sources, 1.13,
1.14 vlc-1.0.0-pre1-xulrunner-191_support.patch, 1.1,
1.2 vlc.spec, 1.33, 1.34
NicolasChauvet
kwizart at rpmfusion.org
Wed May 27 13:34:30 CEST 2009
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14545/devel
Modified Files:
.cvsignore sources vlc-1.0.0-pre1-xulrunner-191_support.patch
vlc.spec
Added Files:
0001-Default-libv4l2-to-true.patch
0002-Default-aout-for-pulse.patch
Log Message:
Update to 1.0.0-rc2
0001-Default-libv4l2-to-true.patch:
--- NEW FILE 0001-Default-libv4l2-to-true.patch ---
>From d3bef7cde676ad96ce036cb10aa534ca1c5d0e24 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart at gmail.com>
Date: Tue, 26 May 2009 18:38:07 +0200
Subject: [PATCH] Default libv4l2 to true
---
modules/access/v4l2.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 31dae66..42a8e9d 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -261,7 +261,7 @@ vlc_module_begin ()
add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true )
#ifdef HAVE_LIBV4L2
- add_bool( CFG_PREFIX "use-libv4l2", false, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
+ add_bool( CFG_PREFIX "use-libv4l2", true, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
#endif
set_section( N_( "Tuner" ), NULL )
--
1.6.0.6
0002-Default-aout-for-pulse.patch:
--- NEW FILE 0002-Default-aout-for-pulse.patch ---
>From bba9ed13be6a4dade99360583dcc4a9eef62d1f4 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart at gmail.com>
Date: Tue, 26 May 2009 23:11:50 +0200
Subject: [PATCH] Default aout for pulse
---
modules/audio_output/pulse.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 86bd6dd..93b2763 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -97,7 +97,7 @@ static void uninit(aout_instance_t *p_aout);
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" )
--
1.6.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 May 2009 13:27:28 -0000 1.13
+++ .cvsignore 27 May 2009 11:34:29 -0000 1.14
@@ -1 +1 @@
-vlc-1.0.0-rc1.tar.bz2
+vlc-1.0.0-rc2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 May 2009 13:27:28 -0000 1.13
+++ sources 27 May 2009 11:34:29 -0000 1.14
@@ -1 +1 @@
-42e31b46e6faa3e0ce7aec3790f014a3 vlc-1.0.0-rc1.tar.bz2
+c0fe6fff896c165abb5bf949616a1eee vlc-1.0.0-rc2.tar.bz2
vlc-1.0.0-pre1-xulrunner-191_support.patch:
Index: vlc-1.0.0-pre1-xulrunner-191_support.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc-1.0.0-pre1-xulrunner-191_support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.0.0-pre1-xulrunner-191_support.patch 3 Apr 2009 14:49:36 -0000 1.1
+++ vlc-1.0.0-pre1-xulrunner-191_support.patch 27 May 2009 11:34:29 -0000 1.2
@@ -86,10 +86,10 @@
{
pluginFuncs->urlnotify = Private_URLNotify;
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
-index 7cabe66..5110c5c 100644
+index 0f6efc0..9ad454c 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
-@@ -103,160 +103,144 @@ NPN_Version(int* plugin_major, int* plugin_minor,
+@@ -103,149 +103,136 @@ NPN_Version(int* plugin_major, int* plugin_minor,
NPError
NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
{
@@ -122,7 +122,7 @@
NPError
NPN_PostURL(NPP instance, const char* url, const char* window,
- uint32 len, const char* buf, NPBool file)
+ uint32_t len, const char* buf, NPBool file)
{
- return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
- url, window, len, buf, file);
@@ -130,7 +130,7 @@
}
NPError
- NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len,
+ NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
const char* buf, NPBool file, void* notifyData)
{
- return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
@@ -155,8 +155,8 @@
+ return (*gNetscapeFuncs.newstream)(instance, type, window, stream_ptr);
}
- int32
- NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
+ int32_t
+ NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
{
- return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
- stream, len, buffer);
@@ -185,8 +185,7 @@
+ return (*gNetscapeFuncs.uagent)(instance);
}
- void*
- NPN_MemAlloc(uint32 size)
+ void *NPN_MemAlloc(uint32_t size)
{
- return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
+ return (*gNetscapeFuncs.memalloc)(size);
@@ -198,7 +197,7 @@
+ (*gNetscapeFuncs.memfree)(ptr);
}
- uint32 NPN_MemFlush(uint32 size)
+ uint32_t NPN_MemFlush(uint32_t size)
{
- return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
+ return (*gNetscapeFuncs.memflush)(size);
@@ -263,18 +262,17 @@
}
NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
- {
+@@ -253,8 +240,7 @@ NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
-- {
+ {
- return CallNPN_GetStringIdentifierProc(
- gNetscapeFuncs.getstringidentifier, name);
-- }
+ return (*gNetscapeFuncs.getstringidentifier)(name);
+ }
return NULL;
}
-
-@@ -265,19 +249,14 @@ void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
+@@ -264,19 +250,14 @@ void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -296,7 +294,7 @@
return NULL;
}
-@@ -285,11 +264,7 @@ bool NPN_IdentifierIsString(NPIdentifier identifier)
+@@ -284,11 +265,7 @@ bool NPN_IdentifierIsString(NPIdentifier identifier)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -309,7 +307,7 @@
return false;
}
-@@ -297,11 +272,7 @@ NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
+@@ -296,11 +273,7 @@ NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -322,7 +320,7 @@
return NULL;
}
-@@ -309,11 +280,7 @@ int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
+@@ -308,11 +281,7 @@ int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -335,7 +333,7 @@
return 0;
}
-@@ -321,7 +288,7 @@ NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
+@@ -320,7 +289,7 @@ NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -344,7 +342,7 @@
return NULL;
}
-@@ -329,7 +296,7 @@ NPObject *NPN_RetainObject(NPObject *obj)
+@@ -328,7 +297,7 @@ NPObject *NPN_RetainObject(NPObject *obj)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -353,7 +351,7 @@
return NULL;
}
-@@ -337,7 +304,7 @@ void NPN_ReleaseObject(NPObject *obj)
+@@ -336,7 +305,7 @@ void NPN_ReleaseObject(NPObject *obj)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -362,7 +360,7 @@
}
bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
-@@ -345,8 +312,7 @@ bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
+@@ -344,8 +313,7 @@ bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -372,7 +370,7 @@
return false;
}
-@@ -355,8 +321,7 @@ bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
+@@ -354,8 +322,7 @@ bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -382,7 +380,7 @@
return false;
}
-@@ -365,8 +330,7 @@ bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
+@@ -364,8 +331,7 @@ bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -392,7 +390,7 @@
return false;
}
-@@ -375,8 +339,7 @@ bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
+@@ -374,8 +340,7 @@ bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -402,7 +400,7 @@
return false;
}
-@@ -385,8 +348,7 @@ bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
+@@ -384,8 +349,7 @@ bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -412,7 +410,7 @@
return false;
}
-@@ -394,8 +356,7 @@ bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
+@@ -393,8 +357,7 @@ bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -422,7 +420,7 @@
return false;
}
-@@ -403,8 +364,7 @@ bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
+@@ -402,8 +365,7 @@ bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -432,7 +430,7 @@
return false;
}
-@@ -412,8 +372,7 @@ bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
+@@ -411,8 +373,7 @@ bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -442,7 +440,7 @@
return false;
}
-@@ -421,14 +380,14 @@ void NPN_ReleaseVariantValue(NPVariant *variant)
+@@ -420,14 +381,14 @@ void NPN_ReleaseVariantValue(NPVariant *variant)
{
int minor = gNetscapeFuncs.version & 0xFF;
if( minor >= 14 )
@@ -459,7 +457,7 @@
}
/***********************************************************************
-@@ -767,22 +726,22 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
+@@ -766,22 +727,22 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
*/
pluginFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
pluginFuncs->size = sizeof(NPPluginFuncs);
@@ -494,4 +492,3 @@
}
#ifdef OJI
if( minor >= NPVERS_HAS_LIVECONNECT )
-
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vlc.spec 13 May 2009 10:35:08 -0000 1.33
+++ vlc.spec 27 May 2009 11:34:29 -0000 1.34
@@ -4,7 +4,7 @@
%define with_internal_live555 0
%define live555_date 2008.07.25
%define vlc_git 0
-%define vlc_rc -rc1
+%define vlc_rc -rc2
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
@@ -13,7 +13,7 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
Version: 1.0.0
-Release: 0.5rc1%{?dist}
+Release: 0.7rc2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -21,13 +21,13 @@
%if %with_internal_live555
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
+Source10: vlc-handlers.schemas
Patch0: vlc-trunk-default_font.patch
+Patch1: 0001-Default-libv4l2-to-true.patch
+Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
Patch5: vlc-1.0.0-pre1-xulrunner-191_support.patch
-Patch6: vlc-1.0.0-bugfix_backport.patch
-Patch7: vlc-1.0.0-rc1-pkglibd.patch
-Patch8: 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -236,6 +236,8 @@
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
%patch0 -p1 -b .default_font
+%patch1 -p1 -b .istrue
+%patch2 -p1 -b .defpa
#http://trac.videolan.org/vlc/ticket/1383
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
@@ -243,12 +245,9 @@
%if 0%{?fedora} >= 11
%patch5 -p1 -b .xul191
%endif
-%patch6 -p1 -b .bp
-%patch7 -p1 -b .pkglibd
-%patch8 -p1 -b .xvmc
-rm autotools/* m4/lib*
-cp -p %{_datadir}/gettext/config.rpath autotools
+rm modules/access/videodev2.h
+ln -sf %{_includedir}/videodev2.h modules/access/
./bootstrap
@@ -293,6 +292,7 @@
--enable-tarkin \
--enable-theora \
--enable-dirac \
+ --enable-xcb \
--enable-svg \
--enable-snapshot \
%ifarch %{ix86} x86_64
@@ -373,6 +373,10 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Fix CGonf2 url-handler support
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
+install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
+
%find_lang %{name}
@@ -380,7 +384,22 @@
rm -rf $RPM_BUILD_ROOT
+%pre
+if [ "$1" -gt 1 ] ; then
+if [ -x %{_bindir}/gconftool-2 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+ %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
+fi
+fi || :
+
+
%post
+if [ -x %{_bindir}/gconftool-2 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
+fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -389,6 +408,15 @@
%post core -p /sbin/ldconfig
+%preun
+if [ "$1" -eq 0 ]; then
+if [ -x %{_bindir}/gconftool-2 ] ; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_datadir}/vlc/utils/vlc-handlers.schemas >& /dev/null
+fi
+fi || :
+
%postun
%{_bindir}/update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -506,6 +534,11 @@
%changelog
+* Wed May 27 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.7rc2
+- Update to 1.0.0-rc2
+- Rebase xulrunner patch for -rc2
+- Add GConf2 support for url-handler (based on totem)
+
* Wed May 13 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.5rc1
- Fix missing XvMC symbols
- Fix export make_URI
More information about the rpmfusion-commits
mailing list