!16 添加sw架构

From: @wu-leilei Reviewed-by: @wk333 Signed-off-by: @wk333
Add sw64 architecture
2024-03-28 06:26:05 +00:00 · 2024-03-28 10:03:59 +08:00 · 2022-04-12 03:27:47 +00:00 · 2022-04-07 11:29:51 +08:00 · 2021-06-07 20:23:32 +08:00 · 2021-06-07 10:12:27 +08:00
4 changed files with 90 additions and 2 deletions
--- a/9000-add-stack-protector-for-build.patch
+++ b/9000-add-stack-protector-for-build.patch
@ -0,0 +1,12 @@
+diff -uprN xmms-1.2.11-20071117cvs_raw/acinclude.m4 xmms-1.2.11-20071117cvs/acinclude.m4
+--- xmms-1.2.11-20071117cvs_raw/acinclude.m4	2007-03-09 06:45:07.000000000 +0800
+++ xmms-1.2.11-20071117cvs/acinclude.m4	2020-03-17 11:46:23.702741636 +0800
+@@ -5607,7 +5607,7 @@ EOF
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script -fstack-protector-strong ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
--- a/xmms-1.2.11-20071117cvs-sw.patch
+++ b/xmms-1.2.11-20071117cvs-sw.patch
@ -0,0 +1,57 @@
+diff -Naur xmms-1.2.11-20071117cvs.org/aclocal.m4 xmms-1.2.11-20071117cvs.sw/aclocal.m4
+--- xmms-1.2.11-20071117cvs.org/aclocal.m4	2022-03-03 02:55:30.470000000 +0000
+++ xmms-1.2.11-20071117cvs.sw/aclocal.m4	2022-03-03 02:56:24.740000000 +0000
+@@ -1532,7 +1532,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 xmms-1.2.11-20071117cvs.org/configure xmms-1.2.11-20071117cvs.sw/configure
+--- xmms-1.2.11-20071117cvs.org/configure	2022-03-03 02:55:30.570000000 +0000
+++ xmms-1.2.11-20071117cvs.sw/configure	2022-03-03 02:58:09.280000000 +0000
+@@ -25421,7 +25421,7 @@
+ 
+           # Guess based on the CPU.
+           case "$host_cpu" in
+-            alpha* | i3456786 | m68k | s390*)
+            sw_64* | alpha* | i3456786 | m68k | s390*)
+               gt_cv_int_divbyzero_sigfpe="guessing yes";;
+             *)
+               gt_cv_int_divbyzero_sigfpe="guessing no";;
+@@ -33336,7 +33336,7 @@
+     *) CFLAGS="$CFLAGS -fomit-frame-pointer" ;;
+   esac
+   case "$host" in
+-    alpha*-*-freebsd*)
+    alpha*-*-freebsd* | sw_64*-*-freebsd*)
+ 	;;
+     *-*-freebsd*)
+ 	CFLAGS="$CFLAGS -ffast-math"
+diff -Naur xmms-1.2.11-20071117cvs.org/configure.in xmms-1.2.11-20071117cvs.sw/configure.in
+--- xmms-1.2.11-20071117cvs.org/configure.in	2022-03-03 02:55:30.530000000 +0000
+++ xmms-1.2.11-20071117cvs.sw/configure.in	2022-03-03 02:59:20.030000000 +0000
+@@ -516,7 +516,7 @@
+     *) CFLAGS="$CFLAGS -fomit-frame-pointer" ;;
+   esac
+   case "$host" in
+-    alpha*-*-freebsd*)
+    alpha*-*-freebsd* | sw_64*-*-freebsd*)
+ 	;;
+     *-*-freebsd*)
+ 	CFLAGS="$CFLAGS -ffast-math"
+diff -Naur xmms-1.2.11-20071117cvs.org/intl/dcigettext.c xmms-1.2.11-20071117cvs.sw/intl/dcigettext.c
+--- xmms-1.2.11-20071117cvs.org/intl/dcigettext.c	2022-03-03 02:55:30.550000000 +0000
+++ xmms-1.2.11-20071117cvs.sw/intl/dcigettext.c	2022-03-03 02:59:00.130000000 +0000
+@@ -72,7 +72,7 @@
+ #ifdef _LIBC
+   /* Guess whether integer division by zero raises signal SIGFPE.
+      Set to 1 only if you know for sure.  In case of doubt, set to 0.  */
+-# if defined __alpha__ || defined __arm__ || defined __i386__ \
+# if defined __alpha__ || defined __sw_64__ || defined __arm__ || defined __i386__ \
+      || defined __m68k__ || defined __s390__
+ #  define INTDIV0_RAISES_SIGFPE 1
+ # else
--- a/xmms.spec
+++ b/xmms.spec
@ -1,7 +1,7 @@
 Name:           xmms
 Epoch:          1
 Version:        1.2.11
-Release:        38.20071117cvs
+Release:        42.20071117cvs
 License:        GPLv2+
 Summary:        XMMS is a legacy GTK+1 music player modeled after Winamp
 URL:            https://git.conf.top/public/rpmbuild/src/master/xmms
@ -13,7 +13,7 @@ Source4:        xmms.desktop
 Provides:       xmms-esd = 1:%{version}-%{release} xmms-gui bundled(libmpg123) xmms-mp3 = %{version}-%{release} xmms-libs = 1:%{version}-%{release}
 Obsoletes:      xmms-esd < 1:18.20071117cvs xmms-mp3 < 1.2.11-8 xmms-libs < 1:%{version}-%{release}
 BuildRequires:  gtk+-devel alsa-lib-devel libogg-devel libvorbis-devel mikmod-devel gettext-devel
-BuildRequires:  zlib-devel libGL-devel libXt-devel libSM-devel libXxf86vm-devel desktop-file-utils
+BuildRequires:  zlib-devel libGL-devel libXt-devel libSM-devel libXxf86vm-devel desktop-file-utils gcc
 Requires:       unzip libcanberra-gtk2 gtk2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@ -33,6 +33,8 @@ Patch0012:      xmms-1.2.10-ubuntu-CVE-2007-0653.patch
 Patch0013:      xmms-alsa-fix-loop.patch
 Patch0014:      xmms-1.2.11-mikmod-fix.patch
 Patch0015:      xmms-1.2.11-a-b.patch
+Patch9000:      9000-add-stack-protector-for-build.patch
+Patch9001:      xmms-1.2.11-20071117cvs-sw.patch

 %description
 XMMS is a legacy GTK+1 music player similar to Winamp's. XMMS supports
@ -56,6 +58,7 @@ Help document for XMMS.
 %prep
 %autosetup -n xmms-%{version}-20071117cvs -a3 -p1
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
+install -p -m 0644 /usr/lib/rpm/mkinstalldirs mkinstalldirs
 %build
 %configure --disable-dependency-tracking --enable-kanji --enable-texthack --enable-ipv6 --with-pic --disable-esd
 %make_build
@ -99,6 +102,18 @@ install -Dpm 644 xmms.pc %{buildroot}%{_libdir}/pkgconfig/xmms.pc
 %{_mandir}/man1/*xmms.1*

 %changelog
+* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 1:1.2.11-42.20071117cvs
+- Add sw64 architecture
+
+* Thu Jan 13 2022 Chen Chen <chen_aka_jan@163.com> - 1:1.2.11-41.20071117cvs
+- fix mkinstalldirs path error
+
+* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 1:1.2.11-40.20071117cvs
+- Completing build dependencies to fix gcc compiler missing error
+
+* Tue Mar 17 2020 Ling Yang <lingyang2@huawei.com> - 1:1.2.11-39.20071117cvs
+- Add stack protector for building
+
 * Mon Jan 20 2020 wangzhishun <wangzhishun1@huawei.com> - 1:1.2.11-38.20071117cvs
 - modify url

--- a/xmms.yaml
+++ b/xmms.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: adplug/xmms
+tag_prefix: "^adplug-xmms-"
+seperator: "."
Author	SHA1	Message	Date
openeuler-ci-bot	60d9a9c421	!16 添加sw架构 From: @wu-leilei Reviewed-by: @wk333 Signed-off-by: @wk333	2024-03-28 06:26:05 +00:00
wu-leilei	91cfa1f57e	Add sw64 architecture	2024-03-28 10:03:59 +08:00
openeuler-ci-bot	25c630bbac	!12 [sync] PR-11: fix mkinstalldirs path error From: @openeuler-sync-bot Reviewed-by: @small_leek Signed-off-by: @small_leek	2022-04-12 03:27:47 +00:00
chen-jan	0c4ac74c35	fix mkinstalldirs path error (cherry picked from commit bea858eda35dcc9e1e338254ba8ba0f3c568f80a)	2022-04-07 11:29:51 +08:00
openeuler-ci-bot	60fb7053c2	!10 Completing build dependencies to fix gcc compiler missing error From: @hht8 Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-06-07 20:23:32 +08:00
hht8	4e565eadc9	Completing build dependencies to fix gcc compiler missing error	2021-06-07 10:12:27 +08:00
openeuler-ci-bot	6a63184357	!8 add yaml Merge pull request !8 from yaokai13/master	2020-08-14 09:37:43 +08:00
yaokai13	bec66cf020	add yaml	2020-08-13 16:06:49 +08:00
openeuler-ci-bot	401cfe8fd4	!6 xmms: Add stack protector for building Merge pull request !6 from gnaygnil/master	2020-03-17 14:03:12 +08:00
gnaygnil	d79122cb45	xmms: Add stack protector for building	2020-03-17 12:27:10 +08:00