rpms/vlc/devel vlc-1.1.6-hardode_font_patch.patch, NONE, 1.1 vlc-backport-lirc_fix.patch, NONE, 1.1 vlc.spec, 1.103, 1.104 sources, 1.39, 1.40 .cvsignore, 1.33, 1.34 vlc-1.1.4-hardode_font_patch.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30812
Modified Files:
vlc.spec sources .cvsignore
Added Files:
vlc-1.1.6-hardode_font_patch.patch vlc-backport-lirc_fix.patch
Removed Files:
vlc-1.1.4-hardode_font_patch.patch
Log Message:
VLC 1.1.6 - 'The Luggage'
This is the seventh release of the 1.1.x branch of VLC.
This is a minor release, focused on minor features, bugfixes and security issues:
- Various security issues in Real demuxer, CDG and subtitle decoders, transcode
- Important Visualisation improvements, notably in projectM and goom
- Faster Webm/VP8 decoding
- Fixes in WMV seeking, Icy metadata, freetype, XDG screensaver and KDE solid
- Fixes and improvements on PulseAudio output
- MPC SV7/SV8 support on Windows/MacOS X, Midi on MacOS X
- Support for audio/L24 in RTP
- Fix for Audio CD playback on Windows
- Qt4 and Media Keys processing improvements
vlc-1.1.6-hardode_font_patch.patch:
projectm.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vlc-1.1.6-hardode_font_patch.patch ---
diff -up vlc-1.1.6/modules/visualization/projectm.cpp.hardode_path vlc-1.1.6/modules/visualization/projectm.cpp
--- vlc-1.1.6/modules/visualization/projectm.cpp.hardode_path 2011-01-17 17:30:54.000000000 +0100
+++ vlc-1.1.6/modules/visualization/projectm.cpp 2011-01-25 10:55:30.791607002 +0100
@@ -89,9 +89,9 @@ vlc_module_begin ()
add_directory( "projectm-preset-path", "/usr/share/projectM/presets", NULL,
#endif
PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
- add_file( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", NULL,
+ add_file( "projectm-title-font", "/usr/share/fonts/dejavu/DejaVuSans.ttf", NULL,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
- add_file( "projectm-menu-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", NULL,
+ add_file( "projectm-menu-font", "/usr/share/fonts/dejavu/DejaVuSansMono.ttf", NULL,
MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
#endif
add_integer( "projectm-width", 800, NULL, WIDTH_TEXT, WIDTH_LONGTEXT,
vlc-backport-lirc_fix.patch:
lirc.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE vlc-backport-lirc_fix.patch ---
commit 942ab6c31026a84e4c5503cb8e68a5135dfc2f2b
Author: Pierre Ynard <linkfanel(a)yahoo.fr>
Date: Sun Jan 23 18:19:05 2011 +0100
lirc: build fix
diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index aee33c3..e8c4780 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -25,6 +25,7 @@
* Preamble
*****************************************************************************/
+#include <errno.h>
#include <fcntl.h>
#ifdef HAVE_CONFIG_H
@@ -154,10 +155,12 @@ static void Run( intf_thread_t *p_intf )
/* Wait for data */
struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0
if( poll( &ufd, 1, -1 ) == -1 )
+ {
if( errno == EINTR )
continue;
else
break;
+ }
/* Process */
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vlc.spec 22 Jan 2011 10:11:28 -0000 1.103
+++ vlc.spec 25 Jan 2011 11:57:16 -0000 1.104
@@ -17,12 +17,16 @@
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
%endif
-
+%if 0%{?fedora} > 14
+# Those need works in Rawhide
+%global _without_opencv 1
+%global _without_mozilla 1
+%endif
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.5
-Release: 3%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -32,8 +36,9 @@
%endif
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
Patch1: 0001-Libnotify-depends-on-a-gtk.patch
-Patch3: vlc-1.1.4-hardode_font_patch.patch
+Patch3: vlc-1.1.6-hardode_font_patch.patch
Patch4: vlc-1.1.4-tls_path.patch
+Patch5: vlc-backport-lirc_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -88,6 +93,7 @@
BuildRequires: libprojectM-qt-devel
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
+BuildRequires: librtmp-devel
BuildRequires: libssh2-devel
BuildRequires: libsysfs-devel
BuildRequires: libshout-devel
@@ -113,7 +119,7 @@
BuildRequires: minizip-devel
%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
BuildRequires: ncurses-devel
-BuildRequires: opencv-devel
+%{!?_without_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
@@ -208,6 +214,7 @@
Provides: ffmpeg4vlc-devel = 0.6-0.5
Obsoletes: ffmpeg4vlc-libs < 0.6-0.5
Obsoletes: ffmpeg4vlc-devel < 0.6-0.5
+%{?live555date:Requires: live555%{_isa} = %{live555date}}
%description core
VLC media player core components
@@ -240,6 +247,7 @@
%patch1 -p1 -b .gtk23
%patch3 -p1 -b .hardode_path
%patch4 -p1 -b .tls_path
+%patch5 -p1 -b .lirc_fix
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
rm modules/access/videodev2.h
@@ -280,7 +288,7 @@
--with-live555-tree=live \
%endif
--enable-dv \
- --enable-opencv \
+%{!?_without_opencv:--enable-opencv} \
--enable-sftp \
--enable-pvr \
--enable-gnomevfs \
@@ -491,8 +499,10 @@
%exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%{!?_without_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+}
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
%endif
@@ -518,8 +528,10 @@
%if 0%{?fedora} < 15
%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
%endif
+%{!?_without_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+}
%ifarch %{ix86} x86_64
%{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
%endif
@@ -543,8 +555,8 @@
%changelog
-* Sat Jan 22 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-3
-- Rebuilt for OpenCV 2.2
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-1
+- Update to 1.1.6
* Sat Dec 18 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-2
- Clear execstack on dmo and real plugin for i686
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 14 Nov 2010 22:57:19 -0000 1.39
+++ sources 25 Jan 2011 11:57:16 -0000 1.40
@@ -1 +1 @@
-fdc23693351ed57af9f4c85ea885b536 vlc-1.1.5.tar.bz2
+c47f3ebc886f2aff8c95b98c564d1759 vlc-1.1.6.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 14 Nov 2010 22:57:19 -0000 1.33
+++ .cvsignore 25 Jan 2011 11:57:16 -0000 1.34
@@ -1 +1 @@
-vlc-1.1.5.tar.bz2
+vlc-1.1.6.tar.bz2
--- vlc-1.1.4-hardode_font_patch.patch DELETED ---
13 years, 3 months
rpms/mimms/F-14 mimms.spec,1.5,1.6
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/mimms/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14928
Modified Files:
mimms.spec
Log Message:
revert something stupid
Index: mimms.spec
===================================================================
RCS file: /cvs/free/rpms/mimms/F-14/mimms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mimms.spec 25 Jan 2011 07:57:17 -0000 1.5
+++ mimms.spec 25 Jan 2011 07:58:31 -0000 1.6
@@ -3,7 +3,7 @@
Summary: MMS stream downloader
Name: mimms
Version: 3.2.1
-Release: 6%{?dist}
+Release: 5%{?dist}
License: GPLv3+
Group: Applications/Multimedia
URL: http://savannah.nongnu.org/projects/mimms/
@@ -46,9 +46,6 @@
%changelog
-* Tue Jan 25 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.1-6
-- rebuilt
-
* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 3.2.1-5
- Rebuilt for python
13 years, 3 months
rpms/mimms/F-14 mimms.spec,1.4,1.5
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/mimms/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14801
Modified Files:
mimms.spec
Log Message:
* Tue Jan 25 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.1-6
- rebuilt
Index: mimms.spec
===================================================================
RCS file: /cvs/free/rpms/mimms/F-14/mimms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mimms.spec 24 Jan 2011 22:43:12 -0000 1.4
+++ mimms.spec 25 Jan 2011 07:57:17 -0000 1.5
@@ -3,7 +3,7 @@
Summary: MMS stream downloader
Name: mimms
Version: 3.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+
Group: Applications/Multimedia
URL: http://savannah.nongnu.org/projects/mimms/
@@ -46,6 +46,9 @@
%changelog
+* Tue Jan 25 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.1-6
+- rebuilt
+
* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 3.2.1-5
- Rebuilt for python
13 years, 3 months
rpms/mimms/devel mimms.spec,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mimms/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22893/devel
Modified Files:
mimms.spec
Log Message:
Rebuild for python
Index: mimms.spec
===================================================================
RCS file: /cvs/free/rpms/mimms/devel/mimms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mimms.spec 29 Mar 2009 13:38:35 -0000 1.3
+++ mimms.spec 24 Jan 2011 22:43:12 -0000 1.4
@@ -3,7 +3,7 @@
Summary: MMS stream downloader
Name: mimms
Version: 3.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+
Group: Applications/Multimedia
URL: http://savannah.nongnu.org/projects/mimms/
@@ -46,6 +46,9 @@
%changelog
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 3.2.1-5
+- Rebuilt for python
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.1-4
- rebuild for new F11 features
13 years, 3 months
rpms/mimms/F-14 mimms.spec,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mimms/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22893/F-14
Modified Files:
mimms.spec
Log Message:
Rebuild for python
Index: mimms.spec
===================================================================
RCS file: /cvs/free/rpms/mimms/F-14/mimms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mimms.spec 29 Mar 2009 13:38:35 -0000 1.3
+++ mimms.spec 24 Jan 2011 22:43:12 -0000 1.4
@@ -3,7 +3,7 @@
Summary: MMS stream downloader
Name: mimms
Version: 3.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+
Group: Applications/Multimedia
URL: http://savannah.nongnu.org/projects/mimms/
@@ -46,6 +46,9 @@
%changelog
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 3.2.1-5
+- Rebuilt for python
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.1-4
- rebuild for new F11 features
13 years, 3 months
rpms/live555/devel .cvsignore, 1.8, 1.9 live-inet_ntop.patch, 1.1, 1.2 live-uselocale.patch, 1.1, 1.2 live555.spec, 1.10, 1.11 sources, 1.9, 1.10
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20856/devel
Modified Files:
.cvsignore live-inet_ntop.patch live-uselocale.patch
live555.spec sources
Log Message:
Update to 2011.01.24
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/live555/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 1 May 2010 17:42:47 -0000 1.8
+++ .cvsignore 24 Jan 2011 22:16:07 -0000 1.9
@@ -1 +1 @@
-live.2010.04.09.tar.gz
+live.2011.01.24.tar.gz
live-inet_ntop.patch:
groupsock/Groupsock.cpp | 9 +++++---
groupsock/include/GroupsockHelper.hh | 2 -
groupsock/inet.c | 29 ++++++++++------------------
liveMedia/DarwinInjector.cpp | 3 +-
liveMedia/OnDemandServerMediaSubsession.cpp | 5 ++--
liveMedia/PassiveServerMediaSubsession.cpp | 5 ++--
liveMedia/RTSPClient.cpp | 3 +-
liveMedia/RTSPServer.cpp | 19 +++++++++++-------
liveMedia/SIPClient.cpp | 7 +++---
liveMedia/ServerMediaSession.cpp | 5 ++--
testProgs/sapWatch.cpp | 5 ++--
11 files changed, 50 insertions(+), 42 deletions(-)
Index: live-inet_ntop.patch
===================================================================
RCS file: /cvs/free/rpms/live555/devel/live-inet_ntop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- live-inet_ntop.patch 1 May 2010 15:16:55 -0000 1.1
+++ live-inet_ntop.patch 24 Jan 2011 22:16:07 -0000 1.2
@@ -1,9 +1,9 @@
Copyright (C) 2010 Rémi Denis-Courmont.
Licensed under GNU General Public License version 2 or higher.
-diff -ru live.orig//groupsock/Groupsock.cpp live//groupsock/Groupsock.cpp
---- live.orig//groupsock/Groupsock.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//groupsock/Groupsock.cpp 2010-04-17 19:51:07.000000000 +0300
-@@ -331,8 +331,10 @@
+diff -ru live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
+--- live.orig/groupsock/Groupsock.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/groupsock/Groupsock.cpp 2010-10-20 12:34:04.762178010 +0200
+@@ -335,8 +335,10 @@
}
}
if (DebugLevel >= 3) {
@@ -15,7 +15,7 @@
if (numMembers > 0) {
env() << "; relayed to " << numMembers << " members";
}
-@@ -441,13 +443,14 @@
+@@ -445,13 +447,14 @@
}
UsageEnvironment& operator<<(UsageEnvironment& s, const Groupsock& g) {
@@ -32,10 +32,10 @@
} else {
return s1 << (unsigned)(g.ttl()) << ")";
}
-diff -ru live.orig//groupsock/include/GroupsockHelper.hh live//groupsock/include/GroupsockHelper.hh
---- live.orig//groupsock/include/GroupsockHelper.hh 2010-04-09 22:27:39.000000000 +0300
-+++ live//groupsock/include/GroupsockHelper.hh 2010-04-17 19:43:44.000000000 +0300
-@@ -124,7 +124,7 @@
+diff -ru live.orig/groupsock/include/GroupsockHelper.hh live/groupsock/include/GroupsockHelper.hh
+--- live.orig/groupsock/include/GroupsockHelper.hh 2010-10-20 10:31:13.000000000 +0200
++++ live/groupsock/include/GroupsockHelper.hh 2010-10-20 12:34:04.762178010 +0200
+@@ -116,7 +116,7 @@
// The following are implemented in inet.c:
extern "C" netAddressBits our_inet_addr(char const*);
@@ -44,10 +44,10 @@
extern "C" struct hostent* our_gethostbyname(char* name);
extern "C" void our_srandom(int x);
extern "C" long our_random();
-diff -ru live.orig//groupsock/inet.c live//groupsock/inet.c
---- live.orig//groupsock/inet.c 2010-04-09 22:27:39.000000000 +0300
-+++ live//groupsock/inet.c 2010-04-17 19:42:52.000000000 +0300
-@@ -21,26 +21,18 @@
+diff -ru live.orig/groupsock/inet.c live/groupsock/inet.c
+--- live.orig/groupsock/inet.c 2010-10-20 10:31:13.000000000 +0200
++++ live/groupsock/inet.c 2010-10-20 12:34:04.762178010 +0200
+@@ -21,26 +21,19 @@
}
char *
@@ -65,7 +65,8 @@
+ strncpy(result, ret, 16);
+ return ret;
+#elif !defined (VXWORKS)
-+ return inet_ntop(AF_INET, &in, result, 16);
++ inet_ntop(AF_INET, &in, result, 16);
++ return(result);
#else
- /* according the man pages of inet_ntoa :
-
@@ -84,10 +85,10 @@
inet_ntoa_b(in, result);
return(result);
#endif
-diff -ru live.orig//liveMedia/DarwinInjector.cpp live//liveMedia/DarwinInjector.cpp
---- live.orig//liveMedia/DarwinInjector.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/DarwinInjector.cpp 2010-04-17 19:45:19.000000000 +0300
-@@ -128,7 +128,8 @@
+diff -ru live.orig/liveMedia/DarwinInjector.cpp live/liveMedia/DarwinInjector.cpp
+--- live.orig/liveMedia/DarwinInjector.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/liveMedia/DarwinInjector.cpp 2010-10-20 12:34:04.762178010 +0200
+@@ -146,7 +146,8 @@
NetAddress const* address = addresses.firstAddress();
addr.s_addr = *(unsigned*)(address->data());
}
@@ -97,9 +98,9 @@
// Construct a SDP description for the session that we'll be streaming:
char const* const sdpFmt =
-diff -ru live.orig//liveMedia/OnDemandServerMediaSubsession.cpp live//liveMedia/OnDemandServerMediaSubsession.cpp
---- live.orig//liveMedia/OnDemandServerMediaSubsession.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/OnDemandServerMediaSubsession.cpp 2010-04-17 19:50:05.000000000 +0300
+diff -ru live.orig/liveMedia/OnDemandServerMediaSubsession.cpp live/liveMedia/OnDemandServerMediaSubsession.cpp
+--- live.orig/liveMedia/OnDemandServerMediaSubsession.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/liveMedia/OnDemandServerMediaSubsession.cpp 2010-10-20 12:34:04.762178010 +0200
@@ -365,7 +365,8 @@
char const* mediaType = rtpSink->sdpMediaType();
unsigned char rtpPayloadType = rtpSink->rtpPayloadType();
@@ -119,9 +120,9 @@
fSDPLines = strDup(sdpLines);
delete[] sdpLines;
-diff -ru live.orig//liveMedia/PassiveServerMediaSubsession.cpp live//liveMedia/PassiveServerMediaSubsession.cpp
---- live.orig//liveMedia/PassiveServerMediaSubsession.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/PassiveServerMediaSubsession.cpp 2010-04-17 19:46:28.000000000 +0300
+diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/PassiveServerMediaSubsession.cpp
+--- live.orig/liveMedia/PassiveServerMediaSubsession.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/liveMedia/PassiveServerMediaSubsession.cpp 2010-10-20 12:34:04.762178010 +0200
@@ -54,7 +54,8 @@
char const* auxSDPLine = fRTPSink.auxSDPLine();
if (auxSDPLine == NULL) auxSDPLine = "";
@@ -141,39 +142,26 @@
fSDPLines = strDup(sdpLines);
delete[] sdpLines;
-diff -ru live.orig//liveMedia/RTCP.cpp live//liveMedia/RTCP.cpp
---- live.orig//liveMedia/RTCP.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/RTCP.cpp 2010-04-17 19:46:44.000000000 +0300
-@@ -359,7 +359,8 @@
- }
-
- #ifdef DEBUG
-- fprintf(stderr, "[%p]saw incoming RTCP packet (from address %s, port %d)\n", this, our_inet_ntoa(fromAddress.sin_addr), ntohs(fromAddress.sin_port));
+diff -ru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
+--- live.orig/liveMedia/RTSPClient.cpp 2010-10-20 12:34:33.662177993 +0200
++++ live/liveMedia/RTSPClient.cpp 2010-10-20 12:34:04.762178010 +0200
+@@ -411,7 +411,8 @@
+ int RTSPClient::connectToServer(int socketNum, portNumBits remotePortNum) {
+ MAKE_SOCKADDR_IN(remoteName, fServerAddress, htons(remotePortNum));
+ if (fVerbosityLevel >= 1) {
+- envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr) << ", port " << remotePortNum << "...\n";
+ char buf[16];
-+ fprintf(stderr, "[%p]saw incoming RTCP packet (from address %s, port %d)\n", this, our_inet_ntoa(fromAddress.sin_addr, buf), ntohs(fromAddress.sin_port));
- unsigned char* p = pkt;
- for (unsigned i = 0; i < packetSize; ++i) {
- if (i%4 == 0) fprintf(stderr, " ");
-diff -ru live.orig//liveMedia/RTSPOverHTTPServer.cpp live//liveMedia/RTSPOverHTTPServer.cpp
---- live.orig//liveMedia/RTSPOverHTTPServer.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/RTSPOverHTTPServer.cpp 2010-04-17 19:50:41.000000000 +0300
-@@ -128,7 +128,8 @@
- makeSocketNonBlocking(clientSocket);
- increaseSendBufferTo(envir(), clientSocket, 50*1024);
- #if defined(DEBUG) || defined(DEBUG_CONNECTIONS)
-- fprintf(stderr, "accept()ed connection from %s\n", our_inet_ntoa(clientAddr.sin_addr));
-+ char buf[16];
-+ fprintf(stderr, "accept()ed connection from %s\n", our_inet_ntoa(clientAddr.sin_addr, buf));
- #endif
-
- // Create a new object for handling this HTTP connection:
-diff -ru live.orig//liveMedia/RTSPServer.cpp live//liveMedia/RTSPServer.cpp
---- live.orig//liveMedia/RTSPServer.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/RTSPServer.cpp 2010-04-17 19:49:32.000000000 +0300
-@@ -112,11 +112,12 @@
++ envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr, buf) << ", port " << remotePortNum << "...\n";
+ }
+ if (connect(socketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
+ if (envir().getErrno() == EINPROGRESS) {
+diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
+--- live.orig/liveMedia/RTSPServer.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/liveMedia/RTSPServer.cpp 2010-10-20 12:34:04.772177998 +0200
+@@ -111,11 +111,12 @@
char urlBuffer[100]; // more than big enough for "rtsp://<ip-address>:<port>/"
- portNumBits portNumHostOrder = ntohs(fServerPort.num());
+ portNumBits portNumHostOrder = ntohs(fRTSPServerPort.num());
+ char buf[16];
if (portNumHostOrder == 554 /* the default port number */) {
- sprintf(urlBuffer, "rtsp://%s/", our_inet_ntoa(ourAddress.sin_addr));
@@ -185,32 +173,30 @@
}
return strDup(urlBuffer);
-@@ -233,7 +234,8 @@
+@@ -264,7 +265,8 @@
increaseSendBufferTo(envir(), clientSocket, 50*1024);
- #if defined(DEBUG) || defined(DEBUG_CONNECTIONS)
+ #ifdef DEBUG
- envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr) << '\n';
+ char buf[16];
+ envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr, buf) << '\n';
#endif
// Create a new object for this RTSP session.
-@@ -747,10 +749,12 @@
- serverRTPPort, serverRTCPPort,
- fStreamStates[streamNum].streamToken);
+@@ -860,8 +862,10 @@
+ ReceivingInterfaceAddr = origReceivingInterfaceAddr;
+
struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
- char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
+- char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
+ char destAddrStr[16];
+ our_inet_ntoa(destinationAddr, destAddrStr);
- struct sockaddr_in sourceAddr; SOCKLEN_T namelen = sizeof sourceAddr;
- getsockname(fClientSocket, (struct sockaddr*)&sourceAddr, &namelen);
-- char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
+ char sourceAddrStr[16];
+ our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
if (fIsMulticast) {
switch (streamingMode) {
case RTP_UDP:
-@@ -825,7 +829,7 @@
+@@ -936,7 +940,7 @@
}
}
}
@@ -219,7 +205,7 @@
}
void RTSPServer::RTSPClientSession
-@@ -1226,7 +1230,8 @@
+@@ -1446,7 +1450,8 @@
// If this gets called, the client session is assumed to have timed out,
// so delete it:
#ifdef DEBUG
@@ -229,9 +215,9 @@
#endif
delete clientSession;
}
-diff -ru live.orig//liveMedia/ServerMediaSession.cpp live//liveMedia/ServerMediaSession.cpp
---- live.orig//liveMedia/ServerMediaSession.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/ServerMediaSession.cpp 2010-04-17 19:50:31.000000000 +0300
+diff -ru live.orig/liveMedia/ServerMediaSession.cpp live/liveMedia/ServerMediaSession.cpp
+--- live.orig/liveMedia/ServerMediaSession.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/liveMedia/ServerMediaSession.cpp 2010-10-20 12:34:04.772177998 +0200
@@ -185,7 +185,8 @@
char* ServerMediaSession::generateSDPDescription() {
struct in_addr ipAddress;
@@ -251,9 +237,9 @@
return sdp;
}
-diff -ru live.orig//liveMedia/SIPClient.cpp live//liveMedia/SIPClient.cpp
---- live.orig//liveMedia/SIPClient.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//liveMedia/SIPClient.cpp 2010-04-17 19:47:42.000000000 +0300
+diff -ru live.orig/liveMedia/SIPClient.cpp live/liveMedia/SIPClient.cpp
+--- live.orig/liveMedia/SIPClient.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/liveMedia/SIPClient.cpp 2010-10-20 12:34:04.772177998 +0200
@@ -60,13 +60,14 @@
struct in_addr ourAddress;
@@ -280,9 +266,9 @@
<< fOurPortNum << ": "
<< env.getResultMsg() << "\n";
}
-diff -ru live.orig//testProgs/sapWatch.cpp live//testProgs/sapWatch.cpp
---- live.orig//testProgs/sapWatch.cpp 2010-04-09 22:27:39.000000000 +0300
-+++ live//testProgs/sapWatch.cpp 2010-04-17 19:51:29.000000000 +0300
+diff -ru live.orig/testProgs/sapWatch.cpp live/testProgs/sapWatch.cpp
+--- live.orig/testProgs/sapWatch.cpp 2010-10-20 10:31:13.000000000 +0200
++++ live/testProgs/sapWatch.cpp 2010-10-20 12:34:04.772177998 +0200
@@ -49,13 +49,14 @@
struct sockaddr_in fromAddress;
while (inputGroupsock.handleRead(packet, maxPacketSize,
live-uselocale.patch:
live/liveMedia/Locale.cpp | 13 ++++++-------
live/liveMedia/RTSPCommon.cpp | 2 +-
live/liveMedia/include/Locale.hh | 17 ++++++++++-------
liveMedia/RTSPClient.cpp | 8 ++++----
4 files changed, 21 insertions(+), 19 deletions(-)
Index: live-uselocale.patch
===================================================================
RCS file: /cvs/free/rpms/live555/devel/live-uselocale.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- live-uselocale.patch 1 May 2010 15:16:55 -0000 1.1
+++ live-uselocale.patch 24 Jan 2011 22:16:07 -0000 1.2
@@ -66,9 +66,8 @@
}
#endif
}
-diff -urN live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
---- live.orig/liveMedia/RTSPClient.cpp 2009-03-23 01:26:16 +0300
-+++ live/liveMedia/RTSPClient.cpp 2009-03-26 19:29:38 +0300
+--- live.orig/liveMedia/RTSPClient.cpp 2010-03-16 03:09:46.000000000 +0100
++++ live/liveMedia/RTSPClient.cpp 2010-08-24 15:04:31.000000000 +0200
@@ -1019,7 +1019,7 @@
// This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
@@ -92,24 +91,25 @@
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
-@@ -2342,7 +2342,7 @@
- if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
- line += 7;
+--- live/liveMedia/RTSPClient.cpp 2010-08-24 17:05:46.000000000 +0200
++++ live.new/liveMedia/RTSPClient.cpp 2010-08-24 17:04:50.000000000 +0200
+@@ -935,7 +935,7 @@
+ }
+ Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
- return sscanf(line, "%f", &scale) == 1;
+ return sscanf(paramStr, "%f", &scale) == 1;
}
-diff -urN live.orig/liveMedia/RTSPCommon.cpp live/liveMedia/RTSPCommon.cpp
---- live.orig/liveMedia/RTSPCommon.cpp 2009-03-23 01:26:16 +0300
-+++ live/liveMedia/RTSPCommon.cpp 2009-03-26 19:23:25 +0300
-@@ -146,7 +146,7 @@
- char const* fields = buf + 7;
- while (*fields == ' ') ++fields;
+--- live/liveMedia/RTSPCommon.cpp.orig 2011-01-06 01:26:50.000000000 +0100
++++ live/liveMedia/RTSPCommon.cpp 2011-01-09 16:32:24.142645155 +0100
+@@ -137,7 +137,7 @@
+ Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
double start, end;
+ int numCharsMatched = 0;
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
- if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
+ if (sscanf(paramStr, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start;
rangeEnd = end;
Index: live555.spec
===================================================================
RCS file: /cvs/free/rpms/live555/devel/live555.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- live555.spec 1 May 2010 15:16:55 -0000 1.10
+++ live555.spec 24 Jan 2011 22:16:07 -0000 1.11
@@ -1,9 +1,9 @@
-%global date 2010.04.09
+%global date 2011.01.24
%global live_soversion 0
Name: live555
Version: 0
-Release: 0.27.%{date}%{?dist}
+Release: 0.29.%{date}%{?dist}
Summary: Live555.com streaming libraries
Group: System Environment/Libraries
@@ -17,6 +17,11 @@
Patch3: live-uselocale.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: live555%{_isa} = %{date}
+# Packages using live555 must Requires this:
+#{?live555date:Requires: live555%{_isa} = %{live555date}}
+
+
%description
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
@@ -140,6 +145,15 @@
done
popd
+#RPM Macros support
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.live555 << EOF
+# live555 RPM Macros
+%live555date %{date}
+EOF
+touch -r COPYING $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.live555
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -161,6 +175,7 @@
%files devel
%defattr(-,root,root,-)
%doc COPYING README
+%config %{_sysconfdir}/rpm/macros.live555
%{_libdir}/libBasicUsageEnvironment.so
%{_libdir}/libgroupsock.so
%{_libdir}/libliveMedia.so
@@ -178,6 +193,13 @@
%{_libdir}/libUsageEnvironment*.a
%changelog
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0-0.29.2011.01.24
+- Update to 2011.01.24
+- Update live555 patches from Rémi.
+
+* Tue Jun 22 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0-0.28.2010.06.22
+- Update to 2010.06.22
+
* Sat May 1 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0-0.27.2010.04.09
- Update to 2010.04.09
- Add patches from Rémi Denis-Courmont - provided as GPLv2+
Index: sources
===================================================================
RCS file: /cvs/free/rpms/live555/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 1 May 2010 17:42:47 -0000 1.9
+++ sources 24 Jan 2011 22:16:07 -0000 1.10
@@ -1 +1 @@
-7f56f54c1c4697764c6e88282e353e81 live.2010.04.09.tar.gz
+0626e80c774fb27c651c3daf6cc3fb91 live.2011.01.24.tar.gz
13 years, 3 months
rpms/nvidia-kmod/F-13 nvidia-kmod.spec, 1.89, 1.90 sources, 1.24, 1.25 .cvsignore, 1.24, 1.25
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24905
Modified Files:
nvidia-kmod.spec sources .cvsignore
Log Message:
Update to 260.19.36
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/nvidia-kmod.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- nvidia-kmod.spec 17 Dec 2010 09:06:09 -0000 1.89
+++ nvidia-kmod.spec 23 Jan 2011 21:48:00 -0000 1.90
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 260.19.29
+Version: 260.19.36
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -86,8 +86,8 @@
%changelog
-* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:260.19.29-1.1
-- rebuild for updated kernel
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.36-1
+- Update to 260.19.36
* Tue Dec 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.29-1
- Update to 260.19.29
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 15 Dec 2010 11:05:34 -0000 1.24
+++ sources 23 Jan 2011 21:48:00 -0000 1.25
@@ -1 +1 @@
-33c3562db996879b3bc2e5818d679021 nvidia-kmod-data-260.19.29.tar.bz2
+4c24281fd34f00259cc817f952347369 nvidia-kmod-data-260.19.36.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 15 Dec 2010 11:05:34 -0000 1.24
+++ .cvsignore 23 Jan 2011 21:48:00 -0000 1.25
@@ -1 +1 @@
-nvidia-kmod-data-260.19.29.tar.bz2
+nvidia-kmod-data-260.19.36.tar.bz2
13 years, 3 months
rpms/xorg-x11-drv-nvidia/F-13 sources, 1.24, 1.25 .cvsignore, 1.24, 1.25 xorg-x11-drv-nvidia.spec, 1.52, 1.53
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24254
Modified Files:
sources .cvsignore xorg-x11-drv-nvidia.spec
Log Message:
Update to 260.19.36
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 15 Dec 2010 11:04:34 -0000 1.24
+++ sources 23 Jan 2011 21:45:49 -0000 1.25
@@ -1,2 +1,2 @@
-0539f7af29e19971745811e971b074f8 NVIDIA-Linux-x86_64-260.19.29.run
-e982a05a85c68130acfe1d48086250e3 NVIDIA-Linux-x86-260.19.29.run
+2826484d87827351774449382e45c4a9 NVIDIA-Linux-x86-260.19.36.run
+88376a73c8ba487526a6f62ac82c7c75 NVIDIA-Linux-x86_64-260.19.36.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 15 Dec 2010 11:04:34 -0000 1.24
+++ .cvsignore 23 Jan 2011 21:45:49 -0000 1.25
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-260.19.29.run
-NVIDIA-Linux-x86-260.19.29.run
+NVIDIA-Linux-x86-260.19.36.run
+NVIDIA-Linux-x86_64-260.19.36.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-drv-nvidia.spec 17 Dec 2010 13:48:36 -0000 1.52
+++ xorg-x11-drv-nvidia.spec 23 Jan 2011 21:45:49 -0000 1.53
@@ -8,8 +8,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 260.19.29
-Release: 2%{?dist}
+Version: 260.19.36
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -232,8 +232,7 @@
rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so
# Remove execstack needs on F-12 and laters
-#if 0%{?fedora} >= 12 || 0%{?rhel} > 5
-%if 0
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
%ifarch x86_64
execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
@@ -256,12 +255,6 @@
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
fi
fi || :
-if [ -x /usr/sbin/setsebool ] ; then
- SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
- if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
- /usr/sbin/setsebool -P allow_execstack on &>/dev/null
- fi
-fi ||:
%post libs -p /sbin/ldconfig
@@ -334,6 +327,12 @@
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.36-1
+- Update to 260.19.36
+- Restore execstack -c on redistributed binaries
+ instead of forcing selinux bool.
+ (nvidia-installer clears it at runtime when appropriate).
+
* Fri Dec 17 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.29-2
- Fix uninstall on kvarriant - rfbz#1559
13 years, 3 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.71,1.72
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22528
Modified Files:
nvidia-kmod.spec
Log Message:
Add akmod
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nvidia-kmod.spec 23 Jan 2011 21:09:48 -0000 1.71
+++ nvidia-kmod.spec 23 Jan 2011 21:32:46 -0000 1.72
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels akmod
+%define buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
13 years, 3 months
rpms/xorg-x11-drv-nvidia/devel 00-ignoreabi.conf, NONE, 1.1 xorg-x11-drv-nvidia.spec, 1.55, 1.56
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21960
Modified Files:
xorg-x11-drv-nvidia.spec
Added Files:
00-ignoreabi.conf
Log Message:
Add support for IgnoreABI
--- NEW FILE 00-ignoreabi.conf ---
Section "ServerFlags"
Option "IgnoreABI" "True"
EndSection
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-drv-nvidia.spec 23 Jan 2011 20:57:01 -0000 1.55
+++ xorg-x11-drv-nvidia.spec 23 Jan 2011 21:29:43 -0000 1.56
@@ -1,4 +1,5 @@
-%define nvidialibdir %{_libdir}/nvidia
+%global nvidialibdir %{_libdir}/nvidia
+%global ignoreabi 1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} >= 7
@@ -27,6 +28,7 @@
Source91: filter-requires.sh
# So we don't mess with mesa provides.
Source92: filter-provides.sh
+Source99: 00-ignoreabi.conf
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE91}
%define __find_provides %{SOURCE92}
@@ -246,6 +248,9 @@
sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+%{?_with_ignoreabi:
+install -pm 0644 %{SOURCE99} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+}
%clean
@@ -301,6 +306,9 @@
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%{?_with_ignoreabi:
+%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
+}
%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
@@ -344,6 +352,7 @@
%changelog
* Sun Jan 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.18-1
- Update to 270.18 beta
+- Add support for IgnoreABI xorg option
* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.36-1
- Update to 260.19.36
13 years, 3 months