diff --git a/byteswap.diff b/byteswap.diff deleted file mode 100644 index e5292ba..0000000 --- a/byteswap.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- 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/conf.diff b/conf.diff deleted file mode 100644 index a00249b..0000000 --- a/conf.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -197,7 +197,8 @@ dnl We are using our own libltdl checks - dnl because we do not want to ship our own copy of libltdl any more. - dnl Not shipping libltdl makes it possible to ditch our own autogen.sh - dnl and relying on standard autoconf's "autoreconf". --GP_LIB_LTDL -+dnl GP_LIB_LTDL -+AC_WITH_LTDL - - - # report on compiler/libtool setup ---- libgphoto2_port/configure.ac -+++ libgphoto2_port/configure.ac -@@ -78,7 +78,8 @@ dnl We are using our own libltdl checks - dnl because we do not want to ship our own copy of libltdl any more. - dnl Not shipping libltdl makes it possible to ditch our own autogen.sh - dnl and relying on standard autoconf's "autoreconf". --GP_LIB_LTDL -+dnl GP_LIB_LTDL -+AC_WITH_LTDL - - - # report on compiler/libtool setup diff --git a/libgphoto2-2.4.2.1.tar.bz2 b/libgphoto2-2.4.2.1.tar.bz2 new file mode 100644 index 0000000..ee90043 --- /dev/null +++ b/libgphoto2-2.4.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df11c4c647065e3c359b4c2ffa9a7a8109839b664f7c45af45e901ce07f1ac9e +size 3490469 diff --git a/libgphoto2-2.4.2.tar.bz2 b/libgphoto2-2.4.2.tar.bz2 deleted file mode 100644 index 9b57bbb..0000000 --- a/libgphoto2-2.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226 -size 3444898 diff --git a/libgphoto2.changes b/libgphoto2.changes index b02aa7d..1038199 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 9 23:49:38 CEST 2008 - meissner@suse.de + +- upgraded to 2.4.2.1 stable snapshot + - lots of bugfixes and new ids + - disable some incorrect USB ids for Mass Storage Only devices + - merged ptp2 driver from TRUNK + - byteswapping using + ------------------------------------------------------------------- Tue Aug 19 16:45:35 CEST 2008 - lnussel@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 0d4fefa..a3636b9 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.2) +# spec file for package libgphoto2 (Version 2.4.2.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,11 +25,9 @@ Url: http://gphoto.org/ License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.2 -Release: 28 +Version: 2.4.2.1 +Release: 1 Source0: libgphoto2-%{version}.tar.bz2 -Patch0: conf.diff -Patch1: byteswap.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -148,8 +146,6 @@ Authors: %lang_package %prep %setup -q -%patch0 -%patch1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} @@ -235,6 +231,12 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig %changelog +* Wed Sep 10 2008 meissner@suse.de +- upgraded to 2.4.2.1 stable snapshot + - lots of bugfixes and new ids + - disable some incorrect USB ids for Mass Storage Only devices + - merged ptp2 driver from TRUNK + - byteswapping using * Tue Aug 19 2008 lnussel@suse.de - remove resmgr from buildrequires * Thu Jul 17 2008 schwab@suse.de