rpms/netpbm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

build with gcc 4.3

Browse Source
This commit is contained in:
Jindrich Novy 2008-02-15 11:00:35 +00:00
parent 39ac331c60
commit 952f831e98
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netpbm-10.35-gcc43.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up netpbm-10.35.36/lib/libpbm3.c.gcc43 netpbm-10.35.36/lib/libpbm3.c
--- netpbm-10.35.36/lib/libpbm3.c.gcc43 2007-12-31 07:02:07.000000000 +0100
+++ netpbm-10.35.36/lib/libpbm3.c 2008-01-08 13:08:52.000000000 +0100
@@ -105,7 +105,7 @@ packBitsWithMmxSse(FILE * const
) ];
*/
- typedef int v8qi __attribute__ ((mode(V8QI)));
+ typedef int v8qi __attribute__ ((vector_size(8)));
typedef int di __attribute__ ((mode(DI)));
di const zero64 = 0; /* to clear with PXOR */

5
netpbm.spec
View File

@ -27,6 +27,7 @@ Patch15: netpbm-10.35-ppmquantall.patch
Patch16: netpbm-10.35-pbmtog3segfault.patch Patch16: netpbm-10.35-pbmtog3segfault.patch
Patch17: netpbm-10.35-pbmtomacp.patch Patch17: netpbm-10.35-pbmtomacp.patch
Patch18: netpbm-10.35-glibc.patch Patch18: netpbm-10.35-glibc.patch
Patch19: netpbm-10.35-gcc43.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel xorg-x11-server-utils python BuildRequires: libX11-devel xorg-x11-server-utils python
@ -85,6 +86,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch16 -p1 -b .pbmtog3segfault %patch16 -p1 -b .pbmtog3segfault
%patch17 -p1 -b .pbmtomacp %patch17 -p1 -b .pbmtomacp
%patch18 -p1 -b .glibc %patch18 -p1 -b .glibc
%patch19 -p1 -b .gcc43
##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@ -115,7 +117,7 @@ EOF
TOP=`pwd` TOP=`pwd`
make \ make \
CC=%{__cc} \ CC=%{__cc} \
CFLAGS="$RPM_OPT_FLAGS -fPIC" \ CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \ LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
LADD="-lm" \ LADD="-lm" \
JPEGINC_DIR=%{_includedir} \ JPEGINC_DIR=%{_includedir} \
@ -211,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Feb 14 2008 Jindrich Novy <jnovy@redhat.com> 10.35.38-1 * Thu Feb 14 2008 Jindrich Novy <jnovy@redhat.com> 10.35.38-1
- update to 10.35.38 (fixes to pbmtext and ppmtoarbtxt) - update to 10.35.38 (fixes to pbmtext and ppmtoarbtxt)
- fix to let it built with gcc 4.3
* Thu Jan 17 2008 Jindrich Novy <jnovy@redhat.com> 10.35.37-1 * Thu Jan 17 2008 Jindrich Novy <jnovy@redhat.com> 10.35.37-1
- update to 10.35.37 - update to 10.35.37