Hello community, here is the log from the commit of package libgphoto2 checked in at Thu Jul 17 23:21:30 CEST 2008. -------- --- GNOME/libgphoto2/libgphoto2.changes 2008-07-13 23:34:28.000000000 +0200 +++ libgphoto2/libgphoto2.changes 2008-07-17 18:57:26.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 17 18:57:08 CEST 2008 - schwab@suse.de + +- Fix byteswap macros. + +------------------------------------------------------------------- New: ---- byteswap.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.u12414/_old 2008-07-17 23:18:55.000000000 +0200 +++ /var/tmp/diff_new_pack.u12414/_new 2008-07-17 23:18:55.000000000 +0200 @@ -19,9 +19,10 @@ Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.2 -Release: 1 +Release: 3 Source0: libgphoto2-%{version}.tar.bz2 Patch0: conf.diff +Patch1: byteswap.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -141,6 +142,7 @@ %prep %setup -q %patch0 +%patch1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} @@ -226,6 +228,8 @@ /sbin/ldconfig %changelog +* Thu Jul 17 2008 schwab@suse.de +- Fix byteswap macros. * Mon Jul 14 2008 meissner@suse.de - upgraded to 2.4.2 stable release - more ids, more bugfixes backmerged ++++++ byteswap.diff ++++++ --- libgphoto2_port/m4/gp-byteorder.m4 +++ libgphoto2_port/m4/gp-byteorder.m4 @@ -322,12 +322,12 @@ EOF /* Non-optimized but portable macros */ #define be16atoh(x) ((uint16_t)(((x)[0]<<8)|(x)[1])) #define be32atoh(x) ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3])) -#define be64atoh(x) ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\ - ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7])) +#define be64atoh(x) ((((uint64_t)(x)[0]<<56)|((uint64_t)(x)[1]<<48)|((uint64_t)(x)[2]<<40)| \\ + ((uint64_t)(x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7])) #define le16atoh(x) ((uint16_t)(((x)[1]<<8)|(x)[0])) #define le32atoh(x) ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) -#define le64atoh(x) ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\ - ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) +#define le64atoh(x) ((((uint64_t)(x)[7]<<56)|((uint64_t)(x)[6]<<48)|((uint64_t)(x)[5]<<40)| \\ + ((uint64_t)(x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) #define htobe16a(a,x) (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x) #define htobe32a(a,x) (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\ --- m4m/gp-byteorder.m4 +++ m4m/gp-byteorder.m4 @@ -322,12 +322,12 @@ EOF /* Non-optimized but portable macros */ #define be16atoh(x) ((uint16_t)(((x)[0]<<8)|(x)[1])) #define be32atoh(x) ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3])) -#define be64atoh(x) ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\ - ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7])) +#define be64atoh(x) ((((uint64_t)(x)[0]<<56)|((uint64_t)(x)[1]<<48)|((uint64_t)(x)[2]<<40)| \\ + ((uint64_t)(x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7])) #define le16atoh(x) ((uint16_t)(((x)[1]<<8)|(x)[0])) #define le32atoh(x) ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) -#define le64atoh(x) ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\ - ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) +#define le64atoh(x) ((((uint64_t)(x)[7]<<56)|((uint64_t)(x)[6]<<48)|((uint64_t)(x)[5]<<40)| \\ + ((uint64_t)(x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) #define htobe16a(a,x) (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x) #define htobe32a(a,x) (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org