[packages/gplflash] - added c++ patch (fixes build with modern C++ compiler) - updated Source0 URL and BRs - release 8
qboosh
qboosh at pld-linux.org
Mon Jul 15 19:54:54 CEST 2013
commit b950a0f8d3652ff87d10ed26434a5ca246e177bd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jul 15 19:54:51 2013 +0200
- added c++ patch (fixes build with modern C++ compiler)
- updated Source0 URL and BRs
- release 8
gplflash-c++.patch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
gplflash.spec | 32 +++++++++++++----------
2 files changed, 95 insertions(+), 14 deletions(-)
---
diff --git a/gplflash.spec b/gplflash.spec
index 5472d65..02f5584 100644
--- a/gplflash.spec
+++ b/gplflash.spec
@@ -2,16 +2,16 @@ Summary: Flash animations redering library
Summary(pl.UTF-8): Biblioteka renderująca animacje Flash
Name: gplflash
Version: 0.4.13
-Release: 7
-License: GPL
+Release: 8
+License: GPL v2+
Group: Libraries
-Source0: http://dl.sourceforge.net/gplflash/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/gplflash/%{name}-%{version}.tar.bz2
# Source0-md5: 1b14c21094eb07416842ac0f5298b3f1
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-link.patch
+Patch1: %{name}-c++.patch
URL: http://gplflash.sourceforge.net/
-BuildRequires: XFree86-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libjpeg-devel
@@ -19,6 +19,9 @@ BuildRequires: libmad-devel >= 0.14.2b
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: rpmbuild(macros) >= 1.357
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXt-devel
BuildRequires: zlib-devel >= 1.1.4
BuildConflicts: flash
Obsoletes: flash
@@ -95,6 +98,7 @@ gplflash.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -114,8 +118,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# include in -devel and -static instead?
-rm -f $RPM_BUILD_ROOT%{_libdir}/browser-plugins/libnpflash.{l,}a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/browser-plugins/libnpflash.{la,a}
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/swfplayer.desktop
@@ -138,20 +141,21 @@ fi
%files
%defattr(644,root,root,755)
%doc AUTHORS NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%attr(755,root,root) %{_bindir}/swfplayer
+%attr(755,root,root) %{_libdir}/libflash.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libflash.so.0
+%{_desktopdir}/swfplayer.desktop
+%{_pixmapsdir}/swfplayer.png
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/libflash.so
+%{_libdir}/libflash.la
+%{_includedir}/flash.h
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libflash.a
%files -n browser-plugin-%{name}
%defattr(644,root,root,755)
diff --git a/gplflash-c++.patch b/gplflash-c++.patch
new file mode 100644
index 0000000..6fca93e
--- /dev/null
+++ b/gplflash-c++.patch
@@ -0,0 +1,77 @@
+--- gplflash-0.4.13/lib/matrix.h.orig 2005-01-19 19:30:52.000000000 +0100
++++ gplflash-0.4.13/lib/matrix.h 2013-07-15 19:06:39.188948943 +0200
+@@ -33,13 +33,13 @@ public:
+ #endif
+
+ inline
+- long Matrix::getX(long x, long y)
++ long getX(long x, long y)
+ {
+ return (long) (x*a+y*b+tx);
+ };
+
+ inline
+- long Matrix::getY(long x, long y)
++ long getY(long x, long y)
+ {
+ return (long) (x*c+y*d+ty);
+ };
+--- gplflash-0.4.13/lib/sound.h.orig 2005-01-19 19:30:52.000000000 +0100
++++ gplflash-0.4.13/lib/sound.h 2013-07-15 19:07:40.975613016 +0200
+@@ -103,9 +103,9 @@ public:
+ long playSounds(); // Actually play sounds of all instances
+ long fillSoundBuffer(SoundList *, char *buffer, long bufferSize); // Fill sound buffer
+ private:
+- int SoundMixer::Mp3Scale(mad_fixed_t sample);
+- void SoundMixer::Mp3Decompress(SoundList *sl);
+- void SoundMixer::uninitMp3Sounds(SoundList *sl);
++ int Mp3Scale(mad_fixed_t sample);
++ void Mp3Decompress(SoundList *sl);
++ void uninitMp3Sounds(SoundList *sl);
+ };
+
+ #endif /* _SOUND_H_ */
+--- gplflash-0.4.13/lib/graphic16.h.orig 2005-01-19 19:30:52.000000000 +0100
++++ gplflash-0.4.13/lib/graphic16.h 2013-07-15 19:08:26.265611116 +0200
+@@ -24,7 +24,7 @@
+
+ class GraphicDevice16: public GraphicDevice {
+ private:
+- long GraphicDevice16::allocColor(Color color);
++ long allocColor(Color color);
+
+ public:
+ GraphicDevice16(FlashDisplay *fd);
+--- gplflash-0.4.13/lib/graphic24.h.orig 2005-01-19 19:30:52.000000000 +0100
++++ gplflash-0.4.13/lib/graphic24.h 2013-07-15 19:08:31.615610890 +0200
+@@ -24,7 +24,7 @@
+
+ class GraphicDevice24: public GraphicDevice {
+ private:
+- long GraphicDevice24::allocColor(Color color);
++ long allocColor(Color color);
+
+ public:
+ GraphicDevice24(FlashDisplay *fd);
+--- gplflash-0.4.13/lib/graphic32.h.orig 2005-01-19 19:30:52.000000000 +0100
++++ gplflash-0.4.13/lib/graphic32.h 2013-07-15 19:08:37.412277314 +0200
+@@ -24,7 +24,7 @@
+
+ class GraphicDevice32: public GraphicDevice {
+ private:
+- long GraphicDevice32::allocColor(Color color);
++ long allocColor(Color color);
+
+ public:
+ GraphicDevice32(FlashDisplay *fd);
+--- gplflash-0.4.13/lib/swf.h.orig 2005-01-19 19:30:52.000000000 +0100
++++ gplflash-0.4.13/lib/swf.h 2013-07-15 19:14:34.082262346 +0200
+@@ -199,7 +199,7 @@ enum
+ #define true 1
+ #endif
+
+-extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;
++extern "C" int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;
+
+ typedef void (*ScanLineFunc)(void *id, long y, long start, long end);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gplflash.git/commitdiff/b950a0f8d3652ff87d10ed26434a5ca246e177bd
More information about the pld-cvs-commit
mailing list