add libvisual-0.4.2 sw64 arch patch
(cherry picked from commit b8b78d61e3b28e9500abac9670baa4ad4a1ed8d7)
This commit is contained in:
parent
f556060494
commit
2fe20dd11f
@ -1,7 +1,7 @@
|
|||||||
From c160e188dcd1bbce75f0385c1582ad1d385b8d03 Mon Sep 17 00:00:00 2001
|
From b9a5b83804e13d2d18d805642bb71a28b75b1058 Mon Sep 17 00:00:00 2001
|
||||||
From: licihua <licihua@huawei.com>
|
From: wangshuo <wangshuo@kylinos.cn>
|
||||||
Date: Thu, 29 Dec 2022 11:39:30 +0800
|
Date: Tue, 27 Feb 2024 08:22:48 +0000
|
||||||
Subject: [PATCH 3/3] libvisual-0.4.0-sw.patch
|
Subject: [PATCH] libvisual-0.4.2-sw.patch
|
||||||
|
|
||||||
---
|
---
|
||||||
configure | 10 ++++++++++
|
configure | 10 ++++++++++
|
||||||
@ -9,10 +9,10 @@ Subject: [PATCH 3/3] libvisual-0.4.0-sw.patch
|
|||||||
2 files changed, 20 insertions(+)
|
2 files changed, 20 insertions(+)
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
diff --git a/configure b/configure
|
||||||
index bca4f47..fab6100 100755
|
index 492545e..b35422b 100755
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -3985,6 +3985,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
@@ -3986,6 +3986,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
lv_mips=no
|
lv_mips=no
|
||||||
lv_alpha=no
|
lv_alpha=no
|
||||||
@ -20,7 +20,7 @@ index bca4f47..fab6100 100755
|
|||||||
lv_sparc=no
|
lv_sparc=no
|
||||||
lv_ix86=no
|
lv_ix86=no
|
||||||
lv_x86_64=no
|
lv_x86_64=no
|
||||||
@@ -3993,6 +3994,7 @@ lv_powerpc=no
|
@@ -3994,6 +3995,7 @@ lv_powerpc=no
|
||||||
case "$host_cpu" in
|
case "$host_cpu" in
|
||||||
mips) lv_mips=yes;;
|
mips) lv_mips=yes;;
|
||||||
alpha) lv_alpha=yes;;
|
alpha) lv_alpha=yes;;
|
||||||
@ -28,7 +28,7 @@ index bca4f47..fab6100 100755
|
|||||||
sparc) lv_sparc=yes;;
|
sparc) lv_sparc=yes;;
|
||||||
i*86) lv_ix86=yes;;
|
i*86) lv_ix86=yes;;
|
||||||
x86_64*) lv_x86_64=yes;;
|
x86_64*) lv_x86_64=yes;;
|
||||||
@@ -23091,6 +23093,7 @@ fi
|
@@ -22944,6 +22946,7 @@ fi
|
||||||
|
|
||||||
lv_mips=$lv_mips
|
lv_mips=$lv_mips
|
||||||
lv_alpha=$lv_alpha
|
lv_alpha=$lv_alpha
|
||||||
@ -36,22 +36,22 @@ index bca4f47..fab6100 100755
|
|||||||
lv_sparc=$lv_sparc
|
lv_sparc=$lv_sparc
|
||||||
lv_ix86=$lv_ix86
|
lv_ix86=$lv_ix86
|
||||||
lv_x86_64=$lv_x86_64
|
lv_x86_64=$lv_x86_64
|
||||||
@@ -24736,6 +24739,13 @@ _______EOF
|
@@ -24597,6 +24600,13 @@ _______EOF
|
||||||
_______EOF
|
_______EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
+ if test x$lv_sw_64 = xyes ; then
|
+ if test x$lv_sw_64 = xyes ; then
|
||||||
+ cat >>$outfile <<_______EOF
|
+ cat >>$outfile <<_______EOF
|
||||||
+
|
+
|
||||||
+#define VISUAL_ARCH_SW_64
|
+#define VISUAL_ARCH_SW_64
|
||||||
+_______EOF
|
+_______EOF
|
||||||
+ fi
|
+ fi
|
||||||
+
|
+
|
||||||
if test x$lv_alpha = xyes ; then
|
if test x$lv_sparc = xyes ; then
|
||||||
cat >>$outfile <<_______EOF
|
cat >>$outfile <<_______EOF
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 0253fdb..89fc4e5 100644
|
index 75fb9ea..16c85c6 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -26,6 +26,7 @@ AC_CANONICAL_HOST
|
@@ -26,6 +26,7 @@ AC_CANONICAL_HOST
|
||||||
@ -70,21 +70,21 @@ index 0253fdb..89fc4e5 100644
|
|||||||
sparc) lv_sparc=yes;;
|
sparc) lv_sparc=yes;;
|
||||||
i*86) lv_ix86=yes;;
|
i*86) lv_ix86=yes;;
|
||||||
x86_64*) lv_x86_64=yes;;
|
x86_64*) lv_x86_64=yes;;
|
||||||
@@ -585,6 +587,13 @@ _______EOF
|
@@ -602,6 +604,13 @@ _______EOF
|
||||||
_______EOF
|
_______EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
+ if test x$lv_sw_64 = xyes ; then
|
+ if test x$lv_sw_64 = xyes ; then
|
||||||
+ cat >>$outfile <<_______EOF
|
+ cat >>$outfile <<_______EOF
|
||||||
+
|
+
|
||||||
+#define VISUAL_ARCH_SW_64
|
+#define VISUAL_ARCH_SW_64
|
||||||
+_______EOF
|
+_______EOF
|
||||||
+ fi
|
+ fi
|
||||||
+
|
+
|
||||||
if test x$lv_alpha = xyes ; then
|
if test x$lv_sparc = xyes ; then
|
||||||
cat >>$outfile <<_______EOF
|
cat >>$outfile <<_______EOF
|
||||||
|
|
||||||
@@ -801,6 +810,7 @@ echo >>$outfile
|
@@ -811,6 +820,7 @@ echo >>$outfile
|
||||||
|
|
||||||
lv_mips=$lv_mips
|
lv_mips=$lv_mips
|
||||||
lv_alpha=$lv_alpha
|
lv_alpha=$lv_alpha
|
||||||
@ -93,5 +93,5 @@ index 0253fdb..89fc4e5 100644
|
|||||||
lv_ix86=$lv_ix86
|
lv_ix86=$lv_ix86
|
||||||
lv_x86_64=$lv_x86_64
|
lv_x86_64=$lv_x86_64
|
||||||
--
|
--
|
||||||
2.26.2
|
2.27.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: libvisual
|
Name: libvisual
|
||||||
Version: 0.4.2
|
Version: 0.4.2
|
||||||
Release: 1
|
Release: 2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: Audio Visualization Library
|
Summary: Audio Visualization Library
|
||||||
|
|
||||||
@ -9,6 +9,7 @@ URL: http://libvisual.org/
|
|||||||
Source0: http://dl.sf.net/libvisual/%{name}-%{version}.tar.gz
|
Source0: http://dl.sf.net/libvisual/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch1: libvisual-0.4.0-inlinedefineconflict.patch
|
Patch1: libvisual-0.4.0-inlinedefineconflict.patch
|
||||||
|
Patch2: libvisual-0.4.2-sw.patch
|
||||||
|
|
||||||
BuildRequires: libtool gettext gcc-c++ xorg-x11-proto-devel doxygen SDL-devel
|
BuildRequires: libtool gettext gcc-c++ xorg-x11-proto-devel doxygen SDL-devel
|
||||||
|
|
||||||
@ -36,6 +37,7 @@ libraries.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
touch aclocal.m4 #Do not regenerate aclocal.m4, for ci check_build
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
# doc file
|
# doc file
|
||||||
#doxygen
|
#doxygen
|
||||||
@ -62,6 +64,9 @@ make %{?_smp_mflags}
|
|||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 27 2024 wangshuo <wangshuo@kylinos.cn> - 1:0.4.2-2
|
||||||
|
- add libvisual-0.4.2 sw64 arch patch
|
||||||
|
|
||||||
* Tue Feb 6 2024 zhangnaichuan <zhangnaichuan@huawei.com> - 1:0.4.2-1
|
* Tue Feb 6 2024 zhangnaichuan <zhangnaichuan@huawei.com> - 1:0.4.2-1
|
||||||
- upgrade to 0.4.2
|
- upgrade to 0.4.2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user