rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.129,1.130
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9725
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-2
- install the NVIDIA supplied application profile key documentation
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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- xorg-x11-drv-nvidia.spec 8 Feb 2014 16:00:23 -0000 1.129
+++ xorg-x11-drv-nvidia.spec 8 Feb 2014 18:03:58 -0000 1.130
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 334.16
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -249,7 +249,7 @@
#install the NVIDIA supplied application profiles
mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia
-install -p -m 0644 nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/nvidia
+install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} $RPM_BUILD_ROOT%{_datadir}/nvidia
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
@@ -408,7 +408,7 @@
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
#/no_multilib
%dir %{_datadir}/nvidia
-%{_datadir}/nvidia/nvidia-application-profiles-%{version}-rc
+%{_datadir}/nvidia/nvidia-application-profiles-%{version}-*
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-settings.*
@@ -459,6 +459,9 @@
%{_libdir}/libcuda.so
%changelog
+* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-2
+- install the NVIDIA supplied application profile key documentation
+
* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-1
- Update to 334.16
10 years, 2 months
rpms/nvidia-kmod/devel nvidia_3.14_kernel.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 nvidia-kmod.spec, 1.152, 1.153 sources, 1.63, 1.64 nvidia_3.13_kernel.patch, 1.3, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32227
Modified Files:
.cvsignore nvidia-kmod.spec sources
Added Files:
nvidia_3.14_kernel.patch
Removed Files:
nvidia_3.13_kernel.patch
Log Message:
* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-1
- Update to 334.16
- Patch for 3.14 kernel
nvidia_3.14_kernel.patch:
nv-acpi.c | 7 +++++++
nv-linux.h | 5 +++++
uvm/nvidia_uvm_common.c | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
--- NEW FILE nvidia_3.14_kernel.patch ---
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
@@ -15,6 +15,10 @@
#include "nv-linux.h"
#include "nv-reg.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
+#endif
+
#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
static RM_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
static RM_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *);
@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+#endif
// remove event notifier
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -276,6 +276,11 @@ extern int nv_pat_mode;
#if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
#include <acpi/acpi.h>
#include <acpi/acpi_drivers.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
+#include <acpi/acpi_bus.h>
+#endif
+
#if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
#define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
#endif
--- a/kernel/uvm/nvidia_uvm_common.c
+++ b/kernel/uvm/nvidia_uvm_common.c
@@ -272,5 +272,5 @@ static void __exit uvm_exit(void)
module_init(uvm_init);
module_exit(uvm_exit);
-MODULE_LICENSE("MIT");
+MODULE_LICENSE("GPL");
MODULE_INFO(supported, "external");
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore 13 Jan 2014 16:05:08 -0000 1.60
+++ .cvsignore 8 Feb 2014 16:44:36 -0000 1.61
@@ -1 +1 @@
-nvidia-kmod-data-331.38.tar.xz
+nvidia-kmod-data-334.16.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- nvidia-kmod.spec 25 Jan 2014 10:40:48 -0000 1.152
+++ nvidia-kmod.spec 8 Feb 2014 16:44:36 -0000 1.153
@@ -7,9 +7,9 @@
Name: nvidia-kmod
Epoch: 1
-Version: 331.38
+Version: 334.16
# Taken over by kmodtool
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,7 +25,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Patch0: nv-linux-arm.patch
-Patch1: nvidia_3.13_kernel.patch
+Patch1: nvidia_3.14_kernel.patch
Source11: nvidia-kmodtool-excludekernel-filterfile
@@ -99,6 +99,10 @@
%changelog
+* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-1
+- Update to 334.16
+- Patch for 3.14 kernel
+
* Sat Jan 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.38-5
- Disable uvm when NV_BUILD_MODULE_INSTANCES is set
- Simplify patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources 13 Jan 2014 16:05:08 -0000 1.63
+++ sources 8 Feb 2014 16:44:36 -0000 1.64
@@ -1 +1 @@
-9d74494d1d864790a2637ee0ef84074f nvidia-kmod-data-331.38.tar.xz
+e353bcf19a1c95307f6d99072d7fc285 nvidia-kmod-data-334.16.tar.xz
--- nvidia_3.13_kernel.patch DELETED ---
10 years, 2 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.61, 1.62 sources, 1.64, 1.65 xorg-x11-drv-nvidia.spec, 1.128, 1.129
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7153
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-1
- Update to 334.16
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore 13 Jan 2014 15:44:21 -0000 1.61
+++ .cvsignore 8 Feb 2014 16:00:23 -0000 1.62
@@ -1,3 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-331.38.run
-NVIDIA-Linux-x86_64-331.38.run
-NVIDIA-Linux-x86-331.38.run
+NVIDIA-Linux-x86_64-334.16.run
+NVIDIA-Linux-x86-334.16.run
+NVIDIA-Linux-armv7l-gnueabihf-334.16.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources 13 Jan 2014 15:44:21 -0000 1.64
+++ sources 8 Feb 2014 16:00:23 -0000 1.65
@@ -1,3 +1,3 @@
-fad752f6e29bf6d70eb810ee9091b7e8 NVIDIA-Linux-armv7l-gnueabihf-331.38.run
-77f688822aea7e07f217d7cf5898d7d4 NVIDIA-Linux-x86_64-331.38.run
-16aa229f7f118c8cafad6fb3f4ac082e NVIDIA-Linux-x86-331.38.run
+7ed42d64213681b23e9e5b08c5b4d61a NVIDIA-Linux-x86_64-334.16.run
+2503a9ce1c17154099b2bfbdde86caf7 NVIDIA-Linux-x86-334.16.run
+2ce6adb82916448350c50e1e58857f94 NVIDIA-Linux-armv7l-gnueabihf-334.16.run
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.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- xorg-x11-drv-nvidia.spec 13 Jan 2014 15:44:21 -0000 1.128
+++ xorg-x11-drv-nvidia.spec 8 Feb 2014 16:00:23 -0000 1.129
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 331.38
+Version: 334.16
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -439,19 +439,17 @@
%ifarch x86_64 i686
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
-%{_nvidia_libdir}/libnvidia-encode.so
-%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libnvidia-opencl.so
%{_nvidia_libdir}/tls/libnvidia-tls.so
%{_libdir}/vdpau/libvdpau_nvidia.so
%endif
-%ifarch i686 armv7hl
+%{_nvidia_libdir}/libnvidia-encode.so
+%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libEGL.so
%{_nvidia_libdir}/libGLESv1_CM.so
%{_nvidia_libdir}/libGLESv2.so
%{_nvidia_libdir}/libnvidia-eglcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
-%endif
%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
@@ -461,6 +459,9 @@
%{_libdir}/libcuda.so
%changelog
+* Sat Feb 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:334.16-1
+- Update to 334.16
+
* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-1
- Update to 331.38
10 years, 2 months
rpms/moc/F-19 .cvsignore, 1.2, 1.3 moc.spec, 1.2, 1.3 sources, 1.2, 1.3 moc+warnings.patch, 1.1, NONE moc-r2506+fsf_addr.patch, 1.1, NONE moc-r2506:2526-samplesize.patch, 1.1, NONE
by Antonio
Author: sagitter
Update of /cvs/free/rpms/moc/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12247/F-19
Modified Files:
.cvsignore moc.spec sources
Removed Files:
moc+warnings.patch moc-r2506+fsf_addr.patch
moc-r2506:2526-samplesize.patch
Log Message:
Update to moc-2.5.0-beta2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/moc/F-19/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Jun 2013 18:47:21 -0000 1.2
+++ .cvsignore 7 Feb 2014 20:03:25 -0000 1.3
@@ -1 +1 @@
-moc-2.5.0-beta1.tar.bz2
+moc-2.5.0-beta2.tar.bz2
Index: moc.spec
===================================================================
RCS file: /cvs/free/rpms/moc/F-19/moc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moc.spec 18 Jun 2013 15:14:24 -0000 1.2
+++ moc.spec 7 Feb 2014 20:03:25 -0000 1.3
@@ -4,21 +4,10 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.5.0
-Release: 0.10.beta1%{?dist}
+Release: 0.1.beta2%{?dist}
License: GPLv2+ and GPLv3+
URL: http://www.moc.daper.net
-Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta1.tar.bz2
-
-## This patch corrects all outdated FSF address
-Patch0: %{name}-r2506+fsf_addr.patch
-
-## This patchset corrects "Unsupported sample size!" error
-## See http://moc.daper.net/node/862
-Patch1: %{name}-r2506:2526-samplesize.patch
-
-## This patch corrects 'sizeof' argument bug;
-## directly provided from upstream
-Patch2: %{name}+warnings.patch
+Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta2.tar.bz2
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
@@ -43,12 +32,11 @@
BuildRequires: pkgconfig(opus)
BuildRequires: libtool
BuildRequires: librcc-devel
-
-## Source code configuring tools
-BuildRequires: autoconf, automake >= 1.13
+BuildRequires: libquvi-devel, popt-devel
Requires: ffmpeg
Requires: opus
+Requires: libquvi, libquvi-scripts, popt
%description
MOC (music on console) is a console audio player for LINUX/UNIX designed to be
@@ -57,25 +45,15 @@
files in this directory beginning from the chosen file.
%prep
-%setup -q -n %{name}-%{version}-beta1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-## This renaming is requested by Automake-1.13
-mv configure.in configure.ac
+%setup -q -n %{name}-%{version}-beta2
%build
-
-## Latest patchset changes ffmpeg.m4 file
-## Autoreconf is temporarily necessary
-autoreconf -i --force
-
-%configure --disable-static --with-rcc \
+%configure --disable-static --disable-silent-rules \
+ --disable-rpath --with-rcc \
--with-oss --with-alsa --with-jack --with-aac --with-mp3 \
--with-musepack --with-vorbis --with-flac --with-wavpack \
--with-sndfile --with-modplug --with-ffmpeg --with-speex \
- --with-samplerate --with-curl
+ --with-samplerate --with-curl --disable-debug --without-magic
make %{?_smp_mflags}
%install
@@ -97,6 +75,10 @@
%{_libdir}/%{name}/decoder_plugins
%changelog
+* Wed Feb 05 2014 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.1.beta2
+- Update to 2.5.0-beta2
+- Removed previous patches
+
* Tue Jun 18 2013 Antonio Trande <sagitter(a)fedoraproject.org> 2.5.0-0.10.beta1
- Added patchset to fix "Unsupported sample size!" error
See http://moc.daper.net/node/862 for more details
Index: sources
===================================================================
RCS file: /cvs/free/rpms/moc/F-19/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Jun 2013 18:47:21 -0000 1.2
+++ sources 7 Feb 2014 20:03:25 -0000 1.3
@@ -1 +1 @@
-795ecba86847e082aa2f21937cc04804 moc-2.5.0-beta1.tar.bz2
+da87b90b57934234589b63e347921458 moc-2.5.0-beta2.tar.bz2
--- moc+warnings.patch DELETED ---
--- moc-r2506+fsf_addr.patch DELETED ---
--- moc-r2506:2526-samplesize.patch DELETED ---
10 years, 2 months
rpms/pcsx2/F-19 pcsx2-1.2.1_fedora_cflags_opts.diff, NONE, 1.1 pcsx2-1.2.1_rebuild_tarball.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 pcsx2.spec, 1.2, 1.3 sources, 1.3, 1.4 pcsx2-1.2.0_fedora_cflags_opts.diff, 1.1, NONE rebuild_pcsx2_tarball.sh, 1.1, NONE
by Giles Birchley
Author: gbirchley
Update of /cvs/nonfree/rpms/pcsx2/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12001/F-19
Modified Files:
.cvsignore pcsx2.spec sources
Added Files:
pcsx2-1.2.1_fedora_cflags_opts.diff
pcsx2-1.2.1_rebuild_tarball.sh
Removed Files:
pcsx2-1.2.0_fedora_cflags_opts.diff rebuild_pcsx2_tarball.sh
Log Message:
pcsx2-1.2.1_fedora_cflags_opts.diff:
CMakeLists.txt | 40 +---------------------------------------
1 file changed, 1 insertion(+), 39 deletions(-)
--- NEW FILE pcsx2-1.2.1_fedora_cflags_opts.diff ---
#Alter optimisation cflags to strip out those already automatically specified
#by %%cmake rpm macro (which uses -o2)
--- pcsx2-1.2.1/pcsx2/CMakeLists.txt
+++ pcsx2-1.2.1/pcsx2/CMakeLists.txt
@@ -32,45 +32,7 @@ set(DebugFlags
-g)
# set optimization flags
-set(OptimizationFlags
- -falign-functions
- -falign-jumps
- -falign-labels
- -falign-loops
- -fcaller-saves
- -fcprop-registers
- -fcrossjumping
- -fcse-follow-jumps
- -fcse-skip-blocks
- -fdefer-pop
- -fdelete-null-pointer-checks
- -fgcse
- -fgcse-lm
- -fif-conversion
- -fif-conversion2
- -fmerge-constants
- -foptimize-sibling-calls
- -fpeephole2
- -fregmove
- -freorder-blocks
- -freorder-functions
- -frerun-cse-after-loop
- -fsched-interblock
- -fsched-spec
- -fstrict-overflow
- -fthread-jumps
- -ftree-ccp
- -ftree-ch
- -ftree-copyrename
- -ftree-dce
- -ftree-dominator-opts
- -ftree-fre
- -ftree-lrs
- -ftree-pre
- -ftree-sra
- -ftree-ter
- -ftree-vrp
- -funit-at-a-time)
+set(OptimizationFlags)
# Debug - Build
if(CMAKE_BUILD_TYPE STREQUAL Debug)
--- NEW FILE pcsx2-1.2.1_rebuild_tarball.sh ---
#!/bin/sh
#This is a Modification of a script by Gregory Hainaut
#Purpose is to strip any copyrighted etc. material
#from the publicly available tarball so make suitable for linux distribution
mkdir ~/pcsx2-1.2.1
cd ~/pcsx2-1.2.1
wget https://github.com/PCSX2/pcsx2/archive/v1.2.1.tar.gz
tar xvfz v1.2.1.tar.gz
rm v1.2.1.tar.gz
mkdir -p temporary_pcsx2;
( cp pcsx2-1.2.1/CMakeLists.txt temporary_pcsx2/CMakeLists.txt;
cp -r pcsx2-1.2.1/common temporary_pcsx2/common;
cp -r pcsx2-1.2.1/cmake temporary_pcsx2/cmake;
cp -r pcsx2-1.2.1/locales temporary_pcsx2/locales;
cp -r pcsx2-1.2.1/pcsx2 temporary_pcsx2/pcsx2;
cp -r pcsx2-1.2.1/debian-unstable-upstream temporary_pcsx2/debian-unstable-upstream;
cp -r pcsx2-1.2.1/linux_various temporary_pcsx2/linux_various;)
# separate bin to avoid retaining the .mo file
mkdir -p temporary_pcsx2/bin;
( cp pcsx2-1.2.1/bin/GameIndex.dbf temporary_pcsx2/bin/GameIndex.dbf;
cp pcsx2-1.2.1/bin/cheats_ws.zip temporary_pcsx2/bin/cheats_ws.zip;
cp -r pcsx2-1.2.1/bin/cheats temporary_pcsx2/bin/cheats;
cp -r pcsx2-1.2.1/bin/docs temporary_pcsx2/bin/docs;)
# Note: Other plugins exist but they are not 100% copyright free, so remove them.
# Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ...";
mkdir -p temporary_pcsx2/plugins;
( cp pcsx2-1.2.1/plugins/CMakeLists.txt temporary_pcsx2/plugins/CMakeLists.txt;
cp -r pcsx2-1.2.1/plugins/CDVDnull temporary_pcsx2/plugins/CDVDnull;
# Potential copyright issue. Optional anyway
cp -r pcsx2-1.2.1/plugins/onepad temporary_pcsx2/plugins/onepad;
cp -r pcsx2-1.2.1/plugins/spu2-x temporary_pcsx2/plugins/spu2-x;
cp -r pcsx2-1.2.1/plugins/zzogl-pg temporary_pcsx2/plugins/zzogl-pg;
cp -r pcsx2-1.2.1/plugins/zzogl-pg-cg temporary_pcsx2/plugins/zzogl-pg-cg;
cp -r pcsx2-1.2.1/plugins/GSdx temporary_pcsx2/plugins/GSdx;
cp -r pcsx2-1.2.1/plugins/dev9null temporary_pcsx2/plugins/dev9null;
cp -r pcsx2-1.2.1/plugins/FWnull temporary_pcsx2/plugins/FWnull;
cp -r pcsx2-1.2.1/plugins/USBnull temporary_pcsx2/plugins/USBnull;)
## Installation
# Copy the dir
rm -fr pcsx2-1.2.1
cp -r temporary_pcsx2 pcsx2-1.2.1
echo "Remove .svn directories"
find pcsx2-1.2.1 -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null
echo "Remove windows files (useless & potential copyright issues)"
# => pcsx2/windows
# Copyright header must be updated
find pcsx2-1.2.1 -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null
# => ./plugins/zzogl-pg*/opengl/Win32 (reduced to the current linux plugins)
find pcsx2-1.2.1 -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null
echo "Remove useless files (copyright issues)"
rm -fr "pcsx2-1.2.1/plugins/zzogl-pg/opengl/ZeroGSShaders"
rm -fr "pcsx2-1.2.1/common/src/Utilities/x86/MemcpyFast.cpp"
rm -fr "pcsx2-1.2.1/plugins/GSdx/baseclasses"
## BUILD
echo "Build the tar.gz file"
tar -czf v1.2.1.tar.gz pcsx2-1.2.1
## Clean
rm -fr pcsx2-1.2.1
rm -fr temporary_pcsx2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/F-19/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Feb 2014 23:01:12 -0000 1.3
+++ .cvsignore 7 Feb 2014 20:01:45 -0000 1.4
@@ -1 +1 @@
-v1.2.tar.gz
+v1.2.1.tar.gz
Index: pcsx2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/F-19/pcsx2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcsx2.spec 5 Feb 2014 23:01:13 -0000 1.2
+++ pcsx2.spec 7 Feb 2014 20:01:45 -0000 1.3
@@ -1,14 +1,14 @@
Name: pcsx2
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
Summary: A Sony Playstation2 emulator
License: GPLv3
URL: https://code.google.com/p/pcsx2/
#github source contains copyrighted material, so modified with
#script used was rebuild_pcsx2_tarball contained in Source1
-Source0: https://github.com/PCSX2/pcsx2/archive/v1.2.tar.gz
-Source1: rebuild_pcsx2_tarball.sh
-Patch1: %{name}-1.2.0_fedora_cflags_opts.diff
+Source0: https://github.com/PCSX2/pcsx2/archive/v1.2.1.tar.gz
+Source1: pcsx2-1.2.1_rebuild_tarball.sh
+Patch1: %{name}-1.2.1_fedora_cflags_opts.diff
# PCSX2 does not support running as a 64 bit application.
# http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux
ExclusiveArch: i686
@@ -46,7 +46,7 @@
this emulator anyway.
%prep
-%setup -q -n pcsx2-1.2
+%setup -q -n pcsx2-1.2.1
%patch1 -p1
# To remove executable bits from man, doc and icon files
@@ -89,12 +89,12 @@
# Install icon
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
-install -pm 644 %{_builddir}/%{name}-1.2/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
+install -pm 644 %{_builddir}/%{name}-1.2.1/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
# Install Desktop file
desktop-file-install \
--dir=%{buildroot}/%{_datadir}/applications \
-%{_builddir}/%{name}-1.2/linux_various/pcsx2.desktop
+%{_builddir}/%{name}-1.2.1/linux_various/pcsx2.desktop
#strip extra copy of icon file, Wrong place for fedora
@@ -133,6 +133,11 @@
%changelog
+* Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk> -1.2.1-1
+- Updated source to 1.2.1
+- Updated patch1 permissions
+- Source required modification to remove copyrighted files - added Source1
+
* Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk> -1.2.0-1
- Updated source to 1.2
- Updated patch1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/F-19/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Feb 2014 23:01:13 -0000 1.3
+++ sources 7 Feb 2014 20:01:45 -0000 1.4
@@ -1 +1 @@
-da48624579902322c9417edb195ad5d9 v1.2.tar.gz
+7b1ecd6397da3095581eb788603925c0 v1.2.1.tar.gz
--- pcsx2-1.2.0_fedora_cflags_opts.diff DELETED ---
--- rebuild_pcsx2_tarball.sh DELETED ---
10 years, 2 months
rpms/pcsx2/devel pcsx2-1.2.1_fedora_cflags_opts.diff, NONE, 1.1 pcsx2-1.2.1_rebuild_tarball.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 pcsx2.spec, 1.2, 1.3 sources, 1.3, 1.4 pcsx2-1.2.0_fedora_cflags_opts.diff, 1.1, NONE rebuild_pcsx2_tarball.sh, 1.1, NONE
by Giles Birchley
Author: gbirchley
Update of /cvs/nonfree/rpms/pcsx2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11679/devel
Modified Files:
.cvsignore pcsx2.spec sources
Added Files:
pcsx2-1.2.1_fedora_cflags_opts.diff
pcsx2-1.2.1_rebuild_tarball.sh
Removed Files:
pcsx2-1.2.0_fedora_cflags_opts.diff rebuild_pcsx2_tarball.sh
Log Message:
pcsx2-1.2.1_fedora_cflags_opts.diff:
CMakeLists.txt | 40 +---------------------------------------
1 file changed, 1 insertion(+), 39 deletions(-)
--- NEW FILE pcsx2-1.2.1_fedora_cflags_opts.diff ---
#Alter optimisation cflags to strip out those already automatically specified
#by %%cmake rpm macro (which uses -o2)
--- pcsx2-1.2.1/pcsx2/CMakeLists.txt
+++ pcsx2-1.2.1/pcsx2/CMakeLists.txt
@@ -32,45 +32,7 @@ set(DebugFlags
-g)
# set optimization flags
-set(OptimizationFlags
- -falign-functions
- -falign-jumps
- -falign-labels
- -falign-loops
- -fcaller-saves
- -fcprop-registers
- -fcrossjumping
- -fcse-follow-jumps
- -fcse-skip-blocks
- -fdefer-pop
- -fdelete-null-pointer-checks
- -fgcse
- -fgcse-lm
- -fif-conversion
- -fif-conversion2
- -fmerge-constants
- -foptimize-sibling-calls
- -fpeephole2
- -fregmove
- -freorder-blocks
- -freorder-functions
- -frerun-cse-after-loop
- -fsched-interblock
- -fsched-spec
- -fstrict-overflow
- -fthread-jumps
- -ftree-ccp
- -ftree-ch
- -ftree-copyrename
- -ftree-dce
- -ftree-dominator-opts
- -ftree-fre
- -ftree-lrs
- -ftree-pre
- -ftree-sra
- -ftree-ter
- -ftree-vrp
- -funit-at-a-time)
+set(OptimizationFlags)
# Debug - Build
if(CMAKE_BUILD_TYPE STREQUAL Debug)
--- NEW FILE pcsx2-1.2.1_rebuild_tarball.sh ---
#!/bin/sh
#This is a Modification of a script by Gregory Hainaut
#Purpose is to strip any copyrighted etc. material
#from the publicly available tarball so make suitable for linux distribution
mkdir ~/pcsx2-1.2.1
cd ~/pcsx2-1.2.1
wget https://github.com/PCSX2/pcsx2/archive/v1.2.1.tar.gz
tar xvfz v1.2.1.tar.gz
rm v1.2.1.tar.gz
mkdir -p temporary_pcsx2;
( cp pcsx2-1.2.1/CMakeLists.txt temporary_pcsx2/CMakeLists.txt;
cp -r pcsx2-1.2.1/common temporary_pcsx2/common;
cp -r pcsx2-1.2.1/cmake temporary_pcsx2/cmake;
cp -r pcsx2-1.2.1/locales temporary_pcsx2/locales;
cp -r pcsx2-1.2.1/pcsx2 temporary_pcsx2/pcsx2;
cp -r pcsx2-1.2.1/debian-unstable-upstream temporary_pcsx2/debian-unstable-upstream;
cp -r pcsx2-1.2.1/linux_various temporary_pcsx2/linux_various;)
# separate bin to avoid retaining the .mo file
mkdir -p temporary_pcsx2/bin;
( cp pcsx2-1.2.1/bin/GameIndex.dbf temporary_pcsx2/bin/GameIndex.dbf;
cp pcsx2-1.2.1/bin/cheats_ws.zip temporary_pcsx2/bin/cheats_ws.zip;
cp -r pcsx2-1.2.1/bin/cheats temporary_pcsx2/bin/cheats;
cp -r pcsx2-1.2.1/bin/docs temporary_pcsx2/bin/docs;)
# Note: Other plugins exist but they are not 100% copyright free, so remove them.
# Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ...";
mkdir -p temporary_pcsx2/plugins;
( cp pcsx2-1.2.1/plugins/CMakeLists.txt temporary_pcsx2/plugins/CMakeLists.txt;
cp -r pcsx2-1.2.1/plugins/CDVDnull temporary_pcsx2/plugins/CDVDnull;
# Potential copyright issue. Optional anyway
cp -r pcsx2-1.2.1/plugins/onepad temporary_pcsx2/plugins/onepad;
cp -r pcsx2-1.2.1/plugins/spu2-x temporary_pcsx2/plugins/spu2-x;
cp -r pcsx2-1.2.1/plugins/zzogl-pg temporary_pcsx2/plugins/zzogl-pg;
cp -r pcsx2-1.2.1/plugins/zzogl-pg-cg temporary_pcsx2/plugins/zzogl-pg-cg;
cp -r pcsx2-1.2.1/plugins/GSdx temporary_pcsx2/plugins/GSdx;
cp -r pcsx2-1.2.1/plugins/dev9null temporary_pcsx2/plugins/dev9null;
cp -r pcsx2-1.2.1/plugins/FWnull temporary_pcsx2/plugins/FWnull;
cp -r pcsx2-1.2.1/plugins/USBnull temporary_pcsx2/plugins/USBnull;)
## Installation
# Copy the dir
rm -fr pcsx2-1.2.1
cp -r temporary_pcsx2 pcsx2-1.2.1
echo "Remove .svn directories"
find pcsx2-1.2.1 -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null
echo "Remove windows files (useless & potential copyright issues)"
# => pcsx2/windows
# Copyright header must be updated
find pcsx2-1.2.1 -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null
# => ./plugins/zzogl-pg*/opengl/Win32 (reduced to the current linux plugins)
find pcsx2-1.2.1 -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null
echo "Remove useless files (copyright issues)"
rm -fr "pcsx2-1.2.1/plugins/zzogl-pg/opengl/ZeroGSShaders"
rm -fr "pcsx2-1.2.1/common/src/Utilities/x86/MemcpyFast.cpp"
rm -fr "pcsx2-1.2.1/plugins/GSdx/baseclasses"
## BUILD
echo "Build the tar.gz file"
tar -czf v1.2.1.tar.gz pcsx2-1.2.1
## Clean
rm -fr pcsx2-1.2.1
rm -fr temporary_pcsx2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Feb 2014 22:57:04 -0000 1.3
+++ .cvsignore 7 Feb 2014 20:00:38 -0000 1.4
@@ -1 +1 @@
-v1.2.tar.gz
+v1.2.1.tar.gz
Index: pcsx2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/pcsx2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcsx2.spec 5 Feb 2014 22:57:04 -0000 1.2
+++ pcsx2.spec 7 Feb 2014 20:00:38 -0000 1.3
@@ -1,14 +1,14 @@
Name: pcsx2
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
Summary: A Sony Playstation2 emulator
License: GPLv3
URL: https://code.google.com/p/pcsx2/
#github source contains copyrighted material, so modified with
#script used was rebuild_pcsx2_tarball contained in Source1
-Source0: https://github.com/PCSX2/pcsx2/archive/v1.2.tar.gz
-Source1: rebuild_pcsx2_tarball.sh
-Patch1: %{name}-1.2.0_fedora_cflags_opts.diff
+Source0: https://github.com/PCSX2/pcsx2/archive/v1.2.1.tar.gz
+Source1: pcsx2-1.2.1_rebuild_tarball.sh
+Patch1: %{name}-1.2.1_fedora_cflags_opts.diff
# PCSX2 does not support running as a 64 bit application.
# http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux
ExclusiveArch: i686
@@ -46,7 +46,7 @@
this emulator anyway.
%prep
-%setup -q -n pcsx2-1.2
+%setup -q -n pcsx2-1.2.1
%patch1 -p1
# To remove executable bits from man, doc and icon files
@@ -89,12 +89,12 @@
# Install icon
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
-install -pm 644 %{_builddir}/%{name}-1.2/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
+install -pm 644 %{_builddir}/%{name}-1.2.1/linux_various/pcsx2.xpm %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/
# Install Desktop file
desktop-file-install \
--dir=%{buildroot}/%{_datadir}/applications \
-%{_builddir}/%{name}-1.2/linux_various/pcsx2.desktop
+%{_builddir}/%{name}-1.2.1/linux_various/pcsx2.desktop
#strip extra copy of icon file, Wrong place for fedora
@@ -133,6 +133,11 @@
%changelog
+* Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk> -1.2.1-1
+- Updated source to 1.2.1
+- Updated patch1 permissions
+- Source required modification to remove copyrighted files - added Source1
+
* Tue Feb 04 2014 Giles Birchley <gbirchey(a)blueyonder.co.uk> -1.2.0-1
- Updated source to 1.2
- Updated patch1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/pcsx2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Feb 2014 22:57:04 -0000 1.3
+++ sources 7 Feb 2014 20:00:38 -0000 1.4
@@ -1 +1 @@
-da48624579902322c9417edb195ad5d9 v1.2.tar.gz
+7b1ecd6397da3095581eb788603925c0 v1.2.1.tar.gz
--- pcsx2-1.2.0_fedora_cflags_opts.diff DELETED ---
--- rebuild_pcsx2_tarball.sh DELETED ---
10 years, 2 months
rpms/wl-kmod/F-19 wl-kmod.spec,1.109,1.110
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16752
Modified Files:
wl-kmod.spec
Log Message:
* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.18
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- wl-kmod.spec 30 Jan 2014 08:30:15 -0000 1.109
+++ wl-kmod.spec 7 Feb 2014 13:06:28 -0000 1.110
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 1%{?dist}.17
+Release: 1%{?dist}.18
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.18
+- Rebuilt for kernel
+
* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.17
- Rebuilt for kernel
10 years, 2 months
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.166,1.167
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16628
Modified Files:
nvidia-kmod.spec
Log Message:
* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.38-5.3
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- nvidia-kmod.spec 30 Jan 2014 08:30:05 -0000 1.166
+++ nvidia-kmod.spec 7 Feb 2014 13:06:20 -0000 1.167
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.38
# Taken over by kmodtool
-Release: 5%{?dist}.2
+Release: 5%{?dist}.3
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -99,6 +99,9 @@
%changelog
+* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.38-5.3
+- Rebuilt for kernel
+
* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.38-5.2
- Rebuilt for kernel
10 years, 2 months
rpms/nvidia-304xx-kmod/F-19 nvidia-304xx-kmod.spec,1.38,1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16487
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.119-1.3
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/nvidia-304xx-kmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- nvidia-304xx-kmod.spec 30 Jan 2014 08:29:53 -0000 1.38
+++ nvidia-304xx-kmod.spec 7 Feb 2014 13:06:11 -0000 1.39
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.119
# Taken over by kmodtool
-Release: 1%{?dist}.2
+Release: 1%{?dist}.3
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.119-1.3
+- Rebuilt for kernel
+
* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.119-1.2
- Rebuilt for kernel
10 years, 2 months
rpms/nvidia-173xx-kmod/F-19 nvidia-173xx-kmod.spec,1.83,1.84
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16361
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-1.17
- Rebuilt for kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19/nvidia-173xx-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- nvidia-173xx-kmod.spec 30 Jan 2014 08:29:45 -0000 1.83
+++ nvidia-173xx-kmod.spec 7 Feb 2014 13:06:02 -0000 1.84
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.38
# Taken over by kmodtool
-Release: 1%{?dist}.16
+Release: 1%{?dist}.17
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -89,6 +89,9 @@
%changelog
+* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-1.17
+- Rebuilt for kernel
+
* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-1.16
- Rebuilt for kernel
10 years, 2 months