rpms/xorg-x11-drv-nvidia-173xx/devel .cvsignore, 1.9, 1.10 sources, 1.11, 1.12 xorg-x11-drv-nvidia-173xx.spec, 1.26, 1.27
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4771
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia-173xx.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-1
- Update to 173.14.38
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 5 Apr 2013 08:13:57 -0000 1.9
+++ .cvsignore 25 Sep 2013 21:19:23 -0000 1.10
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-173.14.37-pkg0.run
-NVIDIA-Linux-x86_64-173.14.37-pkg0.run
+NVIDIA-Linux-x86-173.14.38-pkg0.run
+NVIDIA-Linux-x86_64-173.14.38-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 5 Apr 2013 08:13:57 -0000 1.11
+++ sources 25 Sep 2013 21:19:23 -0000 1.12
@@ -1,2 +1,2 @@
-ca80332b4e27d21108ceab9314420b9b NVIDIA-Linux-x86-173.14.37-pkg0.run
-761fec0664e715df35cdb64cd4b087f4 NVIDIA-Linux-x86_64-173.14.37-pkg0.run
+382275cc02477291e110ba97569fec9f NVIDIA-Linux-x86-173.14.38-pkg0.run
+bcd613a3d9be3db32593ebada3066151 NVIDIA-Linux-x86_64-173.14.38-pkg0.run
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.26
+++ xorg-x11-drv-nvidia-173xx.spec 25 Sep 2013 21:19:23 -0000 1.27
@@ -4,8 +4,8 @@
%global __strip /bin/true
Name: xorg-x11-drv-nvidia-173xx
-Version: 173.14.37
-Release: 5%{?dist}
+Version: 173.14.38
+Release: 1%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -340,6 +340,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.38-1
+- Update to 173.14.38
+
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
- Avoid Obsoletes until rhbz#985944
- Restore destop file
10 years, 7 months
rpms/buildsys-build-rpmfusion/F-18 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.70, 1.71 buildsys-build-rpmfusion.spec, 1.86, 1.87
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3572
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:18-46
- rebuild for kernel 3.10.12-100.fc18
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- buildsys-build-rpmfusion.spec 14 Sep 2013 14:14:03 -0000 1.86
+++ buildsys-build-rpmfusion.spec 25 Sep 2013 21:00:26 -0000 1.87
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 18
-Release: 45
+Release: 46
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:18-46
+- rebuild for kernel 3.10.12-100.fc18
+
* Sat Sep 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-45
- rebuild for kernel 3.10.11-100.fc18
10 years, 7 months
rpms/nvidia-304xx-kmod/devel kernel_v3.11.patch, 1.1, 1.2 nvidia-304xx-kmod.spec, 1.2, 1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3282
Modified Files:
kernel_v3.11.patch nvidia-304xx-kmod.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-3
- patch for 3.12.0 kernel
kernel_v3.11.patch:
nv-linux.h | 4 ++++
nv.c | 4 ++++
2 files changed, 8 insertions(+)
Index: kernel_v3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/kernel_v3.11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel_v3.11.patch 13 Aug 2013 13:15:49 -0000 1.1
+++ kernel_v3.11.patch 25 Sep 2013 20:58:24 -0000 1.2
@@ -12,3 +12,18 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+--- a/kernel/nv.c
++++ b/kernel/nv.c
+@@ -16,8 +16,12 @@
+ #include "rmil.h"
+
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)
++MODULE_LICENSE("GPL");
++#else
+ MODULE_LICENSE("NVIDIA");
+ #endif
++#endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+ #endif
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-304xx-kmod.spec 13 Aug 2013 13:29:07 -0000 1.2
+++ nvidia-304xx-kmod.spec 25 Sep 2013 20:58:24 -0000 1.3
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.108
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -81,6 +81,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-3
+- patch for 3.12.0 kernel
+
* Tue Aug 13 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-2
- build for akmod
10 years, 7 months
rpms/catalyst-kmod/F-19 catalyst-kmod.spec,1.37,1.38
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1805
Modified Files:
catalyst-kmod.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.2.beta1.6
- Rebuilt for kernel
* Wed May 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.6-0.1.beta
- Update to Catalyst 13.6beta (internal version 13.101)
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/catalyst-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- catalyst-kmod.spec 30 Aug 2013 06:13:47 -0000 1.37
+++ catalyst-kmod.spec 25 Sep 2013 20:36:39 -0000 1.38
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 13.8
-Release: 0.2.beta1%{?dist}.5
+Release: 0.2.beta1%{?dist}.6
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -99,6 +99,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.2.beta1.6
+- Rebuilt for kernel
+
* Fri Aug 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.5
- Rebuilt for kernel
10 years, 7 months
rpms/buildsys-build-rpmfusion/F-19 buildsys-build-rpmfusion.spec, 1.64, 1.65
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29255
Modified Files:
buildsys-build-rpmfusion.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:19-24
- rebuild for kernel 3.11.1-200.fc19
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- buildsys-build-rpmfusion.spec 25 Sep 2013 14:22:57 -0000 1.64
+++ buildsys-build-rpmfusion.spec 25 Sep 2013 19:33:48 -0000 1.65
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 19
-Release: 23
+Release: 24
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:19-24
+- rebuild for kernel 3.11.1-200.fc19
+
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:19-23
- rebuild for kernel 3.11.1-200.fc19
10 years, 7 months
rpms/buildsys-build-rpmfusion/F-19 buildsys-build-rpmfusion.spec, 1.63, 1.64
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8894
Modified Files:
buildsys-build-rpmfusion.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:19-23
- rebuild for kernel 3.11.1-200.fc19
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- buildsys-build-rpmfusion.spec 21 Sep 2013 14:55:17 -0000 1.63
+++ buildsys-build-rpmfusion.spec 25 Sep 2013 14:22:57 -0000 1.64
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 19
-Release: 22
+Release: 23
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:19-23
+- rebuild for kernel 3.11.1-200.fc19
+
* Sat Sep 21 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 10:19-22
- rebuild for kernel 3.11.1-200.fc19
10 years, 7 months
rpms/audacity-freeworld/F-19 audacity-2.0.4-equalization-segfault.patch, NONE, 1.1 audacity-freeworld.spec, 1.28, 1.29
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12477/F-19
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-2.0.4-equalization-segfault.patch
Log Message:
Add upstream patch to avoid segfault when starting Effects|Equalization
audacity-2.0.4-equalization-segfault.patch:
Equalization.cpp | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
--- NEW FILE audacity-2.0.4-equalization-segfault.patch ---
--- src/effects/Equalization.cpp.orig 2013-09-01 08:03:13.000000000 +1000
+++ src/effects/Equalization.cpp 2013-09-22 13:07:32.979172233 +1000
@@ -1195,10 +1195,8 @@
szrG = new wxBoxSizer( wxHORIZONTAL );
szrG->Add(0, 0, 0); // horizontal spacer, will be used to position LH EQ slider
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
m_sliders[i] = new wxSliderBugfix(this, ID_SLIDER + i, 0, -20, +20,
wxDefaultPosition, wxSize(20, 124), wxSL_VERTICAL|
wxSL_INVERSE);
@@ -1965,10 +1963,8 @@
void EqualizationDialog::OnSlider(wxCommandEvent & event)
{
wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject();
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
if( s == m_sliders[i])
{
int posn = m_sliders[i]->GetValue();
@@ -2041,10 +2037,8 @@
double loLog = log10(mLoFreq);
double hiLog = log10(mHiFreq);
double denom = hiLog - loLog;
- for (int i = 1; thirdOct[i] <= mHiFreq; ++i) //go along the spacers
+ for (int i = 1; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i) //go along the spacers
{
- if( i == NUMBER_OF_BANDS )
- break;
float posn = range*(log10(thirdOct[i])-loLog)/denom; //centre of this slider, from start
w = start + ((int)(posn+.5)) - EQsliderSize.x/2; //LH edge of slider, from 0
w = w - so_far; //gap needed to put it here
@@ -2618,10 +2612,8 @@
{
if(!drawMode) // Graphic (Slider) mode. Invert the sliders.
{
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
m_EQVals[i] = -m_EQVals[i];
int newPosn = (int)m_EQVals[i];
m_sliders[i]->SetValue( newPosn );
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-19/audacity-freeworld.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- audacity-freeworld.spec 14 Sep 2013 14:39:19 -0000 1.28
+++ audacity-freeworld.spec 23 Sep 2013 11:36:47 -0000 1.29
@@ -1,7 +1,7 @@
Name: audacity-freeworld
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -23,6 +23,7 @@
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-2.0.2-desktop.in.patch
Patch4: audacity-2.0.3-non-dl-ffmpeg.patch
+Patch5: audacity-2.0.4-equalization-segfault.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -82,7 +83,8 @@
done
%patch3 -b .desktop.old
-%patch4 -p1
+%patch4 -p1 -b .2.0.3-non-dl-ffmpeg
+%patch5 -b .2.0.4-equalization-segfault
%build
@@ -169,9 +171,13 @@
%{_datadir}/icons/hicolor/*/apps/%{realname}.*
%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
+%doc lib-src/libnyquist/nyquist/license.txt lib-src/libnyquist/nyquist/Readme.txt
%changelog
+* Sun Sep 22 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-2
+- Add upstream patch to avoid segfault when starting Effects|Equalization
+
* Sat Sep 14 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-1
- update to upstream release 2.0.4
- rebase audacity-2.0.1-libmp3lame-default
10 years, 7 months
rpms/audacity-freeworld/F-18 audacity-2.0.4-equalization-segfault.patch, NONE, 1.1 audacity-freeworld.spec, 1.27, 1.28
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12477/F-18
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-2.0.4-equalization-segfault.patch
Log Message:
Add upstream patch to avoid segfault when starting Effects|Equalization
audacity-2.0.4-equalization-segfault.patch:
Equalization.cpp | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
--- NEW FILE audacity-2.0.4-equalization-segfault.patch ---
--- src/effects/Equalization.cpp.orig 2013-09-01 08:03:13.000000000 +1000
+++ src/effects/Equalization.cpp 2013-09-22 13:07:32.979172233 +1000
@@ -1195,10 +1195,8 @@
szrG = new wxBoxSizer( wxHORIZONTAL );
szrG->Add(0, 0, 0); // horizontal spacer, will be used to position LH EQ slider
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
m_sliders[i] = new wxSliderBugfix(this, ID_SLIDER + i, 0, -20, +20,
wxDefaultPosition, wxSize(20, 124), wxSL_VERTICAL|
wxSL_INVERSE);
@@ -1965,10 +1963,8 @@
void EqualizationDialog::OnSlider(wxCommandEvent & event)
{
wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject();
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
if( s == m_sliders[i])
{
int posn = m_sliders[i]->GetValue();
@@ -2041,10 +2037,8 @@
double loLog = log10(mLoFreq);
double hiLog = log10(mHiFreq);
double denom = hiLog - loLog;
- for (int i = 1; thirdOct[i] <= mHiFreq; ++i) //go along the spacers
+ for (int i = 1; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i) //go along the spacers
{
- if( i == NUMBER_OF_BANDS )
- break;
float posn = range*(log10(thirdOct[i])-loLog)/denom; //centre of this slider, from start
w = start + ((int)(posn+.5)) - EQsliderSize.x/2; //LH edge of slider, from 0
w = w - so_far; //gap needed to put it here
@@ -2618,10 +2612,8 @@
{
if(!drawMode) // Graphic (Slider) mode. Invert the sliders.
{
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
m_EQVals[i] = -m_EQVals[i];
int newPosn = (int)m_EQVals[i];
m_sliders[i]->SetValue( newPosn );
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-18/audacity-freeworld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- audacity-freeworld.spec 14 Sep 2013 22:35:58 -0000 1.27
+++ audacity-freeworld.spec 23 Sep 2013 11:36:46 -0000 1.28
@@ -1,7 +1,7 @@
Name: audacity-freeworld
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -23,6 +23,7 @@
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-2.0.2-desktop.in.patch
Patch4: audacity-2.0.3-non-dl-ffmpeg.patch
+Patch5: audacity-2.0.4-equalization-segfault.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -82,7 +83,8 @@
done
%patch3 -b .desktop.old
-%patch4 -p1
+%patch4 -p1 -b .2.0.3-non-dl-ffmpeg
+%patch5 -b .2.0.4-equalization-segfault
%build
@@ -169,9 +171,13 @@
%{_datadir}/icons/hicolor/*/apps/%{realname}.*
%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
+%doc lib-src/libnyquist/nyquist/license.txt lib-src/libnyquist/nyquist/Readme.txt
%changelog
+* Sun Sep 22 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-2
+- Add upstream patch to avoid segfault when starting Effects|Equalization
+
* Sat Sep 14 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-1
- update to upstream release 2.0.4
- rebase audacity-2.0.1-libmp3lame-default
10 years, 7 months
rpms/audacity-freeworld/devel audacity-2.0.4-equalization-segfault.patch, NONE, 1.1 audacity-freeworld.spec, 1.28, 1.29
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12477/devel
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-2.0.4-equalization-segfault.patch
Log Message:
Add upstream patch to avoid segfault when starting Effects|Equalization
audacity-2.0.4-equalization-segfault.patch:
Equalization.cpp | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
--- NEW FILE audacity-2.0.4-equalization-segfault.patch ---
--- src/effects/Equalization.cpp.orig 2013-09-01 08:03:13.000000000 +1000
+++ src/effects/Equalization.cpp 2013-09-22 13:07:32.979172233 +1000
@@ -1195,10 +1195,8 @@
szrG = new wxBoxSizer( wxHORIZONTAL );
szrG->Add(0, 0, 0); // horizontal spacer, will be used to position LH EQ slider
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
m_sliders[i] = new wxSliderBugfix(this, ID_SLIDER + i, 0, -20, +20,
wxDefaultPosition, wxSize(20, 124), wxSL_VERTICAL|
wxSL_INVERSE);
@@ -1965,10 +1963,8 @@
void EqualizationDialog::OnSlider(wxCommandEvent & event)
{
wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject();
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
if( s == m_sliders[i])
{
int posn = m_sliders[i]->GetValue();
@@ -2041,10 +2037,8 @@
double loLog = log10(mLoFreq);
double hiLog = log10(mHiFreq);
double denom = hiLog - loLog;
- for (int i = 1; thirdOct[i] <= mHiFreq; ++i) //go along the spacers
+ for (int i = 1; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i) //go along the spacers
{
- if( i == NUMBER_OF_BANDS )
- break;
float posn = range*(log10(thirdOct[i])-loLog)/denom; //centre of this slider, from start
w = start + ((int)(posn+.5)) - EQsliderSize.x/2; //LH edge of slider, from 0
w = w - so_far; //gap needed to put it here
@@ -2618,10 +2612,8 @@
{
if(!drawMode) // Graphic (Slider) mode. Invert the sliders.
{
- for (int i = 0; thirdOct[i] <= mHiFreq; ++i)
+ for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{
- if( i == NUMBER_OF_BANDS )
- break;
m_EQVals[i] = -m_EQVals[i];
int newPosn = (int)m_EQVals[i];
m_sliders[i]->SetValue( newPosn );
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- audacity-freeworld.spec 14 Sep 2013 14:34:28 -0000 1.28
+++ audacity-freeworld.spec 23 Sep 2013 11:36:47 -0000 1.29
@@ -1,7 +1,7 @@
Name: audacity-freeworld
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -23,6 +23,7 @@
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-2.0.2-desktop.in.patch
Patch4: audacity-2.0.3-non-dl-ffmpeg.patch
+Patch5: audacity-2.0.4-equalization-segfault.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -82,7 +83,8 @@
done
%patch3 -b .desktop.old
-%patch4 -p1
+%patch4 -p1 -b .2.0.3-non-dl-ffmpeg
+%patch5 -b .2.0.4-equalization-segfault
%build
@@ -169,9 +171,13 @@
%{_datadir}/icons/hicolor/*/apps/%{realname}.*
%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
+%doc lib-src/libnyquist/nyquist/license.txt lib-src/libnyquist/nyquist/Readme.txt
%changelog
+* Sun Sep 22 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-2
+- Add upstream patch to avoid segfault when starting Effects|Equalization
+
* Sat Sep 14 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-1
- update to upstream release 2.0.4
- rebase audacity-2.0.1-libmp3lame-default
10 years, 7 months
rpms/freetype-freeworld/F-18 0001-Fix-vertical-size-of-emboldened-glyphs.patch, NONE, 1.1 freetype-freeworld.spec, 1.27, 1.28
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17728/F-18
Modified Files:
freetype-freeworld.spec
Added Files:
0001-Fix-vertical-size-of-emboldened-glyphs.patch
Log Message:
* Sun Sep 22 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.10-4
- Apply 0001-Fix-vertical-size-of-emboldened-glyphs.patch from Fedora
0001-Fix-vertical-size-of-emboldened-glyphs.patch:
ftsynth.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE 0001-Fix-vertical-size-of-emboldened-glyphs.patch ---
>From 31e726d939e7b79506d11164d259c9789e429761 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad(a)behdad.org>
Date: Fri, 20 Sep 2013 07:20:53 +0200
Subject: [PATCH] Fix vertical size of emboldened glyphs.
Cf. https://bugzilla.gnome.org/show_bug.cgi?id=686709
* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Adjust `horiBearingY'
also.
---
src/base/ftsynth.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index 241d37f..3098a60 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -4,7 +4,7 @@
/* */
/* FreeType synthesizing code for emboldening and slanting (body). */
/* */
-/* Copyright 2000-2006, 2010, 2012 by */
+/* Copyright 2000-2006, 2010, 2012, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -139,10 +139,11 @@
if ( slot->advance.y )
slot->advance.y += ystr;
- slot->metrics.width += xstr;
- slot->metrics.height += ystr;
- slot->metrics.horiAdvance += xstr;
- slot->metrics.vertAdvance += ystr;
+ slot->metrics.width += xstr;
+ slot->metrics.height += ystr;
+ slot->metrics.horiAdvance += xstr;
+ slot->metrics.vertAdvance += ystr;
+ slot->metrics.horiBearingY += ystr;
/* XXX: 16-bit overflow case must be excluded before here */
if ( slot->format == FT_GLYPH_FORMAT_BITMAP )
--
1.8.3.1
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-18/freetype-freeworld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freetype-freeworld.spec 19 Mar 2013 17:27:08 -0000 1.27
+++ freetype-freeworld.spec 22 Sep 2013 00:03:23 -0000 1.28
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.4.10
-Release: 3%{?dist}
+Release: 4%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -19,6 +19,9 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=891457
Patch90: freetype-2.4.10-fix-emboldening.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=686709
+Patch91: 0001-Fix-vertical-size-of-emboldened-glyphs.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
Provides: freetype-bytecode
@@ -42,13 +45,14 @@
%prep
%setup -q -n freetype-%{version}
-%patch21 -p1 -b .enable-spr
+%patch21 -p1 -b .enable-spr
-%patch46 -p1 -b .enable-valid
+%patch46 -p1 -b .enable-valid
%patch89 -p1 -b .CVE-2012-5669
%patch90 -p1 -b .fix-emboldening
+%patch91 -p1 -b .emboldened-glyphs
%build
@@ -94,6 +98,9 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sun Sep 22 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.10-4
+- Apply 0001-Fix-vertical-size-of-emboldened-glyphs.patch from Fedora
+
* Tue Mar 19 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.10-3
- Add freetype-2.4.10-fix-emboldening.patch from Fedora freetype (rh#891457)
- Fix License tag
10 years, 7 months