rpms/ltris/devel ltris-1.0.19-inlines.patch,1.1,1.2
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/ltris/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3971
Modified Files:
ltris-1.0.19-inlines.patch
Log Message:
Added comments in patch to be searchable and useful in others cases.
ltris-1.0.19-inlines.patch:
sdl.h | 20 ++++++++++----------
tools.h | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
Index: ltris-1.0.19-inlines.patch
===================================================================
RCS file: /cvs/free/rpms/ltris/devel/ltris-1.0.19-inlines.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltris-1.0.19-inlines.patch 11 May 2015 19:12:49 -0000 1.1
+++ ltris-1.0.19-inlines.patch 16 May 2015 19:34:37 -0000 1.2
@@ -1,3 +1,17 @@
+Fix warnings like:
+tools.h:57:13: warning: inline function 'delay_force_time_out' declared but never defined
+ inline void delay_force_time_out( Delay *delay );
+ ^
+tools.h:54:12: warning: inline function 'delay_timed_out' declared but never defined
+ inline int delay_timed_out( Delay *delay, int ms );
+ ^
+tools.h:51:13: warning: inline function 'delay_reset' declared but never defined
+ inline void delay_reset( Delay *delay );
+
+Which ends up with this king of errors:
+/builddir/build/BUILD/ltris-1.0.19/src/bowl.c:1353: undefined reference to `delay_timed_out'
+/builddir/build/BUILD/ltris-1.0.19/src/bowl.c:1311: undefined reference to `delay_force_time_out'
+
diff -rup ltris-1.0.19.orig/src/sdl.h ltris-1.0.19/src/sdl.h
--- ltris-1.0.19.orig/src/sdl.h 2013-05-03 18:13:11.000000000 +0100
+++ ltris-1.0.19/src/sdl.h 2015-05-11 18:54:37.949653509 +0100
9 years, 6 months
rpms/vdr-skindesigner/devel .cvsignore, 1.33, 1.34 sources, 1.34, 1.35 vdr-skindesigner.spec, 1.37, 1.38
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-skindesigner/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3210/devel
Modified Files:
.cvsignore sources vdr-skindesigner.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 14 May 2015 16:52:42 -0000 1.33
+++ .cvsignore 16 May 2015 18:46:09 -0000 1.34
@@ -1 +1 @@
-vdr-plugin-skindesigner-0.4.6.tar.bz2
+vdr-plugin-skindesigner-0.4.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 14 May 2015 16:52:42 -0000 1.34
+++ sources 16 May 2015 18:46:09 -0000 1.35
@@ -1 +1 @@
-9dd1316262f67bce94c7cedcca4e78da vdr-plugin-skindesigner-0.4.6.tar.bz2
+f9d19345997228513217b46a7dfc65de vdr-plugin-skindesigner-0.4.7.tar.bz2
Index: vdr-skindesigner.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/vdr-skindesigner.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- vdr-skindesigner.spec 14 May 2015 16:52:42 -0000 1.37
+++ vdr-skindesigner.spec 16 May 2015 18:46:09 -0000 1.38
@@ -1,5 +1,5 @@
Name: vdr-skindesigner
-Version: 0.4.6
+Version: 0.4.7
Release: 1%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
@@ -113,6 +113,9 @@
%{_includedir}/libskindesignerapi/
%changelog
+* Sat May 16 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.4.7-1
+- Update to 0.4.7
+
* Thu May 14 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.4.6-1
- Update to 0.4.6
9 years, 6 months
rpms/yle-dl/devel .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 yle-dl.spec, 1.4, 1.5
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/yle-dl/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28356
Modified Files:
.cvsignore sources yle-dl.spec
Log Message:
* Sat May 16 2015 Sérgio Basto <sergio(a)serjux.com> - 2.7.1-1
- Update to 2.7.1 .
- Update BuildRequires .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/yle-dl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 May 2015 23:03:04 -0000 1.3
+++ .cvsignore 16 May 2015 15:44:28 -0000 1.4
@@ -1,2 +1,2 @@
-yle-dl-2.7.0.tar.gz
+yle-dl-2.7.1.tar.gz
AdobeHDS.php
Index: sources
===================================================================
RCS file: /cvs/free/rpms/yle-dl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 May 2015 23:03:04 -0000 1.4
+++ sources 16 May 2015 15:44:28 -0000 1.5
@@ -1,2 +1,2 @@
-cc135515cfd88952149bdca78fb2a4f3 yle-dl-2.7.0.tar.gz
+1f5592624191ea487ccd78028dc3d0fe yle-dl-2.7.1.tar.gz
a14c63bfac532d7d72236d15dd51b73d AdobeHDS.php
Index: yle-dl.spec
===================================================================
RCS file: /cvs/free/rpms/yle-dl/devel/yle-dl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yle-dl.spec 12 May 2015 23:03:04 -0000 1.4
+++ yle-dl.spec 16 May 2015 15:44:28 -0000 1.5
@@ -1,6 +1,6 @@
Name: yle-dl
-Version: 2.7.0
-Release: 2%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
License: GPLv2
Summary: Command-line tool to download videos from Finnish broadcasting company
Group: Applications/Multimedia
@@ -9,7 +9,7 @@
Source0: http://github.srcurl.net/aajanki/%{name}/%{version}/%{name}-%{version}.ta...
Source1: https://raw.githubusercontent.com/K-S-V/Scripts/master/AdobeHDS.php
-BuildRequires: openssl-devel, json-c-devel, python-devel
+BuildRequires: sed
Requires: rtmpdump, python-crypto, php
BuildArch: noarch
@@ -51,6 +51,10 @@
%changelog
+* Sat May 16 2015 Sérgio Basto <sergio(a)serjux.com> - 2.7.1-1
+- Update to 2.7.1 .
+- Update BuildRequires .
+
* Tue May 12 2015 Sérgio Basto <sergio(a)serjux.com> - 2.7.0-2
- Include file named AdobeHDS.php , instead download it every build.
9 years, 6 months
rpms/vlc/devel vlc.spec,1.221,1.222
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27693
Modified Files:
vlc.spec
Log Message:
Rebuilt for x265 in f22
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- vlc.spec 13 May 2015 16:10:22 -0000 1.221
+++ vlc.spec 16 May 2015 15:22:05 -0000 1.222
@@ -32,7 +32,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -484,6 +484,9 @@
%changelog
+* Sat May 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-6
+- Rebuilt for x265
+
* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-5
- Update to current bugfix
9 years, 6 months
rpms/mamory/devel mamory-0.2.25-fix-inline-use.patch, NONE, 1.1 mamory.spec, 1.10, 1.11
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/mamory/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18955
Modified Files:
mamory.spec
Added Files:
mamory-0.2.25-fix-inline-use.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.2.25-8
- Fix FTBFS (rf#3626)
mamory-0.2.25-fix-inline-use.patch:
common/memalloc.c | 8 ++++----
common/memalloc.h | 8 ++++----
mamory/chainlst.c | 2 +-
mamory/chainlst.h | 2 +-
mamory/printrom.c | 2 +-
sortbox/sortbox.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE mamory-0.2.25-fix-inline-use.patch ---
diff -up mamory-0.2.25/common/memalloc.c~ mamory-0.2.25/common/memalloc.c
--- mamory-0.2.25/common/memalloc.c~ 2007-08-15 22:35:29.000000000 +0200
+++ mamory-0.2.25/common/memalloc.c 2015-05-16 14:15:20.333243922 +0200
@@ -41,7 +41,7 @@ unsigned int memalloc_nb=0;
unsigned int record_memalloc=0;
#endif /* NDEBUG */
-inline void *xmalloc(size_t num,char* file,int line)
+void *xmalloc(size_t num,char* file,int line)
{
void *new=malloc(num);
if(new==NULL)
@@ -94,7 +94,7 @@ inline void *xmalloc(size_t num,char* fi
return new;
};
-inline void *xrealloc(void *p,size_t num,char* file, int line)
+void *xrealloc(void *p,size_t num,char* file, int line)
{
void *new=NULL;
if(p==NULL)
@@ -105,14 +105,14 @@ inline void *xrealloc(void *p,size_t num
return new;
};
-inline void *xcalloc(size_t num, size_t size,char* file, int line)
+void *xcalloc(size_t num, size_t size,char* file, int line)
{
void *new=xmalloc(num*size,file,line);
memset(new,0,num*size);
return new;
}
-inline char *xstrdup(const char *string,char *file, int line)
+char *xstrdup(const char *string,char *file, int line)
{
char *result;
diff -up mamory-0.2.25/common/memalloc.h~ mamory-0.2.25/common/memalloc.h
--- mamory-0.2.25/common/memalloc.h~ 2015-05-16 13:57:24.000000000 +0200
+++ mamory-0.2.25/common/memalloc.h 2015-05-16 14:15:19.222268842 +0200
@@ -24,10 +24,10 @@
#ifndef COMMON_MEMALLOC_H
#define COMMON_MEMALLOC_H
-extern inline void *xcalloc(size_t num, size_t size,char *file,int line);
-extern inline void *xmalloc(size_t num,char *file, int line);
-extern inline void *xrealloc(void *p, size_t num,char *file,int line);
-extern inline char *xstrdup(const char *string,char *file, int line);
+extern void *xcalloc(size_t num, size_t size,char *file,int line);
+extern void *xmalloc(size_t num,char *file, int line);
+extern void *xrealloc(void *p, size_t num,char *file,int line);
+extern char *xstrdup(const char *string,char *file, int line);
#ifndef NDEBUG
# define XCALLOC(type,num) ((type*)calloc((num),sizeof(type)))
diff -up mamory-0.2.25/mamory/chainlst.c~ mamory-0.2.25/mamory/chainlst.c
--- mamory-0.2.25/mamory/chainlst.c~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/mamory/chainlst.c 2015-05-16 14:17:52.473364473 +0200
@@ -25,7 +25,7 @@
#include "common.h"
#include <mamory/chainlst.h>
-inline void *CLGetData(s_chainlst *CL)
+void *CLGetData(s_chainlst *CL)
{
return CL->Data;
};
diff -up mamory-0.2.25/mamory/chainlst.h~ mamory-0.2.25/mamory/chainlst.h
--- mamory-0.2.25/mamory/chainlst.h~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/mamory/chainlst.h 2015-05-16 14:17:59.426325324 +0200
@@ -42,7 +42,7 @@ s_chainlst *CLPrepend(s_chainlst *CL,voi
s_chainlst *CLInsert(s_chainlst *CL,void *data,unsigned int pos);
s_chainlst *CLRemove(s_chainlst *CL,void *data);
s_chainlst *CLRemoveAll(s_chainlst *CL,void *data);
-inline void *CLGetData(s_chainlst *CL);
+void *CLGetData(s_chainlst *CL);
void FreeCL(s_chainlst *CL);
#endif
diff -up mamory-0.2.25/mamory/printrom.c~ mamory-0.2.25/mamory/printrom.c
--- mamory-0.2.25/mamory/printrom.c~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/mamory/printrom.c 2015-05-16 14:18:07.308433533 +0200
@@ -124,7 +124,7 @@ void fprintGamesListMamoryHeader(FILE *f
};
-inline unsigned char *strquote(unsigned char *string)
+static inline unsigned char *strquote(unsigned char *string)
{
unsigned char *quotedstring=NULL;
unsigned int i=0;
diff -up mamory-0.2.25/sortbox/sortbox.c~ mamory-0.2.25/sortbox/sortbox.c
--- mamory-0.2.25/sortbox/sortbox.c~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/sortbox/sortbox.c 2015-05-16 14:16:09.752216390 +0200
@@ -168,7 +168,7 @@ void SortBox_AddLetter( s_SortBox *SortB
* Sort the Alphabet used in the SortBox, respecting the priority
*/
-inline void SortAlphabet(s_SBAlphabet *Alphabet)
+static inline void SortAlphabet(s_SBAlphabet *Alphabet)
{
unsigned char ASCII[256]={0};
unsigned char *order;
Index: mamory.spec
===================================================================
RCS file: /cvs/free/rpms/mamory/devel/mamory.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mamory.spec 31 Aug 2014 09:40:43 -0000 1.10
+++ mamory.spec 16 May 2015 12:21:22 -0000 1.11
@@ -1,17 +1,14 @@
Name: mamory
Version: 0.2.25
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: ROM management API and commandline ROM manager for MAME
-
-Group: Applications/Emulators
License: GPLv2 and LGPLv2
URL: http://mamory.sourceforge.net
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-opt.patch
Patch1: %{name}-0.2.25-ppc64.patch
Patch2: %{name}-0.2.25-utf8.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch3: %{name}-0.2.25-fix-inline-use.patch
BuildRequires: expat-devel
%description
@@ -22,6 +19,7 @@
The distributed packages also contain a command line interface that use the
potential of the library libmamory.so.
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
@@ -37,6 +35,7 @@
%patch0 -p0 -b .opt~
%patch1 -p0 -b .ppc64~
%patch2 -p0 -b .utf8~
+%patch3 -p1
# Avoid lib64 rpaths
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -53,8 +52,7 @@
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
# remove libtool archive file
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -64,27 +62,24 @@
make check
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO DOCS/mamory*
%{_bindir}/mamory
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.2.25-8
+- Fix FTBFS (rf#3626)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.2.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
9 years, 6 months
rpms/gcube/devel gcube-0.4-fix-inline-usage.patch, NONE, 1.1 gcube.spec, 1.10, 1.11
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gcube/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14190
Modified Files:
gcube.spec
Added Files:
gcube-0.4-fix-inline-usage.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.4-13
- Fix FTBFS (rf#3630)
gcube-0.4-fix-inline-usage.patch:
general.c | 2 +-
general.h | 2 +-
gx_transform.h | 20 ++++++++++----------
mem.h | 4 ++--
tplx.c | 20 ++++++++++----------
5 files changed, 24 insertions(+), 24 deletions(-)
--- NEW FILE gcube-0.4-fix-inline-usage.patch ---
diff -up 0.4/gx_transform.h~ 0.4/gx_transform.h
--- 0.4/gx_transform.h~ 2005-01-10 21:22:55.000000000 +0100
+++ 0.4/gx_transform.h 2015-05-16 12:18:01.631068171 +0200
@@ -3,16 +3,16 @@
-inline __u32 color_unpack_rgb565 (__u32 X);
-inline __u32 color_unpack_rgba4 (__u32 X);
-inline __u32 color_unpack_rgba6 (__u32 X);
-inline __u32 color_unpack_rgb555 (__u32 X);
-inline __u32 color_unpack_rgb4a3 (__u32 X);
-inline __u32 color_unpack_rgb5a3 (__u32 X);
-inline __u32 color_unpack_i4 (__u32 X);
-inline __u32 color_unpack_i8 (__u32 X);
-inline __u32 color_unpack_ia4 (__u32 X);
-inline __u32 color_unpack_ia8 (__u32 X);
+__u32 color_unpack_rgb565 (__u32 X);
+__u32 color_unpack_rgba4 (__u32 X);
+__u32 color_unpack_rgba6 (__u32 X);
+__u32 color_unpack_rgb555 (__u32 X);
+__u32 color_unpack_rgb4a3 (__u32 X);
+__u32 color_unpack_rgb5a3 (__u32 X);
+__u32 color_unpack_i4 (__u32 X);
+__u32 color_unpack_i8 (__u32 X);
+__u32 color_unpack_ia4 (__u32 X);
+__u32 color_unpack_ia8 (__u32 X);
unsigned int gx_draw (__u32 mem, int prim, int n, int vat);
diff -up 0.4/tplx.c~ 0.4/tplx.c
--- 0.4/tplx.c~ 2004-12-27 16:57:42.000000000 +0100
+++ 0.4/tplx.c 2015-05-16 12:16:40.914146665 +0200
@@ -117,7 +117,7 @@ typedef struct
__u8 texbuff[1024*1024*4];
-inline __u32 color_unpack_rgb565 (__u32 X)
+static inline __u32 color_unpack_rgb565 (__u32 X)
{
#ifdef LIL_ENDIAN
return (((X & 0xf800) >> 8) | ((X & 0xe000) >> 13) |
@@ -133,7 +133,7 @@ inline __u32 color_unpack_rgb565 (__u32
}
-inline __u32 color_unpack_rgba4 (__u32 X)
+static inline __u32 color_unpack_rgba4 (__u32 X)
{
__u32 _X = X;
@@ -147,7 +147,7 @@ inline __u32 color_unpack_rgba4 (__u32 X
}
-inline __u32 color_unpack_rgba6 (__u32 X)
+static inline __u32 color_unpack_rgba6 (__u32 X)
{
#ifdef LIL_ENDIAN
return ((X & 0xfc0000) >> 16) | ((X & 0xc00000) >> 22) |
@@ -163,7 +163,7 @@ inline __u32 color_unpack_rgba6 (__u32 X
}
// RGB5 1rrr rrgg gggb bbbb
-inline __u32 color_unpack_rgb555 (__u32 X)
+static inline __u32 color_unpack_rgb555 (__u32 X)
{
#ifdef LIL_ENDIAN
return ((X & 0x7c00) >> 7) | ((X & 0x7000) >> 12) |
@@ -178,7 +178,7 @@ inline __u32 color_unpack_rgb555 (__u32
// RGB4A3 0aaa rrrr gggg bbbb
-inline __u32 color_unpack_rgb4a3 (__u32 X)
+static inline __u32 color_unpack_rgb4a3 (__u32 X)
{
#ifdef LIL_ENDIAN
return ((X & 0x0f00) >> 4) | ((X & 0x0f00) >> 8) |
@@ -194,7 +194,7 @@ inline __u32 color_unpack_rgb4a3 (__u32
}
-inline __u32 color_unpack_rgb5a3 (__u32 X)
+static inline __u32 color_unpack_rgb5a3 (__u32 X)
{
if (X & 0x8000)
return (color_unpack_rgb555 (X) | MASK_ALPHA);
@@ -203,7 +203,7 @@ inline __u32 color_unpack_rgb5a3 (__u32
}
-inline __u32 color_unpack_i4 (__u32 X)
+static inline __u32 color_unpack_i4 (__u32 X)
{
X |= X << 4;
X |= X << 8;
@@ -211,14 +211,14 @@ inline __u32 color_unpack_i4 (__u32 X)
}
-inline __u32 color_unpack_i8 (__u32 X)
+static inline __u32 color_unpack_i8 (__u32 X)
{
X |= X << 8;
return (X | (X << 16));
}
-inline __u32 color_unpack_ia4 (__u32 X)
+static inline __u32 color_unpack_ia4 (__u32 X)
{
__u32 a = X & 0xf0;
@@ -234,7 +234,7 @@ inline __u32 color_unpack_ia4 (__u32 X)
}
-inline __u32 color_unpack_ia8 (__u32 X)
+static inline __u32 color_unpack_ia8 (__u32 X)
{
__u32 a = X & 0xff00;
diff -up 0.4/general.c~ 0.4/general.c
--- 0.4/general.c~ 2005-01-12 01:21:50.000000000 +0100
+++ 0.4/general.c 2015-05-16 12:21:28.888736494 +0200
@@ -187,7 +187,7 @@ __u32 round_up (__u32 a, __u32 b)
}
-inline int is_power_of_two (__u32 a)
+int is_power_of_two (__u32 a)
{
int i = 0;
diff -up 0.4/general.h~ 0.4/general.h
--- 0.4/general.h~ 2015-05-16 12:19:56.000000000 +0200
+++ 0.4/general.h 2015-05-16 12:21:07.481287198 +0200
@@ -82,7 +82,7 @@ char *kill_extension (char *filename);
char *get_home_dir (void);
__u32 round_up (__u32 a, __u32 b);
-inline int is_power_of_two (__u32 a);
+int is_power_of_two (__u32 a);
__u32 crc_setup (unsigned int bits);
__u32 crc_iterate (__u32 crc, __u8 d);
diff -up 0.4/mem.h~ 0.4/mem.h
--- 0.4/mem.h~ 2004-12-27 16:53:42.000000000 +0100
+++ 0.4/mem.h 2015-05-16 12:20:44.666874096 +0200
@@ -218,8 +218,8 @@ void write_word_r (__u32 addr, __u32 dat
void write_word (__u32 addr, __u32 data);
void write_double (__u32 addr, __u64 data);
-inline __u8 mem_read8_safe (__u32 addr);
-inline __u32 mem_read32_safe (__u32 addr);
+__u8 mem_read8_safe (__u32 addr);
+__u32 mem_read32_safe (__u32 addr);
void mem_fake_w32 (__u32 addr, __u32 data);
__u32 mem_fake_r32 (__u32 addr);
Index: gcube.spec
===================================================================
RCS file: /cvs/free/rpms/gcube/devel/gcube.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcube.spec 31 Aug 2014 03:14:24 -0000 1.10
+++ gcube.spec 16 May 2015 10:22:39 -0000 1.11
@@ -1,9 +1,7 @@
Name: gcube
Version: 0.4
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Nintendo Gamecube emulator
-
-Group: Applications/Emulators
License: GPLv2+
URL: http://gcube.exemu.net
# source is no longer present at original source0.
@@ -12,7 +10,7 @@
Source0: http://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%{name}-%{version}-sr...
Patch0: gcube-0.4-nostrip.patch
Patch1: gcube-0.4-gcc44-types.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Patch2: gcube-0.4-fix-inline-usage.patch
BuildRequires: libGLU-devel
BuildRequires: libjpeg-devel
BuildRequires: SDL-devel >= 1.2.7
@@ -27,6 +25,7 @@
%setup -qn %{version}
%patch0 -p1 -b .nostrip
%patch1 -b .gcc44-types
+%patch2 -p1
sed -i -e 's/-mno-windows -mcygwin/-lm/' Makefile.rules
%build
@@ -39,7 +38,6 @@
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 bin2dol %{buildroot}%{_bindir}
install -m0755 gcmap %{buildroot}%{_bindir}
@@ -49,17 +47,15 @@
install -m0755 tplx %{buildroot}%{_bindir}
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{_bindir}/*
%doc COPYING README README.debug
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.4-13
+- Fix FTBFS (rf#3630)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
9 years, 6 months
rpms/gltron/devel gltron-0.70-no-use-misc.patch, NONE, 1.1 gltron.desktop, 1.1, 1.2 gltron.spec, 1.6, 1.7
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gltron/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13803
Modified Files:
gltron.desktop gltron.spec
Added Files:
gltron-0.70-no-use-misc.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.70-9
- Fix FTBFS (rf#3631)
gltron-0.70-no-use-misc.patch:
liolib.c | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE gltron-0.70-no-use-misc.patch ---
diff -up gltron-0.70/lua/src/lib/liolib.c~ gltron-0.70/lua/src/lib/liolib.c
--- gltron-0.70/lua/src/lib/liolib.c~ 2003-06-30 21:15:26.000000000 +0200
+++ gltron-0.70/lua/src/lib/liolib.c 2015-05-16 11:52:56.592817722 +0200
@@ -8,7 +8,6 @@
#include <ctype.h>
#include <stdio.h>
-#define __USE_MISC /* for mkstemp() */
#include <stdlib.h>
#include <string.h>
#include <time.h>
Index: gltron.desktop
===================================================================
RCS file: /cvs/free/rpms/gltron/devel/gltron.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gltron.desktop 3 Aug 2008 14:27:34 -0000 1.1
+++ gltron.desktop 16 May 2015 10:08:26 -0000 1.2
@@ -5,5 +5,4 @@
Icon=gltron.png
Terminal=false
Type=Application
-Encoding=UTF-8
Categories=Application;Game;ArcadeGame;
Index: gltron.spec
===================================================================
RCS file: /cvs/free/rpms/gltron/devel/gltron.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gltron.spec 31 Aug 2014 03:14:36 -0000 1.6
+++ gltron.spec 16 May 2015 10:08:26 -0000 1.7
@@ -1,6 +1,6 @@
Name: gltron
Version: 0.70
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A 3D game inspired by the movie TRON
Group: Amusements/Games
License: GPL
@@ -9,37 +9,34 @@
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: gltron-0.70-gcc.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch1: gltron-0.70-no-use-misc.patch
BuildRequires: SDL_sound-devel libpng-devel zlib-devel libGLU-devel
BuildRequires: desktop-file-utils
%description
%{summary}.
+
%prep
%setup -q
%patch0 -p0 -b .gcc~
+%patch1 -p1
+
%build
%configure --disable-warn
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
- --vendor livna --mode=0644 --add-category=X-Livna %{SOURCE1}
+desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/*
%{_datadir}/%{name}
@@ -47,6 +44,9 @@
%{_datadir}/pixmaps/*.png
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.70-9
+- Fix FTBFS (rf#3631)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.70-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
9 years, 6 months
rpms/BasiliskII/devel cxmon-3.2-hide-symbols.patch, NONE, 1.1 cxmon-3.2-strfmt.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 BasiliskII.spec, 1.11, 1.12 sources, 1.4, 1.5 BasiliskII-SDL-audio.patch, 1.1, NONE BasiliskII-debuginfo.patch, 1.1, NONE BasiliskII-disk-scan-crash.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/BasiliskII/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13149
Modified Files:
.cvsignore BasiliskII.spec sources
Added Files:
cxmon-3.2-hide-symbols.patch cxmon-3.2-strfmt.patch
Removed Files:
BasiliskII-SDL-audio.patch BasiliskII-debuginfo.patch
BasiliskII-disk-scan-crash.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0-0.20150516.5
- BasiliskII git snapshot du-jour
- Fix FTBFS (rf#3633)
cxmon-3.2-hide-symbols.patch:
disass/dis-asm.h | 23 -----------------------
mon_disass.cpp | 10 +++++-----
2 files changed, 5 insertions(+), 28 deletions(-)
--- NEW FILE cxmon-3.2-hide-symbols.patch ---
diff -up cxmon-3.2/src/mon_disass.cpp~ cxmon-3.2/src/mon_disass.cpp
--- cxmon-3.2/src/mon_disass.cpp~ 2007-06-07 11:51:56.000000000 +0200
+++ cxmon-3.2/src/mon_disass.cpp 2013-03-10 23:18:29.846310333 +0100
@@ -41,21 +41,21 @@ bool mon_macos_mode = false;
extern "C" {
#include "disass/dis-asm.h"
-int buffer_read_memory(bfd_vma from, bfd_byte *to, unsigned int length, struct disassemble_info *info)
+static int buffer_read_memory(bfd_vma from, bfd_byte *to, unsigned int length, struct disassemble_info *info)
{
while (length--)
*to++ = mon_read_byte(from++);
return 0;
}
-void perror_memory(int status, bfd_vma memaddr, struct disassemble_info *info)
+static void perror_memory(int status, bfd_vma memaddr, struct disassemble_info *info)
{
info->fprintf_func(info->stream, "Unknown error %d\n", status);
}
-bool lookup_lowmem;
+static bool lookup_lowmem;
-void generic_print_address(bfd_vma addr, struct disassemble_info *info)
+static void generic_print_address(bfd_vma addr, struct disassemble_info *info)
{
if (lookup_lowmem && addr >= 0x100 && addr < 0x3000) {
if (((addr >= 0x400 && addr < 0x800) || (addr >= 0xe00 && addr < 0x1e00)) && ((addr & 3) == 0)) {
@@ -91,7 +91,7 @@ void generic_print_address(bfd_vma addr,
info->fprintf_func(info->stream, "$%08x", (uint32)addr);
}
-int generic_symbol_at_address(bfd_vma addr, struct disassemble_info *info)
+static int generic_symbol_at_address(bfd_vma addr, struct disassemble_info *info)
{
return 0;
}
diff -up cxmon-3.2/src/disass/dis-asm.h~ cxmon-3.2/src/disass/dis-asm.h
--- cxmon-3.2/src/disass/dis-asm.h~ 2002-09-07 14:48:15.000000000 +0200
+++ cxmon-3.2/src/disass/dis-asm.h 2013-03-10 23:22:15.510311199 +0100
@@ -249,29 +249,6 @@ extern disassembler_ftype disassembler P
extern void disassembler_usage PARAMS ((FILE *));
-/* This block of definitions is for particular callers who read instructions
- into a buffer before calling the instruction decoder. */
-
-/* Here is a function which callers may wish to use for read_memory_func.
- It gets bytes from a buffer. */
-extern int buffer_read_memory
- PARAMS ((bfd_vma, bfd_byte *, unsigned int, struct disassemble_info *));
-
-/* This function goes with buffer_read_memory.
- It prints a message using info->fprintf_func and info->stream. */
-extern void perror_memory PARAMS ((int, bfd_vma, struct disassemble_info *));
-
-
-/* Just print the address in hex. This is included for completeness even
- though both GDB and objdump provide their own (to print symbolic
- addresses). */
-extern void generic_print_address
- PARAMS ((bfd_vma, struct disassemble_info *));
-
-/* Always true. */
-extern int generic_symbol_at_address
- PARAMS ((bfd_vma, struct disassemble_info *));
-
/* Macro to initialize a disassemble_info struct. This should be called
by all applications creating such a struct. */
#define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \
cxmon-3.2-strfmt.patch:
mon.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cxmon-3.2-strfmt.patch ---
diff -up cxmon-3.2/src/mon.cpp~ cxmon-3.2/src/mon.cpp
--- cxmon-3.2/src/mon.cpp~ 2010-02-21 12:58:33.000000000 +0100
+++ cxmon-3.2/src/mon.cpp 2015-05-16 11:00:16.619745081 +0200
@@ -868,7 +868,7 @@ static void help_or_hunt()
}
fprintf(monout, "x Quit mon\n"
"h This help text\n");
- fprintf(monout, cmd_help);
+ fprintf(monout, "%s", cmd_help);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 10 Mar 2013 19:48:59 -0000 1.4
+++ .cvsignore 16 May 2015 09:44:33 -0000 1.5
@@ -1,3 +1,3 @@
BasiliskII.png
-cxmon-3.2.tar.gz
+cxmon-3.2-cvs20130310.tar.gz
macemu-master.zip
Index: BasiliskII.spec
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/BasiliskII.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasiliskII.spec 30 Aug 2014 23:59:32 -0000 1.11
+++ BasiliskII.spec 16 May 2015 09:44:33 -0000 1.12
@@ -1,19 +1,19 @@
-%define date 20130310
+%define date 20150516
%define mon_version 3.2
Summary: 68k Macintosh emulator
Name: BasiliskII
Version: 1.0
-Release: 0.%{date}.4%{?dist}.1
+Release: 0.%{date}.5%{?dist}
License: GPLv2+
URL: http://basilisk.cebix.net/
# GRRR github, no url ...
Source0: macemu-master.zip
-Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
+Source1: cxmon-3.2-cvs20130310.tar.gz
Source2: BasiliskII.png
-Patch0: BasiliskII-debuginfo.patch
-Patch1: BasiliskII-disk-scan-crash.patch
-Patch2: BasiliskII-SDL-audio.patch
+# Patch 10+ because this is for Source1 rather then Source0
+Patch10: cxmon-3.2-hide-symbols.patch
+Patch11: cxmon-3.2-strfmt.patch
BuildRequires: libtool gcc-c++ gtk2-devel
BuildRequires: desktop-file-utils readline-devel
BuildRequires: libXt-devel libXxf86vm-devel SDL-devel
@@ -28,9 +28,10 @@
%prep
%setup -q -a 1 -n macemu-master
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+pushd cxmon-%{mon_version}
+%patch10 -p1
+%patch11 -p1
+popd
iconv -f ISO_8859-1 -t UTF8 BasiliskII/README > README
touch -r BasiliskII/README README
iconv -f ISO_8859-1 -t UTF8 BasiliskII/ChangeLog > ChangeLog
@@ -49,7 +50,7 @@
%install
pushd BasiliskII/src/Unix
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
popd
chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tunconfig
@@ -102,6 +103,10 @@
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0-0.20150516.5
+- BasiliskII git snapshot du-jour
+- Fix FTBFS (rf#3633)
+
* Sat Aug 30 2014 Sérgio Basto <sergio(a)serjux.com> - 1.0-0.20130310.4.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Mar 2013 19:48:59 -0000 1.4
+++ sources 16 May 2015 09:44:33 -0000 1.5
@@ -1,3 +1,3 @@
d82f6d88e98f6a200af96643eeef80ab BasiliskII.png
-8fb95c58f6c04eace6ae84d0c7b79ca1 cxmon-3.2.tar.gz
-1daf9f4ef843d0f3c6fb648c26bf0722 macemu-master.zip
+477d800bb4b36e90aa94c0d6810b8e53 cxmon-3.2-cvs20130310.tar.gz
+5afbe1c0a1e7b16ce503aad4ca14f298 macemu-master.zip
--- BasiliskII-SDL-audio.patch DELETED ---
--- BasiliskII-debuginfo.patch DELETED ---
--- BasiliskII-disk-scan-crash.patch DELETED ---
9 years, 6 months
rpms/SheepShaver/devel cxmon-3.2-strfmt.patch, NONE, 1.1 SheepShaver.spec, 1.14, 1.15 sources, 1.4, 1.5 BasiliskII-disk-scan-crash.patch, 1.1, NONE SheepShaver-configure-fix.patch, 1.1, NONE SheepShaver-no-strip.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/SheepShaver/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12609
Modified Files:
SheepShaver.spec sources
Added Files:
cxmon-3.2-strfmt.patch
Removed Files:
BasiliskII-disk-scan-crash.patch
SheepShaver-configure-fix.patch SheepShaver-no-strip.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.1.20150516
- SheepShaver 2.4 git snapshot du-jour
- Fix FTBFS (rf#3634)
cxmon-3.2-strfmt.patch:
mon.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cxmon-3.2-strfmt.patch ---
diff -up cxmon-3.2/src/mon.cpp~ cxmon-3.2/src/mon.cpp
--- cxmon-3.2/src/mon.cpp~ 2010-02-21 12:58:33.000000000 +0100
+++ cxmon-3.2/src/mon.cpp 2015-05-16 11:00:16.619745081 +0200
@@ -868,7 +868,7 @@ static void help_or_hunt()
}
fprintf(monout, "x Quit mon\n"
"h This help text\n");
- fprintf(monout, cmd_help);
+ fprintf(monout, "%s", cmd_help);
}
Index: SheepShaver.spec
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/devel/SheepShaver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SheepShaver.spec 31 Aug 2014 12:52:44 -0000 1.14
+++ SheepShaver.spec 16 May 2015 09:31:42 -0000 1.15
@@ -1,22 +1,19 @@
-%define date 20130310
+%define date 20150516
%define mon_version 3.2
Summary: Power Macintosh emulator
Name: SheepShaver
-Version: 2.3
-Release: 0.13.%{date}%{?dist}
+Version: 2.4
+Release: 0.1.%{date}%{?dist}
License: GPLv2+
URL: http://sheepshaver.cebix.net/
# GRRR github, no url ...
Source0: macemu-master.zip
Source1: cxmon-3.2-cvs20130310.tar.gz
Source2: SheepShaver.png
-Patch0: SheepShaver-no-strip.patch
-Patch1: SheepShaver-configure-fix.patch
-# SheepShaver uses BasiliskII's sys_unix.cpp through a symlink
-Patch2: BasiliskII-disk-scan-crash.patch
-# Patch 10 because this is for Source1 rather then Source0
+# Patch 10+ because this is for Source1 rather then Source0
Patch10: cxmon-3.2-hide-symbols.patch
+Patch11: cxmon-3.2-strfmt.patch
BuildRequires: libtool gcc-c++ gtk2-devel
BuildRequires: desktop-file-utils readline-devel
BuildRequires: libXt-devel libXxf86vm-devel SDL-devel
@@ -37,11 +34,9 @@
%prep
%setup -q -a 1 -n macemu-master
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
pushd cxmon-%{mon_version}
%patch10 -p1
+%patch11 -p1
popd
chmod -x SheepShaver/src/kpx_cpu/src/mathlib/ieeefp.hpp
@@ -53,7 +48,9 @@
%configure --datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
--with-mon=../../../cxmon-%{mon_version}/src \
--disable-xf86-dga --enable-sdl-audio --with-bincue
-make %{?_smp_mflags}
+DYNGEN_CFLAGS="$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector-strong//)"
+make %{?_smp_mflags} \
+ DYNGEN_CFLAGS="$DYNGEN_CFLAGS" DYNGEN_CXXFLAGS="$DYNGEN_CFLAGS"
popd
@@ -111,6 +108,10 @@
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.1.20150516
+- SheepShaver 2.4 git snapshot du-jour
+- Fix FTBFS (rf#3634)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 2.3-0.13.20130310
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -172,7 +173,7 @@
- Add --with sdl rebuild option.
- Switch from gtk1 to new gtk2 GUI.
-* Sat Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2.2-0.20050315
+* Thu Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2.2-0.20050315
- Spec file cleanup, based on the .src.rpm from the SheepShaver website.
- Make cxmon support optionnal with --without mon.
- Add menu entry.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Mar 2013 23:16:20 -0000 1.4
+++ sources 16 May 2015 09:31:42 -0000 1.5
@@ -1,3 +1,3 @@
477d800bb4b36e90aa94c0d6810b8e53 cxmon-3.2-cvs20130310.tar.gz
22e17876d74a37e1a9f19d2150170cee SheepShaver.png
-1daf9f4ef843d0f3c6fb648c26bf0722 macemu-master.zip
+5afbe1c0a1e7b16ce503aad4ca14f298 macemu-master.zip
--- BasiliskII-disk-scan-crash.patch DELETED ---
--- SheepShaver-configure-fix.patch DELETED ---
--- SheepShaver-no-strip.patch DELETED ---
9 years, 6 months
rpms/gstreamer1-plugins-bad-freeworld/devel 0001-fix-faad2-version-check.patch, NONE, 1.1 gstreamer1-plugins-bad-freeworld.spec, 1.14, 1.15
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11085
Modified Files:
gstreamer1-plugins-bad-freeworld.spec
Added Files:
0001-fix-faad2-version-check.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-2
- Add a patch from upstream fixing a faad2 crash which crashes firefox (rf3636)
0001-fix-faad2-version-check.patch:
configure.ac | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE 0001-fix-faad2-version-check.patch ---
>From bde0f119097117cf0256e450af4267a47782260b Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans(a)redhat.com>
Date: Wed, 13 May 2015 16:23:26 +0200
Subject: fix faad2 version check
On fedora 22, the output of cpp inserts extra debug comments, which
makes our regexp for the faad2 version check fail. This in turn causes
it to compile with the wrong arguments passed which then causes stack
corruption and crashes.
Fix this by only checking for the version (which should be by itself on
a single line). This is potentially less safe, it might be possible that
a similar string would appear in a later version in the header file.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
diff --git a/configure.ac b/configure.ac
index 4e2823e..c56295e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2050,9 +2050,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr])
for minor in 10 9 8 7 6 5 0; do
if test x$faad2_minor_version = "x"; then
- AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [
+ AC_EGREP_CPP([\"2\.$minor\"$], [
#include <$faad_hdr>
- GST_CHECK_FAAD_VERSION FAAD2_VERSION
+ FAAD2_VERSION
], [
faad2_minor_version=$minor
])
--
cgit v0.10.2
Index: gstreamer1-plugins-bad-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-bad-freeworld/devel/gstreamer1-plugins-bad-freeworld.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gstreamer1-plugins-bad-freeworld.spec 16 May 2015 07:40:13 -0000 1.14
+++ gstreamer1-plugins-bad-freeworld.spec 16 May 2015 08:34:45 -0000 1.15
@@ -5,11 +5,13 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
Version: 1.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{ve...
+# From upstream git
+Patch1: 0001-fix-faad2-version-check.patch
BuildRequires: gstreamer1-devel >= 1.4.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0
BuildRequires: check
@@ -28,6 +30,8 @@
#BuildRequires: vo-aacenc-devel
BuildRequires: libmpg123-devel
BuildRequires: libusbx-devel
+# For autoreconf
+BuildRequires: libtool
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -39,6 +43,9 @@
%prep
%setup -q -n gst-plugins-bad-%{version}
+%patch1 -p1
+# For patch1
+autoreconf -ivf
%build
@@ -91,6 +98,9 @@
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-2
+- Add a patch from upstream fixing a faad2 crash which crashes firefox (rf3636)
+
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.5-1
- Rebase to new upstream release 1.4.5
9 years, 6 months
