rpms/mplayer/devel .cvsignore, 1.31, 1.32 mplayer-ffmpeg.patch, 1.8, 1.9 mplayer-nodvdcss.patch, 1.11, 1.12 mplayer-snapshot.sh, 1.14, 1.15 mplayer.spec, 1.66, 1.67 sources, 1.32, 1.33
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21808
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer-nodvdcss.patch
mplayer-snapshot.sh mplayer.spec sources
Log Message:
* Thu Mar 28 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-6.20130329svn
- 20130329 snapshot
- Updated the nodvdcss patch
- Updated the ffmpeg patch
- Dropped em8300-devel BR since the package was retired in Fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 3 Feb 2013 15:38:22 -0000 1.31
+++ .cvsignore 28 Mar 2013 07:59:34 -0000 1.32
@@ -1,2 +1,2 @@
Blue-1.8.tar.bz2
-mplayer-export-2013-01-23.tar.bz2
+mplayer-export-2013-03-29.tar.bz2
mplayer-ffmpeg.patch:
Makefile | 2
configure | 4 -
ffmpeg/libavformat/internal.h | 32 ++++++++++++
ffmpeg/libavutil/x86/asm.h | 110 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 145 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer-ffmpeg.patch 3 Feb 2013 15:38:22 -0000 1.8
+++ mplayer-ffmpeg.patch 28 Mar 2013 07:59:34 -0000 1.9
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2013-01-23/configure.ffmpeg mplayer-export-2013-01-23/configure
---- mplayer-export-2013-01-23/configure.ffmpeg 2013-02-03 16:31:05.861615031 +0100
-+++ mplayer-export-2013-01-23/configure 2013-02-03 16:31:05.871615111 +0100
-@@ -6935,7 +6935,7 @@ elif test "$ffmpeg_so" = auto ; then
+diff -up mplayer-export-2013-03-24/configure.ffmpeg mplayer-export-2013-03-24/configure
+--- mplayer-export-2013-03-24/configure.ffmpeg 2013-03-23 08:28:55.993725707 +0100
++++ mplayer-export-2013-03-24/configure 2013-03-23 08:28:56.003725776 +0100
+@@ -6973,7 +6973,7 @@ elif test "$ffmpeg_so" = auto ; then
inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)
ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil)
header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp &&
@@ -10,7 +10,7 @@
elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then
extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7644,7 +7644,7 @@ if test "$_gui" = yes ; then
+@@ -7682,7 +7682,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
@@ -19,9 +19,9 @@
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2013-01-23/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2013-01-23/ffmpeg/libavformat/internal.h
---- mplayer-export-2013-01-23/ffmpeg/libavformat/internal.h.ffmpeg 2013-02-03 16:31:05.872615119 +0100
-+++ mplayer-export-2013-01-23/ffmpeg/libavformat/internal.h 2013-02-03 16:31:05.872615119 +0100
+diff -up mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h
+--- mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h.ffmpeg 2013-03-23 08:28:56.004725783 +0100
++++ mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h 2013-03-23 08:28:56.004725783 +0100
@@ -0,0 +1,32 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
@@ -55,9 +55,9 @@
+} AVCodecTag;
+
+#endif /* AVFORMAT_INTERNAL_H */
-diff -up mplayer-export-2013-01-23/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2013-01-23/ffmpeg/libavutil/x86/asm.h
---- mplayer-export-2013-01-23/ffmpeg/libavutil/x86/asm.h.ffmpeg 2013-02-03 16:31:05.873615127 +0100
-+++ mplayer-export-2013-01-23/ffmpeg/libavutil/x86/asm.h 2013-02-03 16:31:05.873615127 +0100
+diff -up mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h
+--- mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h.ffmpeg 2013-03-23 08:28:56.005725790 +0100
++++ mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h 2013-03-23 08:28:56.005725790 +0100
@@ -0,0 +1,110 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -169,15 +169,15 @@
+#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a)
+
+#endif /* AVUTIL_X86_ASM_H */
-diff -up mplayer-export-2013-01-23/Makefile.ffmpeg mplayer-export-2013-01-23/Makefile
---- mplayer-export-2013-01-23/Makefile.ffmpeg 2013-02-03 16:31:05.862615039 +0100
-+++ mplayer-export-2013-01-23/Makefile 2013-02-03 16:31:05.874615134 +0100
-@@ -761,7 +761,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
- $(CC) -o $@ $^ $(EXTRALIBS)
-
- codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-- $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
-+ $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg $(CFLAGS) -o $@ $<
+diff -up mplayer-export-2013-03-24/Makefile.ffmpeg mplayer-export-2013-03-24/Makefile
+--- mplayer-export-2013-03-24/Makefile.ffmpeg 2013-03-23 08:28:55.000000000 +0100
++++ mplayer-export-2013-03-24/Makefile 2013-03-23 08:29:01.000760529 +0100
+@@ -773,7 +773,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+ codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
+ codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
+ codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<
++ $(HOST_CC) $(HOSTCFLAGS) $(CFLAGS)-o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@
mplayer-nodvdcss.patch:
Makefile | 7 -------
configure | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer-nodvdcss.patch 3 Feb 2013 15:38:22 -0000 1.11
+++ mplayer-nodvdcss.patch 28 Mar 2013 07:59:34 -0000 1.12
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2013-01-23/configure.nodvdcss mplayer-export-2013-01-23/configure
---- mplayer-export-2013-01-23/configure.nodvdcss 2013-02-02 10:03:58.000000000 +0100
-+++ mplayer-export-2013-01-23/configure 2013-02-03 16:35:16.537604524 +0100
-@@ -780,7 +780,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2013-03-29/configure.nodvdcss mplayer-export-2013-03-29/configure
+--- mplayer-export-2013-03-29/configure.nodvdcss 2013-03-28 08:45:33.000000000 +0100
++++ mplayer-export-2013-03-29/configure 2013-03-28 08:46:54.302523303 +0100
+@@ -741,7 +741,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
@@ -10,34 +10,34 @@
_xanim=auto
_real=auto
_live=auto
-diff -up mplayer-export-2013-01-23/Makefile.nodvdcss mplayer-export-2013-01-23/Makefile
---- mplayer-export-2013-01-23/Makefile.nodvdcss 2013-02-03 16:35:16.533604493 +0100
-+++ mplayer-export-2013-01-23/Makefile 2013-02-03 16:35:16.537604524 +0100
+diff -up mplayer-export-2013-03-29/Makefile.nodvdcss mplayer-export-2013-03-29/Makefile
+--- mplayer-export-2013-03-29/Makefile.nodvdcss 2013-03-28 08:46:54.300523311 +0100
++++ mplayer-export-2013-03-29/Makefile 2013-03-28 08:48:09.386242474 +0100
@@ -124,11 +124,6 @@ SRCS_COMMON-$(LIBDCA) +=
- SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
- libmpcodecs/vd_libdv.c \
+ SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
+ libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
--SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
-- libdvdcss/device.c \
-- libdvdcss/error.c \
-- libdvdcss/ioctl.c \
-- libdvdcss/libdvdcss.c \
+-SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
+- libdvdcss/device.c \
+- libdvdcss/error.c \
+- libdvdcss/ioctl.c \
+- libdvdcss/libdvdcss.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
-@@ -720,7 +715,6 @@ DIRS = . \
+@@ -730,7 +725,6 @@ DIRS = . \
- ALL_DIRS = $(DIRS) \
- libass \
-- libdvdcss \
- libdvdnav \
- libdvdnav/vm \
- libdvdread4 \
-@@ -847,7 +841,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma
+ ALL_DIRS = $(DIRS) \
+ libass \
+- libdvdcss \
+ libdvdnav \
+ libdvdnav/vm \
+ libdvdread4 \
+@@ -859,7 +853,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma
gui/%: CFLAGS += -Wno-strict-prototypes
--libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.12\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
- libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
- libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
+-libdvdcss/%: CFLAGS := $(CFLAGS_LIBDVDCSS) $(CFLAGS)
+ libdvdnav/%: CFLAGS := -Ilibdvdnav -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
+ libdvdread4/%: CFLAGS := -Ilibdvdread4 $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mplayer-snapshot.sh 3 Feb 2013 15:38:22 -0000 1.14
+++ mplayer-snapshot.sh 28 Mar 2013 07:59:34 -0000 1.15
@@ -13,7 +13,7 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2013-01-23
+svn=2013-03-29
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- mplayer.spec 3 Feb 2013 15:38:22 -0000 1.66
+++ mplayer.spec 28 Mar 2013 07:59:35 -0000 1.67
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20130123svn
+%define pre 20130329svn
%define svn 1
-%define svnbuild 2013-01-23
+%define svnbuild 2013-03-29
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.1
-Release: 5.%{?pre}%{?dist}
+Release: 6.%{?pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -38,7 +38,6 @@
BuildRequires: bzip2-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
-BuildRequires: em8300-devel
BuildRequires: enca-devel
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: ffmpeg-devel >= 0.10
@@ -381,6 +380,12 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Thu Mar 28 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-6.20130329svn
+- 20130329 snapshot
+- Updated the nodvdcss patch
+- Updated the ffmpeg patch
+- Dropped em8300-devel BR since the package was retired in Fedora
+
* Sun Feb 03 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-5.20130123svn
- 20130123 snapshot
- Updated the nodvdcss patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 3 Feb 2013 15:38:22 -0000 1.32
+++ sources 28 Mar 2013 07:59:35 -0000 1.33
@@ -1,2 +1,2 @@
340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
-0d068b037182c3bba25f048d33274607 mplayer-export-2013-01-23.tar.bz2
+06c3dcdb5df5715871f1798698f422c4 mplayer-export-2013-03-29.tar.bz2
11 years, 1 month
rpms/faad2/devel faad2.spec,1.8,1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/faad2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2970/devel
Modified Files:
faad2.spec
Log Message:
Fix hack2
Index: faad2.spec
===================================================================
RCS file: /cvs/free/rpms/faad2/devel/faad2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- faad2.spec 27 Mar 2013 11:20:05 -0000 1.8
+++ faad2.spec 27 Mar 2013 11:21:49 -0000 1.9
@@ -115,7 +115,7 @@
%files devel
%defattr(-, root, root, -)
-%doc TODO docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf
+%doc TODO docs/Ahead?AAC?Decoder?library?documentation.pdf
%{_includedir}/faad.h
%{_includedir}/neaacdec.h
%{_libdir}/libfaad.so
11 years, 1 month
rpms/faad2/F-19 faad2.spec,1.8,1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/faad2/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2970/F-19
Modified Files:
faad2.spec
Log Message:
Fix hack2
Index: faad2.spec
===================================================================
RCS file: /cvs/free/rpms/faad2/F-19/faad2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- faad2.spec 27 Mar 2013 11:20:05 -0000 1.8
+++ faad2.spec 27 Mar 2013 11:21:49 -0000 1.9
@@ -115,7 +115,7 @@
%files devel
%defattr(-, root, root, -)
-%doc TODO docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf
+%doc TODO docs/Ahead?AAC?Decoder?library?documentation.pdf
%{_includedir}/faad.h
%{_includedir}/neaacdec.h
%{_libdir}/libfaad.so
11 years, 1 month
rpms/faad2/devel faad2.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/faad2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2408/devel
Modified Files:
faad2.spec
Log Message:
Fix hack
Index: faad2.spec
===================================================================
RCS file: /cvs/free/rpms/faad2/devel/faad2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- faad2.spec 3 Mar 2013 21:36:43 -0000 1.7
+++ faad2.spec 27 Mar 2013 11:20:05 -0000 1.8
@@ -12,7 +12,7 @@
Name: faad2
Epoch: 1
Version: 2.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.audiocoding.com/faad2.html
@@ -127,6 +127,9 @@
%{xmmsinputplugindir}/libmp4.so
%changelog
+* Wed Mar 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.7-4
+- Change the escaping space hack - rhbz#928110
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.7-3
- Mass rebuilt for Fedora 19 Features
11 years, 1 month
rpms/faad2/F-19 faad2.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/faad2/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2408/F-19
Modified Files:
faad2.spec
Log Message:
Fix hack
Index: faad2.spec
===================================================================
RCS file: /cvs/free/rpms/faad2/F-19/faad2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- faad2.spec 3 Mar 2013 21:36:43 -0000 1.7
+++ faad2.spec 27 Mar 2013 11:20:05 -0000 1.8
@@ -12,7 +12,7 @@
Name: faad2
Epoch: 1
Version: 2.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.audiocoding.com/faad2.html
@@ -127,6 +127,9 @@
%{xmmsinputplugindir}/libmp4.so
%changelog
+* Wed Mar 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.7-4
+- Change the escaping space hack - rhbz#928110
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.7-3
- Mass rebuilt for Fedora 19 Features
11 years, 1 month
rpms/nvidia-settings/devel .cvsignore, 1.25, 1.26 nvidia-settings.spec, 1.28, 1.29 sources, 1.25, 1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14322/devel
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
Update to devel
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 16 Jan 2013 14:25:31 -0000 1.25
+++ .cvsignore 26 Mar 2013 21:49:04 -0000 1.26
@@ -1 +1 @@
-nvidia-settings-313.18.tar.bz2
+nvidia-settings-313.26.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nvidia-settings.spec 16 Jan 2013 14:25:31 -0000 1.28
+++ nvidia-settings.spec 26 Mar 2013 21:49:04 -0000 1.29
@@ -1,15 +1,13 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 313.18
-#Possible replacement/complement:
-#http://willem.engen.nl/projects/disper/
-
-%global _default_patch_fuzz 2
+%global nversion 313.26
+%global npriority $(echo %{nversion} | cut -f 1 -d ".")
+%global nserie current
Name: nvidia-settings
Version: 1.0
-Release: 29%{?dist}
+Release: 30%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -17,7 +15,6 @@
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se...
Patch0: nvidia-settings-256.35-validate.patch
-Patch1: 03_do_not_exit_on_no_scanout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -36,11 +33,16 @@
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
-#Needed for FBConfig table
-BuildRequires: xorg-x11-drv-nvidia-devel
-BuildRequires: mesa-libGL-devel
+#Needed for FBConfig table - Uneeded if GLX_VERSION_1_3
+#BuildRequires: xorg-x11-drv-nvidia-devel
+BuildRequires: mesa-libGL-devel
+
+Requires: nvidia-settings-desktop
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
-Provides: %{name}-nversion = %{nversion}
+Provides: nvidia-settings-nversion = %{nversion}
+Provides: nvidia-304xx-settings = %{nversion}
@@ -52,10 +54,17 @@
This communication is done with the NV-CONTROL X extension.
nvidia-settings is compatible with driver up to %{nversion}.
+%package desktop
+Summary: Desktop file for %{name}
+Group: Applications/System
+
+%description desktop
+This package provides the desktop file of the %{name} package.
+
+
%prep
%setup -q -n nvidia-settings-%{nversion}
%patch0 -p1 -b .validate
-%patch1 -p1 -b .noscanout
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk
@@ -63,6 +72,7 @@
%build
# no job control
+export CFLAGS="$RPM_OPT_FLAGS"
pushd src/libXNVCtrl
make
popd
@@ -72,8 +82,6 @@
X_LDFLAGS="-L%{_libdir}" \
CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || :
-make -C samples
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,20 +94,53 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
doc/nvidia-settings.desktop
+#Move the binary elsewhere
+mv $RPM_BUILD_ROOT%{_bindir}/nvidia-settings \
+ $RPM_BUILD_ROOT%{_bindir}/nvidia-settings-%{nserie}
+touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/nvidia-settings*
+
+#Move the manpage elsewhere
+mv $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz \
+ $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
+touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings*
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%{_sbindir}/alternatives \
+ --install %{_bindir}/nvidia-settings nvidia-settings %{_bindir}/nvidia-settings-%{nserie} %{npriority} \
+ --slave %{_mandir}/man1/nvidia-settings.1.gz nvidia-settings.1.gz %{_mandir}/man1/nvidia-settings-%{nserie}.1.gz || :
+
+%postun
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/alternatives --remove nvidia-settings %{_bindir}/%{name}-%{nserie}
+fi || :
%files
%defattr(-,root,root,-)
%doc doc/*.txt
-%{_bindir}/nvidia-settings
-%{_datadir}/applications/*nvidia-settings.desktop
-%{_mandir}/man1/nvidia-settings.1.gz
+%ghost %{_bindir}/nvidia-settings
+%{_bindir}/nvidia-settings-%{nserie}
+%ghost %{_mandir}/man1/nvidia-settings.1.gz
+%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
+%files desktop
+%defattr(-,root,root,-)
+%{_datadir}/applications/*nvidia-settings.desktop
%changelog
+* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-30
+- Update to 313.26
+- Add Alternatives support
+- Drop patch needed for older 173xx/96xx series.
+ Thoses will use nvidia-settings-legacy instead
+- Build libXNVCtrl with our %%optflags
+- Split the desktop file in a sub-package
+
* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-29
- Update to 313.18
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 16 Jan 2013 14:25:31 -0000 1.25
+++ sources 26 Mar 2013 21:49:04 -0000 1.26
@@ -1 +1 @@
-8d2cf904aa612e7027d56669a68f5cb6 nvidia-settings-313.18.tar.bz2
+fe4b30e2d807e3d869db4881cd38f19a nvidia-settings-313.26.tar.bz2
11 years, 1 month
rpms/nvidia-settings/F-19 .cvsignore, 1.25, 1.26 nvidia-settings.spec, 1.28, 1.29 sources, 1.25, 1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14164/F-19
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
Update to new packaging scheme
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 16 Jan 2013 14:25:31 -0000 1.25
+++ .cvsignore 26 Mar 2013 21:48:12 -0000 1.26
@@ -1 +1 @@
-nvidia-settings-313.18.tar.bz2
+nvidia-settings-313.26.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/nvidia-settings.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nvidia-settings.spec 16 Jan 2013 14:25:31 -0000 1.28
+++ nvidia-settings.spec 26 Mar 2013 21:48:12 -0000 1.29
@@ -1,15 +1,13 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 313.18
-#Possible replacement/complement:
-#http://willem.engen.nl/projects/disper/
-
-%global _default_patch_fuzz 2
+%global nversion 313.26
+%global npriority $(echo %{nversion} | cut -f 1 -d ".")
+%global nserie current
Name: nvidia-settings
Version: 1.0
-Release: 29%{?dist}
+Release: 30%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -17,7 +15,6 @@
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se...
Patch0: nvidia-settings-256.35-validate.patch
-Patch1: 03_do_not_exit_on_no_scanout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -36,11 +33,16 @@
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
-#Needed for FBConfig table
-BuildRequires: xorg-x11-drv-nvidia-devel
-BuildRequires: mesa-libGL-devel
+#Needed for FBConfig table - Uneeded if GLX_VERSION_1_3
+#BuildRequires: xorg-x11-drv-nvidia-devel
+BuildRequires: mesa-libGL-devel
+
+Requires: nvidia-settings-desktop
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): %{_sbindir}/alternatives
-Provides: %{name}-nversion = %{nversion}
+Provides: nvidia-settings-nversion = %{nversion}
+Provides: nvidia-304xx-settings = %{nversion}
@@ -52,10 +54,17 @@
This communication is done with the NV-CONTROL X extension.
nvidia-settings is compatible with driver up to %{nversion}.
+%package desktop
+Summary: Desktop file for %{name}
+Group: Applications/System
+
+%description desktop
+This package provides the desktop file of the %{name} package.
+
+
%prep
%setup -q -n nvidia-settings-%{nversion}
%patch0 -p1 -b .validate
-%patch1 -p1 -b .noscanout
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk
@@ -63,6 +72,7 @@
%build
# no job control
+export CFLAGS="$RPM_OPT_FLAGS"
pushd src/libXNVCtrl
make
popd
@@ -72,8 +82,6 @@
X_LDFLAGS="-L%{_libdir}" \
CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || :
-make -C samples
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,20 +94,53 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
doc/nvidia-settings.desktop
+#Move the binary elsewhere
+mv $RPM_BUILD_ROOT%{_bindir}/nvidia-settings \
+ $RPM_BUILD_ROOT%{_bindir}/nvidia-settings-%{nserie}
+touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/nvidia-settings*
+
+#Move the manpage elsewhere
+mv $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz \
+ $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
+touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings*
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%{_sbindir}/alternatives \
+ --install %{_bindir}/nvidia-settings nvidia-settings %{_bindir}/nvidia-settings-%{nserie} %{npriority} \
+ --slave %{_mandir}/man1/nvidia-settings.1.gz nvidia-settings.1.gz %{_mandir}/man1/nvidia-settings-%{nserie}.1.gz || :
+
+%postun
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/alternatives --remove nvidia-settings %{_bindir}/%{name}-%{nserie}
+fi || :
%files
%defattr(-,root,root,-)
%doc doc/*.txt
-%{_bindir}/nvidia-settings
-%{_datadir}/applications/*nvidia-settings.desktop
-%{_mandir}/man1/nvidia-settings.1.gz
+%ghost %{_bindir}/nvidia-settings
+%{_bindir}/nvidia-settings-%{nserie}
+%ghost %{_mandir}/man1/nvidia-settings.1.gz
+%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
+%files desktop
+%defattr(-,root,root,-)
+%{_datadir}/applications/*nvidia-settings.desktop
%changelog
+* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-30
+- Update to 313.26
+- Add Alternatives support
+- Drop patch needed for older 173xx/96xx series.
+ Thoses will use nvidia-settings-legacy instead
+- Build libXNVCtrl with our %%optflags
+- Split the desktop file in a sub-package
+
* Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-29
- Update to 313.18
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 16 Jan 2013 14:25:31 -0000 1.25
+++ sources 26 Mar 2013 21:48:12 -0000 1.26
@@ -1 +1 @@
-8d2cf904aa612e7027d56669a68f5cb6 nvidia-settings-313.18.tar.bz2
+fe4b30e2d807e3d869db4881cd38f19a nvidia-settings-313.26.tar.bz2
11 years, 1 month
rpms/vlc/devel vlc-backport-dvb58.patch,1.1,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4261/devel
Removed Files:
vlc-backport-dvb58.patch
Log Message:
Remove unused patch
--- vlc-backport-dvb58.patch DELETED ---
11 years, 1 month
rpms/vlc/devel vlc.spec,1.173,1.174
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4080/devel
Modified Files:
vlc.spec
Log Message:
Rebuilt for libmatroska
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- vlc.spec 23 Feb 2013 16:25:55 -0000 1.173
+++ vlc.spec 26 Mar 2013 20:54:03 -0000 1.174
@@ -31,7 +31,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -343,6 +343,11 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Workaround config file provided in %%{_datadir}
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2726
+mv $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/.hosts \
+ $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/hosts-sample
+
%find_lang %{name}
@@ -519,6 +524,10 @@
%changelog
+* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-6
+- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid
+ config file - https://bugzilla.rpmfusion.org/2726
+
* Sat Feb 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-5
- Fix samba4 detection rfbz#2659
11 years, 1 month
rpms/vlc/F-19 vlc.spec,1.173,1.174 vlc-backport-dvb58.patch,1.1,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3877/F-19
Modified Files:
vlc.spec
Removed Files:
vlc-backport-dvb58.patch
Log Message:
Fix and rebuilt for libmatroska
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-19/vlc.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- vlc.spec 23 Feb 2013 16:25:55 -0000 1.173
+++ vlc.spec 26 Mar 2013 20:52:12 -0000 1.174
@@ -31,7 +31,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -343,6 +343,11 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Workaround config file provided in %%{_datadir}
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2726
+mv $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/.hosts \
+ $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/hosts-sample
+
%find_lang %{name}
@@ -519,6 +524,10 @@
%changelog
+* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-6
+- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid
+ config file - https://bugzilla.rpmfusion.org/2726
+
* Sat Feb 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-5
- Fix samba4 detection rfbz#2659
--- vlc-backport-dvb58.patch DELETED ---
11 years, 1 month