From bb9a2ed1fff69c3407721d2cbe013782c391a3ea Mon Sep 17 00:00:00 2001 From: wzx Date: Thu, 20 Oct 2022 12:23:34 +0800 Subject: [PATCH] Add sw64 architecture Signed-off-by: wzx (cherry picked from commit 1397e09f478713f6f2cfc57e9c2029cc5b963379) --- gphoto2-2.5.17-sw.patch | 36 ++++++++++++++++++++++++++++++++++++ gphoto2.spec | 6 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100755 gphoto2-2.5.17-sw.patch diff --git a/gphoto2-2.5.17-sw.patch b/gphoto2-2.5.17-sw.patch new file mode 100755 index 0000000..5fcec3e --- /dev/null +++ b/gphoto2-2.5.17-sw.patch @@ -0,0 +1,36 @@ +diff -Naur gphoto2-2.5.17.org/gphoto-m4/gp-stdint.m4 gphoto2-2.5.17.sw/gphoto-m4/gp-stdint.m4 +--- gphoto2-2.5.17.org/gphoto-m4/gp-stdint.m4 2022-02-26 06:48:19.750000000 +0000 ++++ gphoto2-2.5.17.sw/gphoto-m4/gp-stdint.m4 2022-02-26 06:49:11.080000000 +0000 +@@ -449,7 +449,7 @@ + typedef unsigned long long uint64_t; + #endif + +-#elif defined __alpha || (defined __mips && defined _ABIN32) ++#elif defined __alpha || defined __sw_64 || (defined __mips && defined _ABIN32) + #if !defined _NO_LONGLONG + typedef long int64_t; + typedef unsigned long uint64_t; +diff -Naur gphoto2-2.5.17.org/packaging/rpm/Makefile.am gphoto2-2.5.17.sw/packaging/rpm/Makefile.am +--- gphoto2-2.5.17.org/packaging/rpm/Makefile.am 2022-02-26 06:48:19.780000000 +0000 ++++ gphoto2-2.5.17.sw/packaging/rpm/Makefile.am 2022-02-26 06:50:54.610000000 +0000 +@@ -15,7 +15,7 @@ + rpm: Makefile package.spec + $(MAKE) clean + mkdir -p BUILD SPECS SOURCES SRPMS +- for arch in i386 i486 i586 i686 alpha noarch; do \ ++ for arch in i386 i486 i586 i686 sw_64 alpha noarch; do \ + mkdir -p "RPMS/$${arch}"; \ + done + ln -f "$(top_srcdir)/@PACKAGE@-@VERSION@.tar.gz" SOURCES/ +diff -Naur gphoto2-2.5.17.org/packaging/rpm/Makefile.in gphoto2-2.5.17.sw/packaging/rpm/Makefile.in +--- gphoto2-2.5.17.org/packaging/rpm/Makefile.in 2022-02-26 06:48:19.780000000 +0000 ++++ gphoto2-2.5.17.sw/packaging/rpm/Makefile.in 2022-02-26 06:50:47.590000000 +0000 +@@ -508,7 +508,7 @@ + rpm: Makefile package.spec + $(MAKE) clean + mkdir -p BUILD SPECS SOURCES SRPMS +- for arch in i386 i486 i586 i686 alpha noarch; do \ ++ for arch in i386 i486 i586 i686 sw_64 alpha noarch; do \ + mkdir -p "RPMS/$${arch}"; \ + done + ln -f "$(top_srcdir)/@PACKAGE@-@VERSION@.tar.gz" SOURCES/ diff --git a/gphoto2.spec b/gphoto2.spec index 164a551..4337354 100644 --- a/gphoto2.spec +++ b/gphoto2.spec @@ -1,10 +1,11 @@ Name: gphoto2 Version: 2.5.17 -Release: 4 +Release: 5 Summary: Access software for digital cameras License: GPLv2+ Url: http://www.gphoto.org/ Source0: http://downloads.sourceforge.net/gphoto/gphoto2-%{version}.tar.bz2 +Patch1: gphoto2-2.5.17-sw.patch BuildRequires: make pkgconfig(libgphoto2) >= %{version} libjpeg-devel BuildRequires: pkgconfig(libexif) popt-devel readline-devel gcc @@ -39,6 +40,9 @@ This package provides documentation for gphoto2. %{_mandir}/man1/gphoto2.1* %changelog +* Thu Oct 20 2022 wuzx - 2.5.17-5 +- add sw64 patch + * Mon Jun 7 2021 baizhonggui - 2.5.17-4 - Fix building error: configure: error: no acceptable C compiler found in $PATH - Add gcc in BuildRequires