From 1e869e6e4f29e4d0f33a7aa784821e224d1e1337 Mon Sep 17 00:00:00 2001 From: "zhixin.zhang" Date: Fri, 16 Dec 2022 15:19:57 +0800 Subject: [PATCH] Add sw64 arch patch (cherry picked from commit 142248e823a7d7a073ea0f7df70344b5f8e57e3c) --- libvisual-0.4.0-sw.patch | 106 +++++++++++++++++++++++++++++++++++++++ libvisual.spec | 6 ++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 libvisual-0.4.0-sw.patch diff --git a/libvisual-0.4.0-sw.patch b/libvisual-0.4.0-sw.patch new file mode 100644 index 0000000..b65cefb --- /dev/null +++ b/libvisual-0.4.0-sw.patch @@ -0,0 +1,106 @@ +diff -Naur libvisual-0.4.0.org/aclocal.m4 libvisual-0.4.0.sw/aclocal.m4 +--- libvisual-0.4.0.org/aclocal.m4 2022-03-11 06:16:49.382357080 +0000 ++++ libvisual-0.4.0.sw/aclocal.m4 2022-03-11 06:19:02.902357080 +0000 +@@ -9425,7 +9425,7 @@ + [ + # Guess based on the CPU. + case "$host_cpu" in +- alpha* | i[34567]86 | m68k | s390*) ++ sw_64* | alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; +diff -Naur libvisual-0.4.0.org/configure libvisual-0.4.0.sw/configure +--- libvisual-0.4.0.org/configure 2022-03-11 06:16:49.392357080 +0000 ++++ libvisual-0.4.0.sw/configure 2022-03-11 06:20:36.342357080 +0000 +@@ -2011,6 +2011,7 @@ + + lv_mips=no + lv_alpha=no ++lv_sw_64=no + lv_sparc=no + lv_ix86=no + lv_x86_64=no +@@ -2019,6 +2020,7 @@ + case "$host_cpu" in + mips) lv_mips=yes;; + alpha) lv_alpha=yes;; ++ sw_64) lv_sw_64=yes;; + sparc) lv_sparc=yes;; + i*86) lv_ix86=yes;; + x86_64*) lv_x86_64=yes;; +@@ -27200,6 +27202,7 @@ + + lv_mips=$lv_mips + lv_alpha=$lv_alpha ++ lv_sw_64=$lv_sw_64 + lv_sparc=$lv_sparc + lv_ix86=$lv_ix86 + lv_powerpc=$lv_powerpc +@@ -28309,6 +28312,13 @@ + _______EOF + fi + ++ if test x$lv_sw_64 = xyes ; then ++ cat >>$outfile <<_______EOF ++ ++#define VISUAL_ARCH_SW_64 ++_______EOF ++ fi ++ + if test x$lv_alpha = xyes ; then + cat >>$outfile <<_______EOF + +diff -Naur libvisual-0.4.0.org/configure.ac libvisual-0.4.0.sw/configure.ac +--- libvisual-0.4.0.org/configure.ac 2022-03-11 06:16:49.382357080 +0000 ++++ libvisual-0.4.0.sw/configure.ac 2022-03-11 06:21:41.452357080 +0000 +@@ -26,6 +26,7 @@ + + lv_mips=no + lv_alpha=no ++lv_sw_64=no + lv_sparc=no + lv_ix86=no + lv_x86_64=no +@@ -34,6 +35,7 @@ + case "$host_cpu" in + mips) lv_mips=yes;; + alpha) lv_alpha=yes;; ++ sw_64) lv_sw_64=yes;; + sparc) lv_sparc=yes;; + i*86) lv_ix86=yes;; + x86_64*) lv_x86_64=yes;; +@@ -562,6 +564,13 @@ + _______EOF + fi + ++ if test x$lv_sw_64 = xyes ; then ++ cat >>$outfile <<_______EOF ++ ++#define VISUAL_ARCH_SW_64 ++_______EOF ++ fi ++ + if test x$lv_alpha = xyes ; then + cat >>$outfile <<_______EOF + +@@ -778,6 +787,7 @@ + + lv_mips=$lv_mips + lv_alpha=$lv_alpha ++ lv_sw_64=$lv_sw_64 + lv_sparc=$lv_sparc + lv_ix86=$lv_ix86 + lv_powerpc=$lv_powerpc +diff -Naur libvisual-0.4.0.org/m4/intdiv0.m4 libvisual-0.4.0.sw/m4/intdiv0.m4 +--- libvisual-0.4.0.org/m4/intdiv0.m4 2022-03-11 06:16:49.382357080 +0000 ++++ libvisual-0.4.0.sw/m4/intdiv0.m4 2022-03-11 06:18:20.462357080 +0000 +@@ -56,7 +56,7 @@ + [ + # Guess based on the CPU. + case "$host_cpu" in +- alpha* | i[34567]86 | m68k | s390*) ++ sw_64* | alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; diff --git a/libvisual.spec b/libvisual.spec index aca425f..bf946a4 100644 --- a/libvisual.spec +++ b/libvisual.spec @@ -1,6 +1,6 @@ Name: libvisual Version: 0.4.0 -Release: 28 +Release: 29 Epoch: 1 Summary: Audio Visualization Library @@ -11,6 +11,7 @@ Source0: http://dl.sf.net/libvisual/%{name}-%{version}.tar.gz Patch0: libvisual-0.4.0-better-altivec-detection.patch Patch1: libvisual-0.4.0-inlinedefineconflict.patch Patch2: libvisual-0.4.0-format-security.patch +Patch3: libvisual-0.4.0-sw.patch BuildRequires: libtool gettext gcc-c++ xorg-x11-proto-devel doxygen @@ -62,6 +63,9 @@ make %{?_smp_mflags} %{_libdir}/pkgconfig/*.pc %changelog +* Fri Dec 2022 zhangzhixin - 1:0.4.0-29 +- Add sw64 arch patch + * Fri Oct 28 2022 chenhaixiang - 1:0.4.0-28 - rebuild package -- Gitee