rpms/mame/devel mame-systempa.patch, NONE, 1.1 .cvsignore, 1.88, 1.89 mame.spec, 1.106, 1.107 sources, 1.88, 1.89 mame-optflags.patch, 1.1, NONE mame-systemlibs.patch, 1.8, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21315
Modified Files:
.cvsignore mame.spec sources
Added Files:
mame-systempa.patch
Removed Files:
mame-optflags.patch mame-systemlibs.patch
Log Message:
* Sun Jul 05 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.163-1
- Updated to 0.163
- Cleaned up the spec file further
- Dropped upstreamed patches
- Patched to use system PortAudio
mame-systempa.patch:
makefile | 5 +++++
scripts/genie.lua | 5 +++++
scripts/src/3rdparty.lua | 6 ++++++
3 files changed, 16 insertions(+)
--- NEW FILE mame-systempa.patch ---
diff -up mame-0.163/makefile.systempa mame-0.163/makefile
--- mame-0.163/makefile.systempa 2015-07-05 10:40:43.933061000 +0200
+++ mame-0.163/makefile 2015-07-05 11:09:47.122619628 +0200
@@ -60,6 +60,7 @@
# USE_SYSTEM_LIB_LUA = 1
# USE_SYSTEM_LIB_SQLITE3 = 1
# USE_SYSTEM_LIB_PORTMIDI = 1
+# USE_SYSTEM_LIB_PORTAUDIO = 1
# MESA_INSTALL_ROOT = /opt/mesa
# SDL_INSTALL_ROOT = /opt/sdl2
@@ -336,6 +337,10 @@ ifndef USE_SYSTEM_LIB_PORTMIDI
PARAMS += --with-bundled-portmidi
endif
+ifndef USE_SYSTEM_LIB_PORTAUDIO
+PARAMS += --with-bundled-portaudio
+endif
+
#-------------------------------------------------
# distribution may change things
#-------------------------------------------------
diff -up mame-0.163/scripts/genie.lua.systempa mame-0.163/scripts/genie.lua
--- mame-0.163/scripts/genie.lua.systempa 2015-07-05 11:11:18.522715238 +0200
+++ mame-0.163/scripts/genie.lua 2015-07-05 11:11:45.958044104 +0200
@@ -129,6 +129,11 @@ newoption {
}
newoption {
+ trigger = 'with-bundled-portaudio',
+ description = 'Build bundled PortAudio library',
+}
+
+newoption {
trigger = "distro",
description = "Choose distribution",
allowed = {
diff -up mame-0.163/scripts/src/3rdparty.lua.systempa mame-0.163/scripts/src/3rdparty.lua
--- mame-0.163/scripts/src/3rdparty.lua.systempa 2015-07-05 11:17:42.332171148 +0200
+++ mame-0.163/scripts/src/3rdparty.lua 2015-07-05 11:15:46.737835996 +0200
@@ -650,6 +650,7 @@ end
-- PortAudio library objects
--------------------------------------------------
+if _OPTIONS["with-bundled-portaudio"] then
project "portaudio"
uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
kind "StaticLib"
@@ -775,6 +776,11 @@ project "portaudio"
"-Wshadow"
}
end
+else
+links {
+ "portaudio",
+}
+end
--------------------------------------------------
-- UnitTest++ library objects
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore 8 Jun 2015 05:36:01 -0000 1.88
+++ .cvsignore 5 Jul 2015 20:04:17 -0000 1.89
@@ -1,2 +1,2 @@
-mame0162s.exe
+mame0163s.exe
whatsnew.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mame.spec 8 Jun 2015 06:11:45 -0000 1.106
+++ mame.spec 5 Jul 2015 20:04:17 -0000 1.107
@@ -5,7 +5,7 @@
%bcond_with debug
%bcond_with simd
-%global baseversion 162
+%global baseversion 163
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -14,12 +14,7 @@
%endif
Name: mame
-%if 0%{?sourceupdate}
-Version: 0.%{baseversion}u%{sourceupdate}
-%else
Version: 0.%{baseversion}
-%endif
-
Release: 1%{?svnrelease}%{?dist}
Summary: Multiple Arcade Machine Emulator
@@ -28,8 +23,7 @@
Source0: http://mamedev.org/downloader.php?file=%{name}0%{baseversion}/%{name}0%{b...
Source100: whatsnew.zip
Patch0: %{name}-fortify.patch
-Patch1: %{name}-optflags.patch
-Patch2: %{name}-systemlibs.patch
+Patch1: %{name}-systempa.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
@@ -39,9 +33,8 @@
BuildRequires: lua-devel >= 5.3.0
%endif
#BuildRequires: mongoose-devel
-%if !0%{?svn}
BuildRequires: p7zip
-%endif
+BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
BuildRequires: python
BuildRequires: qt-devel
@@ -132,8 +125,7 @@
-o -wholename ./makefile \) -exec sed -i 's@\r@@' {} \;
%patch0 -p1 -b .fortify
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .systemlibs
+%patch1 -p1 -b .systempa
# Fix encoding
#for whatsnew in whatsnew_0162.txt; do
@@ -187,11 +179,13 @@
%if 0%{?fedora} >= 22
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 VERBOSE=1 USE_SYSTEM_LIB_EXPAT=1 \
USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_JPEG=1 USE_SYSTEM_LIB_FLAC=1 \
- USE_SYSTEM_LIB_LUA=1 USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1"
+ USE_SYSTEM_LIB_LUA=1 USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1 \
+ USE_SYSTEM_LIB_PORTAUDIO=1 SDL_INI_PATH=%{_sysconfdir}/%{name};"
%else
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 VERBOSE=1 USE_SYSTEM_LIB_EXPAT=1 \
USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_JPEG=1 USE_SYSTEM_LIB_FLAC=1 \
- USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1"
+ USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1 \
+ USE_SYSTEM_LIB_PORTAUDIO=1 SDL_INI_PATH=%{_sysconfdir}/%{name};"
%endif
#only use assembly on supported architectures
@@ -199,9 +193,6 @@
MAME_FLAGS="$MAME_FLAGS NOASM=1"
%endif
-#genie makes passing INI_PATH as define impossible
-sed -i 's@"$HOME/.APP_NAME;.;ini"@"%{_sysconfdir}/%{name};"@' src/osd/sdl/sdlmain.c
-
%if %{with ldplayer}
make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
@@ -321,6 +312,12 @@
%changelog
+* Sun Jul 05 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.163-1
+- Updated to 0.163
+- Cleaned up the spec file further
+- Dropped upstreamed patches
+- Patched to use system PortAudio
+
* Sun Jun 07 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.162-1
- Updated to 0.162
- Adapted to the new build system
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources 8 Jun 2015 05:36:01 -0000 1.88
+++ sources 5 Jul 2015 20:04:17 -0000 1.89
@@ -1,2 +1,2 @@
-027efe41a3d799f8016f7508cf30ff3d mame0162s.exe
-4caaa10bf96663fab37c93609900897d whatsnew.zip
+ef24ea10296f506f7959c09dd545a03e mame0163s.exe
+e61e111998d3e7f575e9414006a0eb77 whatsnew.zip
--- mame-optflags.patch DELETED ---
--- mame-systemlibs.patch DELETED ---
8 years, 9 months
rpms/vdr-softhddevice/devel chartype.patch, NONE, 1.1 vdr-softhddevice.spec, 1.26, 1.27 arm.patch, 1.1, NONE
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-softhddevice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13777/devel
Modified Files:
vdr-softhddevice.spec
Added Files:
chartype.patch
Removed Files:
arm.patch
Log Message:
chartype.patch:
softhddev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE chartype.patch ---
--- softhddev.c.orig 2015-06-29 09:54:49.192694598 +0200
+++ softhddev.c 2015-06-29 09:55:25.527691030 +0200
@@ -92,7 +92,7 @@
static signed char ConfigStartSuspended; ///< flag to start in suspend mode
static char ConfigFullscreen; ///< fullscreen modus
static const char *X11ServerArguments; ///< default command arguments
-static char ConfigStillDecoder; ///< hw/sw decoder for still picture
+static signed char ConfigStillDecoder; ///< hw/sw decoder for still picture
static pthread_mutex_t SuspendLockMutex; ///< suspend lock mutex
Index: vdr-softhddevice.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/vdr-softhddevice.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vdr-softhddevice.spec 30 Jun 2015 16:18:29 -0000 1.26
+++ vdr-softhddevice.spec 5 Jul 2015 12:28:12 -0000 1.27
@@ -4,7 +4,7 @@
Name: vdr-softhddevice
Version: 0.6.0
-Release: 29.%{gitdate}git%{shortcommit}%{?dist}
+Release: 30.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -15,7 +15,7 @@
# http://projects.vdr-developer.org/issues/1417
Patch0: exit-crash.patch
# http://projects.vdr-developer.org/issues/1916
-Patch1: arm.patch
+Patch1: chartype.patch
BuildRequires: vdr-devel >= 1.7.22
BuildRequires: gettext
@@ -82,6 +82,9 @@
%license AGPL-3.0.txt
%changelog
+* Sat Jul 04 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.0-30.20150630gitec58e45
+- renamed arm.patch to chartype.patch
+
* Tue Jun 30 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.0-29.20150630gitec58e45
- update for new git snapshot
--- arm.patch DELETED ---
8 years, 9 months
rpms/nemo-dropbox/devel .cvsignore, 1.2, 1.3 nemo-dropbox.spec, 1.2, 1.3 sources, 1.2, 1.3
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nemo-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3959
Modified Files:
.cvsignore nemo-dropbox.spec sources
Log Message:
* Sun Jul 05 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.0-1
- update to 2.6.0
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nemo-dropbox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Dec 2014 16:44:29 -0000 1.2
+++ .cvsignore 5 Jul 2015 10:01:52 -0000 1.3
@@ -1 +1 @@
-nemo-extensions-2.4.x.tar.gz
+nemo-extensions-2.6.x.tar.gz
Index: nemo-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nemo-dropbox/devel/nemo-dropbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nemo-dropbox.spec 7 Jan 2015 09:49:48 -0000 1.2
+++ nemo-dropbox.spec 5 Jul 2015 10:01:52 -0000 1.3
@@ -1,14 +1,14 @@
Summary: Dropbox extension for nemo
Name: nemo-dropbox
-Version: 2.4.0
+Version: 2.6.0
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
URL: http://cinnamon.linuxmint.com
# To generate tarball
-# wget https://github.com/linuxmint/nemo-extensions/tarball/%%{_internal_version} -O nemo-extensions-2.4.x.git%%{_internal_version}.tar.gz
-#Source0: http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-ext...
-Source0: http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-ext...
+# wget https://github.com/linuxmint/nemo-extensions/tarball/%%{_internal_version} -O nemo-extensions-2.6.x.git%%{_internal_version}.tar.gz
+#Source0: http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-ext...
+Source0: http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-ext...
ExclusiveArch: i686 x86_64
@@ -28,7 +28,7 @@
your computers automatically.
%prep
-%setup -q -n nemo-extensions-2.4.x
+%setup -q -n nemo-extensions-2.6.x
%build
pushd nemo-dropbox
@@ -58,6 +58,9 @@
%changelog
+* Sun Jul 05 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.0-1
+- update to 2.6.0
+
* Wed Jan 07 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.0-1
- use internal version
- add ExclusiveArch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nemo-dropbox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Dec 2014 16:44:29 -0000 1.2
+++ sources 5 Jul 2015 10:01:52 -0000 1.3
@@ -1 +1 @@
-e3fd0a43d0d3e76f81832e01cabe35f7 nemo-extensions-2.4.x.tar.gz
+6bfdae21ff24e664dc22bbee4f1056ab nemo-extensions-2.6.x.tar.gz
8 years, 9 months
rpms/xv/devel xv.spec,1.17,1.18
by L. Gabriel Somlo
Author: somlo
Update of /cvs/nonfree/rpms/xv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12781/devel
Modified Files:
xv.spec
Log Message:
fix typo in specfile
Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/xv.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xv.spec 3 Jul 2015 16:02:27 -0000 1.17
+++ xv.spec 3 Jul 2015 16:21:45 -0000 1.18
@@ -3,7 +3,7 @@
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -297,11 +297,14 @@
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-23
+- fix another typo in spec file
+
* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-22
- fix spec file (use -p1 with utf8 and smoothing patches)
* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-21
-- patch by Erling A. Jacobsen to fix iTXt/utf8 png comment bug (#3131, #3704)
+- patch by Erling A. Jacobsen to fix iTXt/utf8 png comment bug (#3141, #3704)
- patch by Erling A. Jacobsen to fix smoothing off-by-one bug (#3142)
* Wed Oct 22 2014 Paul Howarth <paul(a)city-fan.org> 3.10a.jumbopatch.20070520-20
8 years, 10 months
rpms/xv/devel .cvsignore,1.3,1.4 sources,1.3,1.4 xv.spec,1.16,1.17
by L. Gabriel Somlo
Author: somlo
Update of /cvs/nonfree/rpms/xv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11961/devel
Modified Files:
.cvsignore sources xv.spec
Log Message:
fixed spec file error
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Sep 2009 08:42:43 -0000 1.3
+++ .cvsignore 3 Jul 2015 16:02:27 -0000 1.4
@@ -1,5 +1,5 @@
xv-3.10a-jumbo-patches-20070520.tar.gz
xv-3.10a.tar.gz
+xv-non-english-Xman-pages.tar.bz2
xv.png
xvman310a-html.tar.gz
-xv-non-english-Xman-pages.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Sep 2009 08:42:43 -0000 1.3
+++ sources 3 Jul 2015 16:02:27 -0000 1.4
@@ -1,5 +1,5 @@
9fb2d0ec320498105cafeba38a588472 xv-3.10a-jumbo-patches-20070520.tar.gz
2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz
+4e5a6582ad76974309ca8bf8fb56b671 xv-non-english-Xman-pages.tar.bz2
b08c658ae55f805d5671d7d1bc9142c1 xv.png
5455638774a6cd2563d8e94fa58f3548 xvman310a-html.tar.gz
-4e5a6582ad76974309ca8bf8fb56b671 xv-non-english-Xman-pages.tar.bz2
Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/xv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xv.spec 3 Jul 2015 15:36:15 -0000 1.16
+++ xv.spec 3 Jul 2015 16:02:27 -0000 1.17
@@ -3,7 +3,7 @@
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -157,10 +157,10 @@
%patch8
# fix crash when viewing PNGs with iTXt/utf8 comments
-%patch9
+%patch9 -p1
# fix crash due to off-by-one smoothing bug
-%patch10
+%patch10 -p1
# Include permission to distribute
%{__install} -m 0644 -p %{SOURCE2} .
@@ -297,6 +297,9 @@
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-22
+- fix spec file (use -p1 with utf8 and smoothing patches)
+
* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-21
- patch by Erling A. Jacobsen to fix iTXt/utf8 png comment bug (#3131, #3704)
- patch by Erling A. Jacobsen to fix smoothing off-by-one bug (#3142)
8 years, 10 months
rpms/xv/devel xv-3.10a-png-itxt.patch, NONE, 1.1 xv-3.10a-smooth-fix2.patch, NONE, 1.1 xv.spec, 1.15, 1.16
by L. Gabriel Somlo
Author: somlo
Update of /cvs/nonfree/rpms/xv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11041
Modified Files:
xv.spec
Added Files:
xv-3.10a-png-itxt.patch xv-3.10a-smooth-fix2.patch
Log Message:
* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-21
- patch by Erling A. Jacobsen to fix iTXt/utf8 png comment bug (#3131, #3704)
- patch by Erling A. Jacobsen to fix smoothing off-by-one bug (#3142)
xv-3.10a-png-itxt.patch:
xvpng.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xv-3.10a-png-itxt.patch ---
Prevents crash when encountering PNGs with utf8 comments
Signed-off-by: Erling A. Jacobsen <linuxcub(a)email.dk>
diff -ur xv-3.10a-orig/xvpng.c xv-3.10a/xvpng.c
--- xv-3.10a-orig/xvpng.c 2014-01-21 14:56:24.168673164 +0100
+++ xv-3.10a/xvpng.c 2014-01-21 15:01:02.567883070 +0100
@@ -1149,7 +1149,7 @@
for (i = 0; i < _num_text; i++)
commentsize += strlen(_text[i].key) + 1 +
- _text[i].text_length + 2;
+ (_text[i].text_length ? _text[i].text_length : _text[i].itxt_length) + 2;
if ((pinfo->comment = malloc(commentsize)) == NULL) {
png_warning(png_ptr,"can't allocate comment string");
xv-3.10a-smooth-fix2.patch:
xvsmooth.c | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
--- NEW FILE xv-3.10a-smooth-fix2.patch ---
Fixes off-by-one error that could cause crashes
and uses a better way of interpolating/rounding
that ensures, I think, that all the data will
be taken into account when averaging pixels.
Signed-off-by: Erling A. Jacobsen <linuxcub(a)email.dk>
diff -ur xv-3.10a-orig/xvsmooth.c xv-3.10a/xvsmooth.c
--- xv-3.10a-orig/xvsmooth.c 2008-02-24 20:13:53.000000000 +0100
+++ xv-3.10a/xvsmooth.c 2008-02-25 23:25:32.000000000 +0100
@@ -254,7 +254,7 @@
bperpix = (is24) ? 3 : 1;
for (j=0; j<=swide; j++)
- pixarr[j] = (j*dwide + (15*swide)/16) / swide;
+ pixarr[j] = ((2 * j + 1 ) * dwide) / ( 2 * swide);
cptr = pic824; cptr1 = cptr + swide * bperpix;
@@ -369,26 +369,10 @@
lastline = linecnt = 0;
- for (i=0, clptr=pic824; i<=shigh; i++, clptr+=swide*bperpix) {
+ for (i=0, clptr=pic824; i<shigh; i++, clptr+=swide*bperpix) {
ProgressMeter(0, shigh, i, "Smooth");
if ((i&15) == 0) WaitCursor();
- thisline = (i * dhigh + (15*shigh)/16) / shigh;
-
- if (thisline != lastline) { /* copy a line to pic24 */
- for (j=0; j<dwide; j++) {
- *pic24++ = lbufR[j] / linecnt;
- *pic24++ = lbufG[j] / linecnt;
- *pic24++ = lbufB[j] / linecnt;
- }
-
- xvbzero( (char *) lbufR, dwide * sizeof(int)); /* clear out line bufs */
- xvbzero( (char *) lbufG, dwide * sizeof(int));
- xvbzero( (char *) lbufB, dwide * sizeof(int));
- linecnt = 0; lastline = thisline;
- }
-
-
for (j=0, cxptr=cxarr; j<dwide; j++, cxptr++) {
cptr = clptr + *cxptr * bperpix;
if (*cxptr < swide-1) cptr1 = cptr + 1*bperpix;
@@ -407,6 +391,21 @@
}
linecnt++;
+
+ thisline = ((2 * i + 3) * dhigh) / (2 * shigh);
+
+ if (thisline != lastline) { /* copy a line to pic24 */
+ for (j=0; j<dwide; j++) {
+ *pic24++ = lbufR[j] / linecnt;
+ *pic24++ = lbufG[j] / linecnt;
+ *pic24++ = lbufB[j] / linecnt;
+ }
+
+ xvbzero( (char *) lbufR, dwide * sizeof(int)); /* clear out line bufs */
+ xvbzero( (char *) lbufG, dwide * sizeof(int));
+ xvbzero( (char *) lbufB, dwide * sizeof(int));
+ linecnt = 0; lastline = thisline;
+ }
}
@@ -463,7 +462,7 @@
bperpix = (is24) ? 3 : 1;
for (j=0; j<=swide; j++)
- pixarr[j] = (j*dwide + (15*swide)/16) / swide;
+ pixarr[j] = ((2 * j + 1) * dwide) / (2 * swide);
lastline = linecnt = pixR = pixG = pixB = 0;
cptr = pic824;
@@ -472,7 +471,7 @@
ProgressMeter(0, shigh, i, "Smooth");
if ((i&15) == 0) WaitCursor();
- thisline = (i * dhigh + (15*shigh)/16 ) / shigh;
+ thisline = ((2 * i + 1) * dhigh) / (2 * shigh);
if ((thisline != lastline)) { /* copy a line to pic24 */
pixR = pixG = pixB = pixcnt = lastpix = 0;
Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/devel/xv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xv.spec 22 Oct 2014 15:19:21 -0000 1.15
+++ xv.spec 3 Jul 2015 15:36:15 -0000 1.16
@@ -3,7 +3,7 @@
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -32,6 +32,8 @@
Patch6: xv-3.10a-namemax.patch
Patch7: xv-3.10a-xvcut.patch
Patch8: xv-3.10a-format.patch
+Patch9: xv-3.10a-png-itxt.patch
+Patch10: xv-3.10a-smooth-fix2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils
%if "%{?rhel}" != "4"
@@ -154,6 +156,12 @@
# fix build with -Werror=format-security
%patch8
+# fix crash when viewing PNGs with iTXt/utf8 comments
+%patch9
+
+# fix crash due to off-by-one smoothing bug
+%patch10
+
# Include permission to distribute
%{__install} -m 0644 -p %{SOURCE2} .
@@ -289,6 +297,10 @@
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Fri Jul 03 2015 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-21
+- patch by Erling A. Jacobsen to fix iTXt/utf8 png comment bug (#3131, #3704)
+- patch by Erling A. Jacobsen to fix smoothing off-by-one bug (#3142)
+
* Wed Oct 22 2014 Paul Howarth <paul(a)city-fan.org> 3.10a.jumbopatch.20070520-20
- Fix build with -Werror=format-security
8 years, 10 months
rpms/wl-kmod/devel wl-kmod.spec,1.121,1.122
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18566
Modified Files:
wl-kmod.spec
Log Message:
* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-8.5
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- wl-kmod.spec 28 Jun 2015 21:19:38 -0000 1.121
+++ wl-kmod.spec 2 Jul 2015 15:38:02 -0000 1.122
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.248
-Release: 8%{?dist}.4
+Release: 8%{?dist}.5
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -102,6 +102,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-8.5
+- Rebuilt for kernel
+
* Sun Jun 28 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-8.4
- Rebuilt for kernel
8 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.210,1.211
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18443
Modified Files:
nvidia-kmod.spec
Log Message:
* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:352.21-1.2
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- nvidia-kmod.spec 28 Jun 2015 21:19:30 -0000 1.210
+++ nvidia-kmod.spec 2 Jul 2015 15:37:54 -0000 1.211
@@ -9,7 +9,7 @@
Epoch: 1
Version: 352.21
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
%changelog
+* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:352.21-1.2
+- Rebuilt for kernel
+
* Sun Jun 28 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:352.21-1.1
- Rebuilt for kernel
8 years, 10 months
rpms/nvidia-340xx-kmod/devel nvidia-340xx-kmod.spec,1.26,1.27
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-340xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18319
Modified Files:
nvidia-340xx-kmod.spec
Log Message:
* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.76-2.16
- Rebuilt for kernel
Index: nvidia-340xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/devel/nvidia-340xx-kmod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nvidia-340xx-kmod.spec 28 Jun 2015 21:19:23 -0000 1.26
+++ nvidia-340xx-kmod.spec 2 Jul 2015 15:37:47 -0000 1.27
@@ -9,7 +9,7 @@
Epoch: 1
Version: 340.76
# Taken over by kmodtool
-Release: 2%{?dist}.15
+Release: 2%{?dist}.16
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -93,6 +93,9 @@
%changelog
+* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.76-2.16
+- Rebuilt for kernel
+
* Sun Jun 28 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.76-2.15
- Rebuilt for kernel
8 years, 10 months
rpms/nvidia-304xx-kmod/devel nvidia-304xx-kmod.spec,1.48,1.49
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18195
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 304.125-3.14
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nvidia-304xx-kmod.spec 28 Jun 2015 21:19:14 -0000 1.48
+++ nvidia-304xx-kmod.spec 2 Jul 2015 15:37:40 -0000 1.49
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.125
# Taken over by kmodtool
-Release: 3%{?dist}.13
+Release: 3%{?dist}.14
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -85,6 +85,9 @@
%changelog
+* Thu Jul 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 304.125-3.14
+- Rebuilt for kernel
+
* Sun Jun 28 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 304.125-3.13
- Rebuilt for kernel
8 years, 10 months