Hello community, here is the log from the commit of package lib3ds checked in at Fri Sep 1 01:30:40 CEST 2006. -------- --- lib3ds/lib3ds.changes 2006-01-25 21:37:21.000000000 +0100 +++ lib3ds/lib3ds.changes 2006-08-31 17:13:19.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 31 17:11:37 CEST 2006 - pth@suse.de + +- Fix quoting in definition of AM_PATH_LIB3DS. +- Fix type punning to compile with strict-aliasing. + +------------------------------------------------------------------- New: ---- lib3ds-fix_quoting.patch lib3ds-no_type_punning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lib3ds.spec ++++++ --- /var/tmp/diff_new_pack.Aai9GA/_old 2006-09-01 01:30:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Aai9GA/_new 2006-09-01 01:30:22.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package lib3ds (Version 1.2.0) # -# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,15 +14,17 @@ URL: http://lib3ds.sourceforge.net License: LGPL Group: Development/Libraries/C and C++ -Summary: import and export of Autodesk 3DS files +Summary: Import and Export of Autodesk 3DS Files Version: 1.2.0 -Release: 156 +Release: 171 Source0: %name-%version.tar.bz2 +Patch0: lib3ds-fix_quoting.patch +Patch1: lib3ds-no_type_punning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Lib3ds is a free alternative to Autodesk's 3DS File Toolkit for -handling 3DS files Its main goal is to simplify the creation of 3DS +handling 3DS files. Its main goal is to simplify the creation of 3DS import and export filters. @@ -33,9 +35,11 @@ %prep %setup -q +%patch0 +%patch1 %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=/usr \ --libdir=%{_libdir} \ @@ -58,6 +62,9 @@ /%_mandir/man1/*gz %changelog -n lib3ds +* Thu Aug 31 2006 - pth@suse.de +- Fix quoting in definition of AM_PATH_LIB3DS. +- Fix type punning to compile with strict-aliasing. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Apr 21 2004 - adrian@suse.de ++++++ lib3ds-fix_quoting.patch ++++++ --- lib3ds.m4 +++ lib3ds.m4 @@ -1,7 +1,7 @@ dnl dnl AM_PATH_LIB3DS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl -AC_DEFUN(AM_PATH_LIB3DS, +AC_DEFUN([AM_PATH_LIB3DS], [ AC_ARG_WITH(lib3ds-prefix,[ --with-lib3ds-prefix=PFX Prefix where lib3ds is installed (optional)], ++++++ lib3ds-no_type_punning.patch ++++++ --- lib3ds/io.c +++ lib3ds/io.c @@ -248,15 +248,15 @@ lib3ds_io_read_float(Lib3dsIo *io) { Lib3dsByte b[4]; - Lib3dsDword d; + union{Lib3dsDword w; Lib3dsFloat f;}d; ASSERT(io); lib3ds_io_read(io, b, 4); - d=((Lib3dsDword)b[3] << 24) | - ((Lib3dsDword)b[2] << 16) | - ((Lib3dsDword)b[1] << 8) | - ((Lib3dsDword)b[0]); - return(*((Lib3dsFloat*)&d)); + d.w = ((Lib3dsDword)b[3] << 24) | + ((Lib3dsDword)b[2] << 16) | + ((Lib3dsDword)b[1] << 8) | + ((Lib3dsDword)b[0]); + return d.f; } @@ -459,14 +459,14 @@ lib3ds_io_write_float(Lib3dsIo *io, Lib3dsFloat l) { Lib3dsByte b[4]; - Lib3dsDword d; + union{Lib3dsDword w; Lib3dsFloat f;}d; ASSERT(io); - d=*((Lib3dsDword*)&l); - b[3]=(Lib3dsByte)(((Lib3dsDword)d & 0xFF000000) >> 24); - b[2]=(Lib3dsByte)(((Lib3dsDword)d & 0x00FF0000) >> 16); - b[1]=(Lib3dsByte)(((Lib3dsDword)d & 0x0000FF00) >> 8); - b[0]=(Lib3dsByte)(((Lib3dsDword)d & 0x000000FF)); + d.f=l; + b[3]=(Lib3dsByte)((d.w & 0xFF000000) >> 24); + b[2]=(Lib3dsByte)((d.w & 0x00FF0000) >> 16); + b[1]=(Lib3dsByte)((d.w & 0x0000FF00) >> 8); + b[0]=(Lib3dsByte)((d.w & 0x000000FF)); if (lib3ds_io_write(io, b, 4)!=4) { return(LIB3DS_FALSE); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org