rpms/mock-rpmfusion-free/F-10 sources, 1.3, 1.4 mock-rpmfusion-free.spec, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mock-rpmfusion-free/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19772
Modified Files:
sources mock-rpmfusion-free.spec
Log Message:
Branch for F-11
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mock-rpmfusion-free/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Mar 2009 14:43:25 -0000 1.3
+++ sources 12 May 2009 15:33:22 -0000 1.4
@@ -1 +1 @@
-92872540eac2d50ba40216018dc111e2 mock-rpmfusion-free-10.1.tar.bz2
+f95006d39c931a54fc726572b9b0db47 mock-rpmfusion-free-11.0.tar.bz2
Index: mock-rpmfusion-free.spec
===================================================================
RCS file: /cvs/free/rpms/mock-rpmfusion-free/F-10/mock-rpmfusion-free.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mock-rpmfusion-free.spec 5 Mar 2009 14:43:25 -0000 1.2
+++ mock-rpmfusion-free.spec 12 May 2009 15:33:22 -0000 1.3
@@ -1,5 +1,5 @@
Name: mock-rpmfusion-free
-Version: 10.1
+Version: 11.0
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion Free Repository
@@ -40,6 +40,9 @@
%changelog
+* Tue May 12 2009 kwizart < kwizart at gmail.com > - 11.0-1
+- Branch for F-11
+
* Wed Mar 4 2009 kwizart < kwizart at gmail.com > - 10.1-1
- Update to 10.1
- Fix Rawhide dist to .f11
15 years, 6 months
rpms/mock-rpmfusion-free/devel mock-rpmfusion-free.spec, 1.3, 1.4 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mock-rpmfusion-free/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19353
Modified Files:
mock-rpmfusion-free.spec sources .cvsignore
Log Message:
Branch for F-11
Index: mock-rpmfusion-free.spec
===================================================================
RCS file: /cvs/free/rpms/mock-rpmfusion-free/devel/mock-rpmfusion-free.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mock-rpmfusion-free.spec 29 Mar 2009 13:46:02 -0000 1.3
+++ mock-rpmfusion-free.spec 12 May 2009 15:32:19 -0000 1.4
@@ -1,6 +1,6 @@
Name: mock-rpmfusion-free
-Version: 10.1
-Release: 2%{?dist}
+Version: 11.0
+Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion Free Repository
Group: Development/Tools
@@ -40,8 +40,8 @@
%changelog
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.1-2
-- rebuild for new F11 features
+* Tue May 12 2009 kwizart < kwizart at gmail.com > - 11.0-1
+- Branch for F-11
* Wed Mar 4 2009 kwizart < kwizart at gmail.com > - 10.1-1
- Update to 10.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mock-rpmfusion-free/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Mar 2009 14:41:33 -0000 1.3
+++ sources 12 May 2009 15:32:19 -0000 1.4
@@ -1 +1 @@
-92872540eac2d50ba40216018dc111e2 mock-rpmfusion-free-10.1.tar.bz2
+f95006d39c931a54fc726572b9b0db47 mock-rpmfusion-free-11.0.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mock-rpmfusion-free/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Mar 2009 14:42:13 -0000 1.3
+++ .cvsignore 12 May 2009 15:32:19 -0000 1.4
@@ -1 +1 @@
-mock-rpmfusion-free-10.1.tar.bz2
+mock-rpmfusion-free-11.0.tar.bz2
15 years, 6 months
rpms/mock-rpmfusion-nonfree/F-10 mock-rpmfusion-nonfree.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19176/F-10
Modified Files:
mock-rpmfusion-nonfree.spec sources
Log Message:
Branch for F-11
Index: mock-rpmfusion-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-10/mock-rpmfusion-nonfree.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mock-rpmfusion-nonfree.spec 5 Mar 2009 14:48:42 -0000 1.2
+++ mock-rpmfusion-nonfree.spec 12 May 2009 15:30:37 -0000 1.3
@@ -1,5 +1,5 @@
Name: mock-rpmfusion-nonfree
-Version: 10.1
+Version: 11.0
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion NonFree Repository
@@ -40,6 +40,9 @@
%changelog
+* Tue May 12 2009 kwizart < kwizart at gmail.com > - 11.0-1
+- Branch for F-11
+
* Wed Mar 4 2009 kwizart < kwizart at gmail.com > - 10.1-1
- Update to 10.1
- Fix Rawhide dist to .f11
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Mar 2009 14:48:42 -0000 1.3
+++ sources 12 May 2009 15:30:37 -0000 1.4
@@ -1 +1 @@
-f6871923e501d7aaf38da3b235b711c5 mock-rpmfusion-nonfree-10.1.tar.bz2
+3114c527eb3ddb9325883f51bd77d823 mock-rpmfusion-nonfree-11.0.tar.bz2
15 years, 6 months
rpms/mock-rpmfusion-nonfree/devel sources, 1.3, 1.4 mock-rpmfusion-nonfree.spec, 1.3, 1.4 .cvsignore, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19035
Modified Files:
sources mock-rpmfusion-nonfree.spec .cvsignore
Log Message:
Branch for F-11
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Mar 2009 14:48:15 -0000 1.3
+++ sources 12 May 2009 15:29:46 -0000 1.4
@@ -1 +1 @@
-f6871923e501d7aaf38da3b235b711c5 mock-rpmfusion-nonfree-10.1.tar.bz2
+3114c527eb3ddb9325883f51bd77d823 mock-rpmfusion-nonfree-11.0.tar.bz2
Index: mock-rpmfusion-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel/mock-rpmfusion-nonfree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mock-rpmfusion-nonfree.spec 29 Mar 2009 15:01:38 -0000 1.3
+++ mock-rpmfusion-nonfree.spec 12 May 2009 15:29:46 -0000 1.4
@@ -1,6 +1,6 @@
Name: mock-rpmfusion-nonfree
-Version: 10.1
-Release: 2%{?dist}
+Version: 11.0
+Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion NonFree Repository
Group: Development/Tools
@@ -40,8 +40,8 @@
%changelog
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.1-2
-- rebuild for new F11 features
+* Tue May 12 2009 kwizart < kwizart at gmail.com > - 11.0-1
+- Branch for F-11
* Wed Mar 4 2009 kwizart < kwizart at gmail.com > - 10.1-1
- Update to 10.1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Mar 2009 14:48:15 -0000 1.3
+++ .cvsignore 12 May 2009 15:29:46 -0000 1.4
@@ -1 +1 @@
-mock-rpmfusion-nonfree-10.1.tar.bz2
+mock-rpmfusion-nonfree-11.0.tar.bz2
15 years, 6 months
rpms/Cg/F-10 .cvsignore,1.2,1.3 Cg.spec,1.1,1.2 sources,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/Cg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16815/F-10
Modified Files:
.cvsignore Cg.spec sources
Log Message:
Update to April2009
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Aug 2008 19:40:37 -0000 1.2
+++ .cvsignore 12 May 2009 15:06:31 -0000 1.3
@@ -1,2 +1,2 @@
-Cg-2.0_May2008_x86_64.tgz
-Cg-2.0_May2008_x86.tgz
+Cg-2.2_April2009_x86.tgz
+Cg-2.2_April2009_x86_64.tgz
Index: Cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/Cg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cg.spec 4 Aug 2008 19:40:37 -0000 1.1
+++ Cg.spec 12 May 2009 15:06:31 -0000 1.2
@@ -1,9 +1,11 @@
-%define maj_version 2.0
-%define min_version 0015
-%define date May2008
+%define maj_version 2.2
+%define min_version 0006
+%define date April2009
# No debuginfo
%define debug_package %{nil}
+# Disable strip
+%define __strip /bin/true
%ifarch x86_64
%define priority 10
@@ -14,16 +16,25 @@
Summary: NVIDIA Cg Toolkit
Name: Cg
Version: %{maj_version}.%{min_version}
-Release: 2
+Release: 1%{?dist}
URL: http://developer.nvidia.com/object/cg_toolkit.html
Group: Development/Languages
-Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
-Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
-License: Redistributable, no modification permitted
+Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
+Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
+License: Redistributable, no modification permitted and MIT
+%if 0%{?fedora} >= 11
+ExclusiveArch: i586 x86_64
+%else
ExclusiveArch: i386 x86_64
+%endif
Requires: lib%{name}(%{_target_cpu}) = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: freeglut-devel
+BuildRequires: glew-devel >= 1.5.1
+BuildRequires: libXi-devel
+BuildRequires: libXmu-devel
+
Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
@@ -35,6 +46,8 @@
20 different OpenGL and DirectX profile targets, Cg will allow you to
incorporate stunning interactive effects into your 3D applications.
+This is the %{date} release
+
%package docs
Summary: NVIDIA Cg Toolkit documentation
Group: Documentation
@@ -51,22 +64,34 @@
This package contains Cg shared support library.
%prep
-%ifarch i386
+%ifarch %{ix86}
%setup -q -c %{name}-%{version}
%endif
%ifarch x86_64
%setup -q -c %{name}-%{version} -D -T -a 1
%endif
-# Tweak to have debuginfo - part 2/2
-%if "%fedora" > "7"
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
+#Remove binary bundled tools
+rm usr/bin/{cginfo,cgfxcat}
+
%build
# Nothing to build
-echo "Nothing to build"
+echo "Nothing to build,... Well not exactly"
+
+for b in cgfxcat cginfo ; do
+ make -C usr/local/Cg/examples/Tools/${b} clean
+ sed -i -e 's/-DGLEW_STATIC//' usr/local/Cg/examples/Tools/${b}/Makefile
+ sed -i -e 's/-Wall/%{optflags}/' usr/local/Cg/examples/Tools/${b}/Makefile
+ make -C usr/local/Cg/examples/Tools/${b} \
+ GLEW=%{_prefix} \
+ CG_INC_PATH=%{_builddir}/%{buildsubdir}/usr/include \
+ CG_LIB_PATH=%{_builddir}/%{buildsubdir}/%{_libdir}
+ mv usr/local/Cg/examples/Tools/${b}/${b} usr/bin
+ strip usr/bin/${b}
+ make -C usr/local/Cg/examples/Tools/${b} clean
+done
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -81,6 +106,7 @@
# Owernship of the alternative provides
touch $RPM_BUILD_ROOT%{_bindir}/cgc
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,11 +123,15 @@
%postun -n libCg -p /sbin/ldconfig
%files
-%defattr(644,root,root,755)
-%doc usr/local/Cg/docs/Cg_Redist_License.pdf
+%defattr(755,root,root,755)
%ghost %{_bindir}/cgc
-%attr(755,root,root) %{_bindir}/cgc-%{_lib}
+%{_bindir}/cgc-%{_lib}
+%{_bindir}/cgfxcat
+%{_bindir}/cginfo
+%defattr(644,root,root,755)
%{_includedir}/Cg/
+%dir %{_mandir}/manCgFX
+%dir %{_mandir}/manCg
%{_mandir}/man*/*
%files docs
@@ -109,12 +139,22 @@
%doc usr/local/Cg/docs usr/local/Cg/examples usr/local/Cg/include
%files -n libCg
+%defattr(755,root,root,755)
%{_libdir}/*.so
%changelog
-* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.0.0015-2
-- rebuild
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 2.2-1
+- Update to 2.2.0006 (April2009)
+
+* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 2.1.0017-1
+- Update to 2.1.0017 (February2009)
+- Re-introduce disttag
+- Disable strip
+- Fix some conditionnals
+
+* Fri Jan 9 2009 kwizart < kwizart at gmail.com > - 2.1.0016-1
+- Update to 2.1.0016 (November2008)
* Sun May 18 2008 kwizart < kwizart at gmail.com > - 2.0.0015-1
- Update to 2.0.0015 (May2008)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Aug 2008 19:40:37 -0000 1.2
+++ sources 12 May 2009 15:06:31 -0000 1.3
@@ -1,2 +1,2 @@
-f0923e9fe9c0e0f1b1f49e9069c59815 Cg-2.0_May2008_x86_64.tgz
-311069e73186b3a7837d35df08b714c8 Cg-2.0_May2008_x86.tgz
+acb2a5e6b2b05f04be3b37cb758ae002 Cg-2.2_April2009_x86.tgz
+59b487d2d729d34e0696bb967f250409 Cg-2.2_April2009_x86_64.tgz
15 years, 6 months
rpms/Cg/devel .cvsignore,1.4,1.5 Cg.spec,1.5,1.6 sources,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/Cg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16624/devel
Modified Files:
.cvsignore Cg.spec sources
Log Message:
Update to April2009
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Mar 2009 18:14:29 -0000 1.4
+++ .cvsignore 12 May 2009 15:05:38 -0000 1.5
@@ -1,2 +1,2 @@
-Cg-2.1_February2009_x86_64.tgz
-Cg-2.1_February2009_x86.tgz
+Cg-2.2_April2009_x86.tgz
+Cg-2.2_April2009_x86_64.tgz
Index: Cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/Cg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Cg.spec 27 Mar 2009 18:19:31 -0000 1.5
+++ Cg.spec 12 May 2009 15:05:38 -0000 1.6
@@ -1,6 +1,6 @@
-%define maj_version 2.1
-%define min_version 0017
-%define date February2009
+%define maj_version 2.2
+%define min_version 0006
+%define date April2009
# No debuginfo
%define debug_package %{nil}
@@ -19,9 +19,9 @@
Release: 1%{?dist}
URL: http://developer.nvidia.com/object/cg_toolkit.html
Group: Development/Languages
-Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
-Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
-License: Redistributable, no modification permitted
+Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
+Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
+License: Redistributable, no modification permitted and MIT
%if 0%{?fedora} >= 11
ExclusiveArch: i586 x86_64
%else
@@ -30,6 +30,11 @@
Requires: lib%{name}(%{_target_cpu}) = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: freeglut-devel
+BuildRequires: glew-devel >= 1.5.1
+BuildRequires: libXi-devel
+BuildRequires: libXmu-devel
+
Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
@@ -66,10 +71,27 @@
%setup -q -c %{name}-%{version} -D -T -a 1
%endif
+#Remove binary bundled tools
+rm usr/bin/{cginfo,cgfxcat}
+
%build
# Nothing to build
-echo "Nothing to build"
+echo "Nothing to build,... Well not exactly"
+
+for b in cgfxcat cginfo ; do
+ make -C usr/local/Cg/examples/Tools/${b} clean
+ sed -i -e 's/-DGLEW_STATIC//' usr/local/Cg/examples/Tools/${b}/Makefile
+ sed -i -e 's/-Wall/%{optflags}/' usr/local/Cg/examples/Tools/${b}/Makefile
+ make -C usr/local/Cg/examples/Tools/${b} \
+ GLEW=%{_prefix} \
+ CG_INC_PATH=%{_builddir}/%{buildsubdir}/usr/include \
+ CG_LIB_PATH=%{_builddir}/%{buildsubdir}/%{_libdir}
+ mv usr/local/Cg/examples/Tools/${b}/${b} usr/bin
+ strip usr/bin/${b}
+ make -C usr/local/Cg/examples/Tools/${b} clean
+done
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -84,6 +106,7 @@
# Owernship of the alternative provides
touch $RPM_BUILD_ROOT%{_bindir}/cgc
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -100,10 +123,15 @@
%postun -n libCg -p /sbin/ldconfig
%files
-%defattr(644,root,root,755)
+%defattr(755,root,root,755)
%ghost %{_bindir}/cgc
-%attr(755,root,root) %{_bindir}/cgc-%{_lib}
+%{_bindir}/cgc-%{_lib}
+%{_bindir}/cgfxcat
+%{_bindir}/cginfo
+%defattr(644,root,root,755)
%{_includedir}/Cg/
+%dir %{_mandir}/manCgFX
+%dir %{_mandir}/manCg
%{_mandir}/man*/*
%files docs
@@ -111,10 +139,14 @@
%doc usr/local/Cg/docs usr/local/Cg/examples usr/local/Cg/include
%files -n libCg
+%defattr(755,root,root,755)
%{_libdir}/*.so
%changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 2.2-1
+- Update to 2.2.0006 (April2009)
+
* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 2.1.0017-1
- Update to 2.1.0017 (February2009)
- Re-introduce disttag
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Mar 2009 18:14:29 -0000 1.4
+++ sources 12 May 2009 15:05:38 -0000 1.5
@@ -1,2 +1,2 @@
-01a3d1e0936c3f221ede5b6bfd8d2e0c Cg-2.1_February2009_x86_64.tgz
-8752286743ddd9d5997e698714fcc556 Cg-2.1_February2009_x86.tgz
+acb2a5e6b2b05f04be3b37cb758ae002 Cg-2.2_April2009_x86.tgz
+59b487d2d729d34e0696bb967f250409 Cg-2.2_April2009_x86_64.tgz
15 years, 6 months
rpms/Cg/F-9 Cg.spec,NONE,1.1 sources,1.1,1.2 .cvsignore,1.1,1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/Cg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11875
Modified Files:
sources .cvsignore
Added Files:
Cg.spec
Log Message:
Import 2.1 for F-9
-We need to sync Fedora/Cg version nvidia does support
--- NEW FILE Cg.spec ---
%define maj_version 2.1
%define min_version 0017
%define date February2009
# No debuginfo
%define debug_package %{nil}
# Disable strip
%define __strip /bin/true
%ifarch x86_64
%define priority 10
%else
%define priority 5
%endif
Summary: NVIDIA Cg Toolkit
Name: Cg
Version: %{maj_version}.%{min_version}
Release: 1%{?dist}
URL: http://developer.nvidia.com/object/cg_toolkit.html
Group: Development/Languages
Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/%{version}/Cg-%...
License: Redistributable, no modification permitted
%if 0%{?fedora} >= 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
Requires: lib%{name}(%{_target_cpu}) = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
%description
The Cg Toolkit provides a compiler for the Cg language, runtime
libraries for use with both leading graphics APIs, runtime libraries for
CgFX, example applications, and extensive documentation. Supporting over
20 different OpenGL and DirectX profile targets, Cg will allow you to
incorporate stunning interactive effects into your 3D applications.
This is the %{date} release
%package docs
Summary: NVIDIA Cg Toolkit documentation
Group: Documentation
%description docs
NVIDIA Cg Toolkit documentation.
%package -n lib%{name}
Summary: NVIDIA Cg Toolkit shared support library
Group: System Environment/Libraries
Provides: lib%{name}(%{_target_cpu}) = %{version}-%{release}
%description -n lib%{name}
This package contains Cg shared support library.
%prep
%ifarch %{ix86}
%setup -q -c %{name}-%{version}
%endif
%ifarch x86_64
%setup -q -c %{name}-%{version} -D -T -a 1
%endif
%build
# Nothing to build
echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_mandir}}
cp -pr usr/bin/* $RPM_BUILD_ROOT%{_bindir}/
cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir}/
cp -pr .%{_libdir}/* $RPM_BUILD_ROOT%{_libdir}/
cp -pr usr/share/man/* $RPM_BUILD_ROOT%{_mandir}/
mv $RPM_BUILD_ROOT%{_bindir}/cgc $RPM_BUILD_ROOT%{_bindir}/cgc-%{_lib}
# Owernship of the alternative provides
touch $RPM_BUILD_ROOT%{_bindir}/cgc
%clean
rm -rf $RPM_BUILD_ROOT
%post
/usr/sbin/alternatives --install %{_bindir}/cgc cgc %{_bindir}/cgc-%{_lib} %{priority} || :
%preun
if [ $1 -eq 0 ]; then
/usr/sbin/alternatives --remove cgc %{_bindir}/cgc-%{_lib} || :
fi
%post -n libCg -p /sbin/ldconfig
%postun -n libCg -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
%ghost %{_bindir}/cgc
%attr(755,root,root) %{_bindir}/cgc-%{_lib}
%{_includedir}/Cg/
%{_mandir}/man*/*
%files docs
%defattr(644,root,root,755)
%doc usr/local/Cg/docs usr/local/Cg/examples usr/local/Cg/include
%files -n libCg
%{_libdir}/*.so
%changelog
* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 2.1.0017-1
- Update to 2.1.0017 (February2009)
- Re-introduce disttag
- Disable strip
- Fix some conditionnals
* Fri Jan 9 2009 kwizart < kwizart at gmail.com > - 2.1.0016-1
- Update to 2.1.0016 (November2008)
* Sun May 18 2008 kwizart < kwizart at gmail.com > - 2.0.0015-1
- Update to 2.0.0015 (May2008)
- No debuginfo anymore
* Sat May 10 2008 kwizart < kwizart at gmail.com > - 2.0.0012-2
- Ghost to have the owenrship of the alternative provides.
* Sat Feb 16 2008 kwizart < kwizart at gmail.com > - 2.0.0012-1
- Update to Jan2008
- Tweak to have debuginfo
- Add alternatives to choose between cgc x86 or x86_64
* Thu Jan 3 2008 kwizart < kwizart at gmail.com > - 2.0.0010-1
- Update to 2.0.0010 (Dec2007)
* Thu Nov 29 2007 kwizart < kwizart at gmail.com > - 1.5.0023-1
- Update to 1.5.0023 (Sep2007)
* Tue Jul 24 2007 Dominik Mierzejewski <rpm(a)greysector.net> 1.5-1
- updated to 1.5
- split off docs
- call ldconfig for libCg
- per-arch Requires:
* Mon May 22 2006 Dominik Mierzejewski <rpm(a)greysector.net> 1.4.1-1
- initial build
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 May 2008 17:52:27 -0000 1.1
+++ sources 12 May 2009 14:07:16 -0000 1.2
@@ -0,0 +1,2 @@
+8752286743ddd9d5997e698714fcc556 Cg-2.1_February2009_x86.tgz
+01a3d1e0936c3f221ede5b6bfd8d2e0c Cg-2.1_February2009_x86_64.tgz
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 May 2008 17:52:27 -0000 1.1
+++ .cvsignore 12 May 2009 14:07:16 -0000 1.2
@@ -0,0 +1,2 @@
+Cg-2.1_February2009_x86.tgz
+Cg-2.1_February2009_x86_64.tgz
15 years, 6 months
rpms/vlc/devel vlc-1.0.0-bugfix_backport.patch, NONE, 1.1 vlc-1.0.0-rc1-pkglibd.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vlc.spec, 1.31, 1.32 0001-Mozilla-SDK-libxul-1.9.1-support.patch, 1.5, NONE vlc-1.0.0-pre1-libmpeg2_out.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8409/devel
Modified Files:
.cvsignore sources vlc.spec
Added Files:
vlc-1.0.0-bugfix_backport.patch vlc-1.0.0-rc1-pkglibd.patch
Removed Files:
0001-Mozilla-SDK-libxul-1.9.1-support.patch
vlc-1.0.0-pre1-libmpeg2_out.patch
Log Message:
Update to -rc1
--enable dirac libkate
vlc-1.0.0-bugfix_backport.patch:
--- NEW FILE vlc-1.0.0-bugfix_backport.patch ---
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 4085e25..5794c0a 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -1065,7 +1065,7 @@ VLC_PUBLIC_API void libvlc_video_set_track( libvlc_media_player_t *, int, libvlc
* \param i_height the snapshot's height
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_player_t *, char *,unsigned int, unsigned int, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_player_t *, const char *,unsigned int, unsigned int, libvlc_exception_t * );
/**
* Resize the current video output window.
diff --git a/include/vlc_url.h b/include/vlc_url.h
index dc2a021..448c685 100644
--- a/include/vlc_url.h
+++ b/include/vlc_url.h
@@ -48,8 +48,9 @@ struct vlc_url_t
VLC_EXPORT( char *, unescape_URI_duplicate, ( const char *psz ) );
VLC_EXPORT( void, unescape_URI, ( char *psz ) );
VLC_EXPORT( char *, decode_URI_duplicate, ( const char *psz ) );
-VLC_EXPORT( void, decode_URI, ( char *psz ) );
+VLC_EXPORT( char *, decode_URI, ( char *psz ) );
VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) );
+VLC_EXPORT( char *, make_URI, ( const char *path ) );
/*****************************************************************************
* vlc_UrlParse:
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 19e4b75..86bd6dd 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -176,16 +176,15 @@ static int Open ( vlc_object_t *p_this )
goto fail;
}
- a.maxlength = pa_bytes_per_second(&ss)/4/pa_frame_size(&ss);
- a.tlength = a.maxlength*9/10;
- a.prebuf = a.tlength/2;
- a.minreq = a.tlength/10;
-
- a.maxlength *= pa_frame_size(&ss);
- a.tlength *= pa_frame_size(&ss);
- a.prebuf *= pa_frame_size(&ss);
- a.minreq *= pa_frame_size(&ss);
-
+ /* Reduce overall latency to 200mS to reduce audible clicks
+ * Also pulse minreq and internal buffers are now 20mS which reduces resampling
+ */
+ a.tlength = pa_bytes_per_second(&ss)/5;
+ a.maxlength = a.tlength * 2;
+ a.prebuf = a.tlength;
+ a.minreq = a.tlength / 10;
+
+ /* Buffer size is 20mS */
p_sys->buffer_size = a.minreq;
/* Initialise the speaker map setup above */
@@ -240,7 +239,7 @@ static int Open ( vlc_object_t *p_this )
pa_stream_set_write_callback(p_sys->stream, stream_request_cb, p_aout);
pa_stream_set_latency_update_callback(p_sys->stream, stream_latency_update_cb, p_aout);
- if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
+ if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0) {
msg_Err(p_aout, "Failed to connect stream: %s", pa_strerror(pa_context_errno(p_sys->context)));
goto unlock_and_fail;
}
@@ -448,16 +447,11 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
latency = 0;
}
+
PULSE_DEBUG( "Pulse stream request latency=%"PRId64"", latency);
next_date = mdate() + latency;
-
if(p_sys->start_date < next_date + AOUT_PTS_TOLERANCE ){
- /*
- vlc_mutex_lock( &p_aout->output_fifo_lock );
- p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
- vlc_mutex_unlock( &p_aout->output_fifo_lock );
- */
p_buffer = aout_OutputNextBuffer( p_aout, next_date, 0);
}
}
diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 5bce03b..75f24c2 100644
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -555,18 +555,11 @@ int HandlerCallback( httpd_handler_sys_t *p_args,
int i_env = 0;
char **ppsz_env = NULL;
char *psz_tmp;
- char sep;
size_t i_buffer;
char *p_buffer;
char *psz_cwd, *psz_file = NULL;
int i_ret;
-#ifdef WIN32
- sep = '\\';
-#else
- sep = '/';
-#endif
-
/* Create environment for the CGI */
TAB_APPEND( i_env, ppsz_env, strdup("GATEWAY_INTERFACE=CGI/1.1") );
TAB_APPEND( i_env, ppsz_env, strdup("SERVER_PROTOCOL=HTTP/1.1") );
@@ -677,7 +670,7 @@ int HandlerCallback( httpd_handler_sys_t *p_args,
}
}
- psz_file = strrchr( p_args->file.file, sep );
+ psz_file = strrchr( p_args->file.file, DIR_SEP_CHAR );
if( psz_file != NULL )
{
psz_file++;
@@ -694,7 +687,7 @@ int HandlerCallback( httpd_handler_sys_t *p_args,
NULL );
psz_tmp = strdup( p_args->file.file );
- p = strrchr( psz_tmp, sep );
+ p = strrchr( psz_tmp, DIR_SEP_CHAR );
if( p != NULL )
{
*p = '\0';
diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index a8b7861..69de4a6 100644
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -120,14 +120,6 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
int i_dirlen;
- char sep;
-
-#if defined( WIN32 )
- sep = '\\';
-#else
- sep = '/';
-#endif
-
if( ( p_dir = utf8_opendir( psz_dir ) ) == NULL )
{
if( errno != ENOENT && errno != ENOTDIR )
@@ -145,7 +137,7 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
msg_Dbg( p_intf, "dir=%s", psz_dir );
- snprintf( dir, sizeof( dir ), "%s%c.access", psz_dir, sep );
+ snprintf( dir, sizeof( dir ), "%s"DIR_SEP".access", psz_dir );
if( ( file = utf8_fopen( dir, "r" ) ) != NULL )
{
char line[1024];
@@ -179,7 +171,7 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
fclose( file );
}
- snprintf( dir, sizeof( dir ), "%s%c.hosts", psz_dir, sep );
+ snprintf( dir, sizeof( dir ), "%s"DIR_SEP".hosts", psz_dir );
p_acl = ACL_Create( p_intf, false );
if( ACL_LoadFile( p_acl, dir ) )
{
@@ -210,7 +202,7 @@ int ParseDirectory( intf_thread_t *p_intf, char *psz_root,
continue;
}
- snprintf( dir, sizeof( dir ), "%s%c%s", psz_dir, sep, psz_filename );
+ snprintf( dir, sizeof( dir ), "%s"DIR_SEP"%s", psz_dir, psz_filename );
free( psz_filename );
if( ParseDirectory( p_intf, psz_root, dir ) )
@@ -912,13 +904,12 @@ char *RealPath( const char *psz_src )
char *psz_dir;
char *p;
int i_len = strlen(psz_src);
- const char sep = DIR_SEP_CHAR;
psz_dir = malloc( i_len + 2 );
strcpy( psz_dir, psz_src );
/* Add a trailing sep to ease the .. step */
- psz_dir[i_len] = sep;
+ psz_dir[i_len] = DIR_SEP_CHAR;
psz_dir[i_len + 1] = '\0';
#if (DIR_SEP_CHAR != '/')
@@ -926,18 +917,18 @@ char *RealPath( const char *psz_src )
p = psz_dir;
while( (p = strchr( p, '/' )) != NULL )
{
- *p = sep;
+ *p = DIR_SEP_CHAR;
}
#endif
/* FIXME: this could be O(N) rather than O(N²)... */
/* Remove multiple separators and /./ */
p = psz_dir;
- while( (p = strchr( p, sep )) != NULL )
+ while( (p = strchr( p, DIR_SEP_CHAR )) != NULL )
{
- if( p[1] == sep )
+ if( p[1] == DIR_SEP_CHAR )
memmove( &p[1], &p[2], strlen(&p[2]) + 1 );
- else if( p[1] == '.' && p[2] == sep )
+ else if( p[1] == '.' && p[2] == DIR_SEP_CHAR )
memmove( &p[1], &p[3], strlen(&p[3]) + 1 );
else
p++;
@@ -955,13 +946,13 @@ char *RealPath( const char *psz_src )
{
/* Fix all .. dir */
p = psz_dir + 3;
- while( (p = strchr( p, sep )) != NULL )
+ while( (p = strchr( p, DIR_SEP_CHAR )) != NULL )
{
- if( p[-1] == '.' && p[-2] == '.' && p[-3] == sep )
+ if( p[-1] == '.' && p[-2] == '.' && p[-3] == DIR_SEP_CHAR )
{
char *q;
p[-3] = '\0';
- if( (q = strrchr( psz_dir, sep )) != NULL )
+ if( (q = strrchr( psz_dir, DIR_SEP_CHAR )) != NULL )
{
memmove( q + 1, p + 1, strlen(p + 1) + 1 );
p = q + 1;
@@ -979,8 +970,8 @@ char *RealPath( const char *psz_src )
/* Remove trailing sep if there are at least 2 sep in the string
* (handles the C:\ stuff) */
- p = strrchr( psz_dir, sep );
- if( p != NULL && p[1] == '\0' && p != strchr( psz_dir, sep ) )
+ p = strrchr( psz_dir, DIR_SEP_CHAR );
+ if( p != NULL && p[1] == '\0' && p != strchr( psz_dir, DIR_SEP_CHAR ) )
*p = '\0';
return psz_dir;
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index ab0eb9a..8baf686 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -637,7 +637,7 @@ QSize MainInterface::sizeHint() const
*/
void MainInterface::doComponentsUpdate()
{
- if( isFullScreen() ) return;
+ if( isFullScreen() || isMaximized() ) return;
msg_Dbg( p_intf, "Updating the geometry" );
/* Here we resize to sizeHint() and not adjustsize because we want
diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c
index 9b7ef96..0f5f82c 100644
--- a/modules/misc/playlist/xspf.c
+++ b/modules/misc/playlist/xspf.c
@@ -34,11 +34,14 @@
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_strings.h>
-#include <vlc_charset.h>
+#include <vlc_url.h>
#include "xspf.h"
#include <assert.h>
+static void xspf_export_item( playlist_item_t *, FILE *, int * );
+static void xspf_extension_item( playlist_item_t *, FILE *, int * );
+
/**
* \brief Prints the XSPF header to file, writes each item by xspf_export_item()
* and closes the open xml elements
@@ -139,7 +142,7 @@ static void xspf_export_item( playlist_item_t *p_item, FILE *p_file,
if( psz_uri && *psz_uri )
{
- psz = assertUTF8URI( psz_uri );
+ psz = make_URI( psz_uri );
fprintf( p_file, "\t\t\t<location>%s</location>\n", psz );
free( psz );
}
@@ -209,7 +212,7 @@ static void xspf_export_item( playlist_item_t *p_item, FILE *p_file,
if( psz == NULL ) psz = strdup( "" );
if( !EMPTY_STR( psz ) )
{
- psz_uri = assertUTF8URI( psz );
+ psz_uri = make_URI( psz );
fprintf( p_file, "\t\t\t<image>%s</image>\n", psz_uri );
free( psz_uri );
}
@@ -284,89 +287,3 @@ static void xspf_extension_item( playlist_item_t *p_item, FILE *p_file,
return;
}
-
-/**
- * \param psz_name the location of the media ressource (e.g. local file,
- * device, network stream, etc.)
- * \return a new char buffer which asserts that the location is valid UTF-8
- * and a valid URI
- * \note the returned buffer must be freed, when it isn't used anymore
- */
-static char *assertUTF8URI( char *psz_name )
-{
- char *psz_ret = NULL; /**< the new result buffer to return */
- char *psz_s = NULL, *psz_d = NULL; /**< src & dest pointers for URI conversion */
- bool b_uri_is_file = false; /**< we do additional %-encoding if the URI is a file:// one */
-
- if( !psz_name || !*psz_name )
- return NULL;
-
- /* check that string is valid UTF-8 */
- /* XXX: Why do we even need to do that ? (all strings in core are UTF-8 encoded */
- if( !( psz_s = EnsureUTF8( psz_name ) ) )
- return NULL;
-
- /* max. 3x for URI conversion (percent escaping) and
- 8 bytes for "file://" and NULL-termination */
- psz_ret = (char *)malloc( strlen(psz_name)*6*3+8 );
- if( !psz_ret )
- return NULL;
-
- /** \todo check for a valid scheme part preceding the colon */
- if( strstr( psz_s, "://") != NULL )
- {
- size_t i_delim = strcspn( psz_s, ":" );
- i_delim++; /* skip the ':' */
- strncpy( psz_ret, psz_s, i_delim );
- psz_d = psz_ret + i_delim;
-
- if( !strncmp( psz_s, "file://", 7 ) )
- b_uri_is_file = true;
-
- psz_s += i_delim;
- }
- /* assume "file" scheme if no scheme-part is included */
- else
- {
- strcpy( psz_ret, "file://" );
- psz_d = psz_ret + 7;
- b_uri_is_file = true;
- }
-
- while( *psz_s )
- {
- /* percent-encode all non-ASCII and the XML special characters and the percent sign itself */
- if( *psz_s & B10000000 ||
- *psz_s == '<' ||
- *psz_s == '>' ||
- *psz_s == '&' ||
- *psz_s == ' ' ||
- *psz_s == '+' ||
- *psz_s == '%' ||
- *psz_s == '\\' ||
- ( b_uri_is_file && (
- *psz_s == ':' ||
- *psz_s == '"' ||
- *psz_s == '?' ||
- *psz_s == '#' ||
- *psz_s == '[' ||
- *psz_s == ']' ||
- *psz_s == '@' )
- )
- )
- {
- *psz_d++ = '%';
- *psz_d++ = hexchars[(*psz_s >> 4) & B00001111];
- *psz_d++ = hexchars[*psz_s & B00001111];
- }
- else
- {
- *psz_d++ = *psz_s;
- }
-
- psz_s++;
- }
- *psz_d = '\0';
-
- return (char *)realloc( psz_ret, strlen( psz_ret ) + 1 );
-}
diff --git a/modules/misc/playlist/xspf.h b/modules/misc/playlist/xspf.h
index 9a8ac6b..adfaa90 100644
--- a/modules/misc/playlist/xspf.h
+++ b/modules/misc/playlist/xspf.h
@@ -33,6 +33,3 @@ const char hexchars[16] = "0123456789ABCDEF";
/* prototypes */
int xspf_export_playlist( vlc_object_t * );
-static void xspf_export_item( playlist_item_t *, FILE *, int * );
-static void xspf_extension_item( playlist_item_t *, FILE *, int * );
-static char *assertUTF8URI( char * );
diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 24448bc..b5d8946 100644
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -50,6 +50,10 @@
#define GS_PATH "/org/gnome/ScreenSaver"
#define GS_INTERFACE "org.gnome.ScreenSaver"
+#define FDS_SERVICE "org.freedesktop.ScreenSaver"
+#define FDS_PATH "/ScreenSaver"
+#define FDS_INTERFACE "org.freedesktop.ScreenSaver"
+
#endif
/*****************************************************************************
@@ -67,8 +71,11 @@ static void poke_screensaver( intf_thread_t *p_intf,
DBusConnection *p_connection );
static void screensaver_send_message_void ( intf_thread_t *p_intf,
DBusConnection *p_connection,
+ const char *psz_service,
+ const char *psz_path,
+ const char *psz_interface,
const char *psz_name );
-static bool screensaver_is_running( DBusConnection *p_connection );
+static bool screensaver_is_running( DBusConnection *p_connection, const char *psz_service );
struct intf_sys_t
@@ -235,34 +242,47 @@ static DBusConnection * dbus_init( intf_thread_t *p_intf )
static void poke_screensaver( intf_thread_t *p_intf,
DBusConnection *p_connection )
{
- if( screensaver_is_running( p_connection ) )
+ if( screensaver_is_running( p_connection, GS_SERVICE ) )
{
# ifdef SCREENSAVER_DEBUG
msg_Dbg( p_intf, "found a running gnome-screensaver instance" );
# endif
/* gnome-screensaver changed it's D-Bus interface, so we need both */
- screensaver_send_message_void( p_intf, p_connection, "Poke" );
- screensaver_send_message_void( p_intf, p_connection,
- "SimulateUserActivity" );
+ screensaver_send_message_void( p_intf, p_connection, GS_SERVICE, GS_PATH,
+ GS_INTERFACE, "Poke" );
+ screensaver_send_message_void( p_intf, p_connection, GS_SERVICE, GS_PATH,
+ GS_INTERFACE, "SimulateUserActivity" );
+ }
+ else if( screensaver_is_running( p_connection, FDS_SERVICE ) )
+ {
+# ifdef SCREENSAVER_DEBUG
+ msg_Dbg( p_intf, "found a running freedesktop-screensaver instance" );
+# endif
+ screensaver_send_message_void( p_intf, p_connection, FDS_SERVICE, FDS_PATH,
+ FDS_INTERFACE, "SimulateUserActivity" );
}
# ifdef SCREENSAVER_DEBUG
else
{
- msg_Dbg( p_intf, "found no running gnome-screensaver instance" );
+ msg_Dbg( p_intf, "found no running (gnome|freedesktop)-screensaver instance" );
}
# endif
+
}
static void screensaver_send_message_void ( intf_thread_t *p_intf,
DBusConnection *p_connection,
+ const char *psz_service,
+ const char *psz_path,
+ const char *psz_interface,
const char *psz_name )
{
DBusMessage *p_message;
if( !p_connection || !psz_name ) return;
- p_message = dbus_message_new_method_call( GS_SERVICE, GS_PATH,
- GS_INTERFACE, psz_name );
+ p_message = dbus_message_new_method_call( psz_service, psz_path,
+ psz_interface, psz_name );
if( p_message == NULL )
{
msg_Err( p_intf, "DBUS initialization failed: message initialization" );
@@ -279,7 +299,7 @@ static void screensaver_send_message_void ( intf_thread_t *p_intf,
dbus_message_unref( p_message );
}
-static bool screensaver_is_running( DBusConnection *p_connection )
+static bool screensaver_is_running( DBusConnection *p_connection, const char *psz_service )
{
DBusError error;
bool b_return;
@@ -287,7 +307,7 @@ static bool screensaver_is_running( DBusConnection *p_connection )
if( !p_connection ) return false;
dbus_error_init( &error );
- b_return = dbus_bus_name_has_owner( p_connection, GS_SERVICE, &error );
+ b_return = dbus_bus_name_has_owner( p_connection, psz_service, &error );
if( dbus_error_is_set( &error ) ) dbus_error_free (&error);
return b_return;
diff --git a/src/control/video.c b/src/control/video.c
index 567532c..81c0052 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -104,7 +104,7 @@ void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi,
}
void
-libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath,
+libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, const char *psz_filepath,
unsigned int i_width, unsigned int i_height, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
diff --git a/src/test/url.c b/src/test/url.c
index a097aca..d03e48c 100644
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
typedef char * (*conv_t) (const char *);
@@ -60,8 +61,15 @@ static inline void test_b64 (const char *in, const char *out)
test (vlc_b64_encode, in, out);
}
+static inline void test_path (const char *in, const char *out)
+{
+ test (make_URI, in, out);
+}
+
int main (void)
{
+ int val;
+
(void)setvbuf (stdout, NULL, _IONBF, 0);
test_decode ("this_should_not_be_modified_1234",
"this_should_not_be_modified_1234");
@@ -93,5 +101,24 @@ int main (void)
test_b64 ("fooba", "Zm9vYmE=");
test_b64 ("foobar", "Zm9vYmFy");
+ /* Path test */
+ test_path ("file:///", "file:///");
+ test_path ("http://www.example.com/%7Ejohn/",
+ "http://www.example.com/%7Ejohn/");
+ test_path ("/", "file:///");
+ test_path ("/home/john/", "file:///home/john/");
+ test_path ("/home/john/music.ogg", "file:///home/john/music.ogg");
+ //test_path ("\\\\server/pub/music.ogg", "file://server/pub/music.ogg");
+
+ /*int fd = open (".", O_RDONLY);
+ assert (fd != -1);*/
+ val = chdir ("/tmp");
+ assert (val != -1);
+ test_path ("movie.ogg", "file:///tmp/movie.ogg");
+ test_path (".", "file:///tmp/.");
+ test_path ("", "file:///tmp/");
+ /*val = fchdir (fd);
+ assert (val != -1);*/
+
return 0;
}
diff --git a/src/text/strings.c b/src/text/strings.c
index 8a0229c..860aae7 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -130,7 +131,7 @@ void unescape_URI( char *psz )
}
/**
- * Decode encoded URI string
+ * Decode encoded URI component. See also decode_URI().
* \return decoded duplicated string
*/
char *decode_URI_duplicate( const char *psz )
@@ -141,14 +142,23 @@ char *decode_URI_duplicate( const char *psz )
}
/**
- * Decode encoded URI string in place
- * \return nothing
+ * Decode an encoded URI component in place.
+ * <b>This function does NOT decode entire URIs.</b>
+ * It decodes components (e.g. host name, directory, file name).
+ * Decoded URIs do not exist in the real world (see RFC3986 §2.4).
+ * Complete URIs are always "encoded" (or they are syntaxically invalid).
+ *
+ * Note that URI encoding is different from Javascript escaping. Especially,
+ * white spaces and Unicode non-ASCII code points are encoded differently.
+ *
+ * \return psz on success, NULL if it was not properly encoded
*/
-void decode_URI( char *psz )
+char *decode_URI( char *psz )
{
unsigned char *in = (unsigned char *)psz, *out = in, c;
+
if( psz == NULL )
- return;
+ return NULL;
while( ( c = *in++ ) != '\0' )
{
@@ -160,14 +170,14 @@ void decode_URI( char *psz )
if( ( ( hex[0] = *in++ ) == 0 )
|| ( ( hex[1] = *in++ ) == 0 ) )
- return;
+ return NULL;
hex[2] = '\0';
*out++ = (unsigned char)strtoul( hex, NULL, 0x10 );
break;
}
- case '+':
+ case '+': /* This is HTTP forms, not URI decoding... */
*out++ = ' ';
break;
@@ -182,6 +192,7 @@ void decode_URI( char *psz )
}
*out = '\0';
EnsureUTF8( psz );
+ return psz;
}
static inline bool isurisafe( int c )
@@ -193,23 +204,13 @@ static inline bool isurisafe( int c )
|| ( strchr( "-._~", c ) != NULL );
}
-/**
- * Encodes an URI component (RFC3986 §2).
- *
- * @param psz_uri nul-terminated UTF-8 representation of the component.
- * Obviously, you can't pass an URI containing a nul character, but you don't
- * want to do that, do you?
- *
- * @return encoded string (must be free()'d), or NULL for ENOMEM.
- */
-char *encode_URI_component( const char *psz_uri )
+static char *encode_URI_bytes (const char *psz_uri, size_t len)
{
- char *psz_enc = malloc ((3 * strlen (psz_uri)) + 1), *out = psz_enc;
-
+ char *psz_enc = malloc (3 * len + 1), *out = psz_enc;
if (psz_enc == NULL)
return NULL;
- while (*psz_uri)
+ for (size_t i = 0; i < len; i++)
{
static const char hex[16] = "0123456789ABCDEF";
uint8_t c = *psz_uri;
@@ -232,6 +233,21 @@ char *encode_URI_component( const char *psz_uri )
return out ? out : psz_enc; /* realloc() can fail (safe) */
}
+/**
+ * Encodes an URI component (RFC3986 §2).
+ *
+ * @param psz_uri nul-terminated UTF-8 representation of the component.
+ * Obviously, you can't pass an URI containing a nul character, but you don't
+ * want to do that, do you?
+ *
+ * @return encoded string (must be free()'d), or NULL for ENOMEM.
+ */
+char *encode_URI_component( const char *psz_uri )
+{
+ return encode_URI_bytes (psz_uri, strlen (psz_uri));
+}
+
+
static const struct xml_entity_s
{
char psz_entity[8];
@@ -1120,3 +1136,78 @@ void path_sanitize( char *str )
str++;
}
}
+
+#include <vlc_url.h>
+
+/**
+ * Convert a file path to an URI. If already an URI, do nothing.
+ */
+char *make_URI (const char *path)
+{
+ if (path == NULL)
+ return NULL;
+ if (strstr (path, "://") != NULL)
+ return strdup (path); /* Already an URI */
+ /* Note: VLC cannot handle URI schemes without double slash after the
+ * scheme name (such as mailto: or news:). */
+
+ char *buf;
+#ifdef WIN32
+ if (isalpha (path[0]) && (path[1] == ':'))
+ {
+ if (asprintf (&buf, "file:///%c:", path[0]) == -1)
+ buf = NULL;
+ path += 2;
+ }
+ else
+#endif
+#if 0
+ /* Windows UNC paths (file://host/share/path instead of file:///path) */
+ if (!strncmp (path, "\\\\", 2))
+ {
+ path += 2;
+ buf = strdup ("file://");
+ }
+ else
+#endif
+ if (path[0] != DIR_SEP_CHAR)
+ { /* Relative path: prepend the current working directory */
+ char cwd[PATH_MAX];
+
+ if (getcwd (cwd, sizeof (cwd)) == NULL) /* FIXME: UTF8? */
+ return NULL;
+ if (asprintf (&buf, "%s/%s", cwd, path) == -1)
+ return NULL;
+ char *ret = make_URI (buf);
+ free (buf);
+ return ret;
+ }
+ else
+ buf = strdup ("file://");
+ if (buf == NULL)
+ return NULL;
+
+ assert (path[0] == DIR_SEP_CHAR);
+
+ /* Absolute file path */
+ for (const char *ptr = path + 1;; ptr++)
+ {
+ size_t len = strcspn (ptr, DIR_SEP);
+ char *component = encode_URI_bytes (ptr, len);
+ if (component == NULL)
+ {
+ free (buf);
+ return NULL;
+ }
+ char *uri;
+ int val = asprintf (&uri, "%s/%s", buf, component);
+ free (component);
+ free (buf);
+ if (val == -1)
+ return NULL;
+ buf = uri;
+ ptr += len;
+ if (*ptr == '\0')
+ return buf;
+ }
+}
vlc-1.0.0-rc1-pkglibd.patch:
--- NEW FILE vlc-1.0.0-rc1-pkglibd.patch ---
diff -up vlc-1.0.0-rc1/configure.ac.pkglibd vlc-1.0.0-rc1/configure.ac
--- vlc-1.0.0-rc1/configure.ac.pkglibd 2009-05-12 14:39:52.000000000 +0200
+++ vlc-1.0.0-rc1/configure.ac 2009-05-12 14:40:02.000000000 +0200
@@ -144,11 +144,6 @@ AC_ARG_WITH(contrib,
CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include"
- if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then
- export PKG_CONFIG_PATH=${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
- else
- export PKG_CONFIG_LIBDIR=${CONTRIB_DIR}/lib/pkgconfig
- fi
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 3 Apr 2009 15:32:30 -0000 1.12
+++ .cvsignore 12 May 2009 13:27:28 -0000 1.13
@@ -1 +1 @@
-vlc-1.0.0-pre1.tar.bz2
+vlc-1.0.0-rc1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 3 Apr 2009 15:32:30 -0000 1.12
+++ sources 12 May 2009 13:27:28 -0000 1.13
@@ -1 +1 @@
-3397813329f2b962f28ddb1cc6e0242f vlc-1.0.0-pre1.tar.bz2
+42e31b46e6faa3e0ce7aec3790f014a3 vlc-1.0.0-rc1.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vlc.spec 10 Apr 2009 14:18:43 -0000 1.31
+++ vlc.spec 12 May 2009 13:27:28 -0000 1.32
@@ -1,10 +1,10 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
%define _default_patch_fuzz 2
-%define with_internal_live555 0
+%define with_internal_live555 0
%define live555_date 2008.07.25
%define vlc_git 0
-%define vlc_rc -pre1
+%define vlc_rc -rc1
%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.2pre1%{?dist}
+Release: 0.4rc1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -25,13 +25,14 @@
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-pre1-libmpeg2_out.patch
+Patch6: vlc-1.0.0-bugfix_backport.patch
+Patch7: vlc-1.0.0-rc1-pkglibd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
-%if 0
+%if 1
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
@@ -42,7 +43,7 @@
BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel
BuildRequires: dbus-devel
-%{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0}
+BuildRequires: dirac-devel >= 1.0.0
%if %with_directfb
BuildRequires: directfb-devel
%endif
@@ -67,7 +68,7 @@
BuildRequires: libdvdnav-devel
BuildRequires: libebml-devel
BuildRequires: libid3tag-devel
-%{?_with_kate: BuildRequires: libkate-devel}
+BuildRequires: libkate-devel
BuildRequires: libmad-devel
BuildRequires: libmatroska-devel >= 0.7.6
BuildRequires: libmodplug-devel
@@ -244,18 +245,12 @@
%if 0%{?fedora} >= 11
%patch5 -p1 -b .xul191
%endif
-%patch6 -p1 -b .libmpeg2_out
-
-
-#./bootstrap
+%patch6 -p1 -b .bp
+%patch7 -p1 -b .pkglibd
-#Rip out libmpeg2
-rm ./modules/codec/xvmc/{alloc.c,attributes.h,cpu_accel.c,cpu_state.c,decode.c,header.c,motion_comp.c,motion_comp_mmx.c,mpeg2.h,mpeg2_internal.h,slice.c,slice_xvmc_vld.c,vlc.h,xvmc_vld.h}
-touch ./modules/codec/xvmc/{alloc.c,attributes.h,cpu_accel.c,cpu_state.c,decode.c,header.c,motion_comp.c,motion_comp_mmx.c,mpeg2.h,mpeg2_internal.h,slice.c,slice_xvmc_vld.c,vlc.h,xvmc_vld.h}
-rm ./modules/codec/xvmc/mpeg2.h
-ln -sf %{_includedir}/mpeg2dec/mpeg2.h ./modules/codec/xvmc/mpeg2.h
-rm ./modules/codec/xvmc/mpeg2_internal.h
-ln -sf %{_includedir}/mpeg2dec/mpeg2_internal.h ./modules/codec/xvmc/mpeg2_internal.h
+rm autotools/* m4/lib*
+cp -p %{_datadir}/gettext/config.rpath autotools
+./bootstrap
%build
@@ -298,7 +293,7 @@
--enable-speex \
--enable-tarkin \
--enable-theora \
- %{?_with_dirac:--enable-dirac} \
+ --enable-dirac \
--enable-svg \
--enable-snapshot \
%ifarch %{ix86} x86_64
@@ -512,6 +507,13 @@
%changelog
+* Tue May 12 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.4rc1
+- Update to 1.0.0-rc1
+- Add 1.0-bugfix patches
+
+* Fri Apr 17 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.3pre2
+- Update to 1.0.0-pre2
+
* Fri Apr 10 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.2pre1
- Re-enable xxmc
- Remove libmpeg2 out
--- 0001-Mozilla-SDK-libxul-1.9.1-support.patch DELETED ---
--- vlc-1.0.0-pre1-libmpeg2_out.patch DELETED ---
15 years, 6 months
rpms/sysprof-kmod/F-9 sysprof-kmod.spec,1.4,1.5
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/sysprof-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12154
Modified Files:
sysprof-kmod.spec
Log Message:
* Tue May 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-1.4
- rebuild for new kernels
Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/sysprof-kmod/F-9/sysprof-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof-kmod.spec 8 May 2009 05:26:25 -0000 1.4
+++ sysprof-kmod.spec 12 May 2009 04:52:20 -0000 1.5
@@ -8,7 +8,7 @@
Name: sysprof-kmod
Summary: Kernel module for sysprof
Version: 1.0.12
-Release: 1%{?dist}.3
+Release: 1%{?dist}.4
Group: System Environment/Kernel
License: GPLv2+
@@ -73,6 +73,9 @@
%changelog
+* Tue May 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-1.4
+- rebuild for new kernels
+
* Fri May 08 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-1.3
- rebuild for new kernels
15 years, 6 months
rpms/rt2870-kmod/F-9 rt2870-kmod.spec,1.27,1.28
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12033
Modified Files:
rt2870-kmod.spec
Log Message:
* Tue May 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.2
- rebuild for new kernels
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-9/rt2870-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rt2870-kmod.spec 8 May 2009 05:26:08 -0000 1.27
+++ rt2870-kmod.spec 12 May 2009 04:52:02 -0000 1.28
@@ -7,7 +7,7 @@
Name: rt2870-kmod
Version: 2.1.1.0
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -77,6 +77,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue May 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.2
+- rebuild for new kernels
+
* Fri May 08 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.1
- rebuild for new kernels
15 years, 6 months