From eba84a32ca4a300a3f639348dab8c6ddd26fb4bb44d2e428a5188039ef92bbaf Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 17 Jul 2008 21:21:31 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=26

---
 byteswap.diff      | 38 ++++++++++++++++++++++++++++++++++++++
 libgphoto2.changes |  5 +++++
 libgphoto2.spec    |  6 +++++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 byteswap.diff

diff --git a/byteswap.diff b/byteswap.diff
new file mode 100644
index 0000000..e5292ba
--- /dev/null
+++ b/byteswap.diff
@@ -0,0 +1,38 @@
+--- 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), \\
diff --git a/libgphoto2.changes b/libgphoto2.changes
index a2d9542..921d83c 100644
--- a/libgphoto2.changes
+++ b/libgphoto2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 17 18:57:08 CEST 2008 - schwab@suse.de
+
+- Fix byteswap macros.
+
 -------------------------------------------------------------------
 Sun Jul 13 23:34:02 CEST 2008 - meissner@suse.de
 
diff --git a/libgphoto2.spec b/libgphoto2.spec
index d7aa7d9..1f59cef 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -19,9 +19,10 @@ License:        LGPL v2.1 or later
 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 @@ Authors:
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}}
@@ -226,6 +228,8 @@ rm -rf $RPM_BUILD_ROOT
 /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