diff --git a/libvisual-0.4.0-better-altivec-detection.patch b/libvisual-0.4.0-better-altivec-detection.patch index 4004ad94d854005846c80d05e1a118bb45453c17..addcc3eedc584d84e1c9b9d1bb3fc930e66ca83c 100644 --- a/libvisual-0.4.0-better-altivec-detection.patch +++ b/libvisual-0.4.0-better-altivec-detection.patch @@ -1,5 +1,16 @@ ---- libvisual-0.4.0/libvisual/lv_cpu.c.orig 2006-01-22 13:23:37.000000000 +0000 -+++ libvisual-0.4.0/libvisual/lv_cpu.c 2008-03-11 16:00:56.000000000 +0000 +From 7f30ba9d44361296daef549fa049f579541ac5b1 Mon Sep 17 00:00:00 2001 +From: licihua +Date: Thu, 29 Dec 2022 11:22:45 +0800 +Subject: [PATCH 1/3] libvisual-0.4.0-better-altivec-detection + +--- + libvisual/lv_cpu.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +diff --git a/libvisual/lv_cpu.c b/libvisual/lv_cpu.c +index 4378396..f8cb502 100644 +--- a/libvisual/lv_cpu.c ++++ b/libvisual/lv_cpu.c @@ -50,8 +50,19 @@ #endif @@ -20,7 +31,7 @@ #if defined(VISUAL_OS_WIN32) #include -@@ -154,6 +165,46 @@ static void check_os_altivec_support( vo +@@ -154,6 +165,46 @@ static void check_os_altivec_support( void ) if (err == 0) if (has_vu != 0) __lv_cpu_caps.hasAltiVec = 1; @@ -67,3 +78,6 @@ #else /* !VISUAL_OS_DARWIN */ /* no Darwin, do it the brute-force way */ /* this is borrowed from the libmpeg2 library */ +-- +2.26.2 + diff --git a/libvisual-0.4.0-inlinedefineconflict.patch b/libvisual-0.4.0-inlinedefineconflict.patch index 11ce3340cffcdeb391cdfc980670acf952aecc51..1953559604c918e73ee41fa20d912a0dcac62c47 100644 --- a/libvisual-0.4.0-inlinedefineconflict.patch +++ b/libvisual-0.4.0-inlinedefineconflict.patch @@ -1,6 +1,18 @@ -diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_cache.c ---- libvisual-0.4.0.orig/libvisual/lv_cache.c 2009-03-07 17:17:38.000000000 +0000 -+++ libvisual-0.4.0/libvisual/lv_cache.c 2009-03-07 17:25:26.000000000 +0000 +From 54107a5d81ffaba6111fea2c98618109b6ddcde4 Mon Sep 17 00:00:00 2001 +From: licihua +Date: Thu, 29 Dec 2022 11:30:17 +0800 +Subject: [PATCH 2/3] libvisual-0.4.0-inlinedefineconflict + +--- + libvisual/lv_cache.c | 4 ++-- + libvisual/lv_defines.h | 2 ++ + libvisual/lv_time.h | 4 ++-- + 3 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libvisual/lv_cache.c b/libvisual/lv_cache.c +index f905d22..3f975aa 100644 +--- a/libvisual/lv_cache.c ++++ b/libvisual/lv_cache.c @@ -32,7 +32,7 @@ static int cache_dtor (VisObject *object); static int cache_remove_list_entry (VisCache *cache, VisListEntry **le); @@ -10,7 +22,7 @@ diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_ static int cache_dtor (VisObject *object) { -@@ -74,7 +74,7 @@ +@@ -74,7 +74,7 @@ static int cache_remove_list_entry (VisCache *cache, VisListEntry **le) } @@ -19,29 +31,30 @@ diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_ { VisCacheEntry *centry; -diff -ru libvisual-0.4.0.orig/libvisual/lv_defines.h libvisual-0.4.0/libvisual/lv_defines.h ---- libvisual-0.4.0.orig/libvisual/lv_defines.h 2009-03-07 17:17:38.000000000 +0000 -+++ libvisual-0.4.0/libvisual/lv_defines.h 2009-03-07 17:24:17.000000000 +0000 -@@ -63,13 +63,13 @@ +diff --git a/libvisual/lv_defines.h b/libvisual/lv_defines.h +index 0de91b6..2961d39 100644 +--- a/libvisual/lv_defines.h ++++ b/libvisual/lv_defines.h +@@ -63,12 +63,14 @@ /* Compiler specific optimalization macros */ #if __GNUC__ >= 3 --# define inline inline __attribute__ ((always_inline)) +# define lv_inline inline __attribute__ ((always_inline)) # define __malloc __attribute__ ((malloc)) # define __packed __attribute__ ((packed)) # define VIS_LIKELY(x) __builtin_expect (!!(x), 1) # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0) #else --# define inline /* no inline */ -+# define lv_inline /* no inline */ + # define inline /* no inline */ ++# define lv_inline /* no lv_inline */ # define __malloc /* no malloc */ # define __packed /* no packed */ # define VIS_LIKELY(x) (x) -diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_time.h ---- libvisual-0.4.0.orig/libvisual/lv_time.h 2009-03-07 17:17:38.000000000 +0000 -+++ libvisual-0.4.0/libvisual/lv_time.h 2009-03-07 17:25:15.000000000 +0000 -@@ -101,7 +101,7 @@ +diff --git a/libvisual/lv_time.h b/libvisual/lv_time.h +index 885448a..665af4a 100644 +--- a/libvisual/lv_time.h ++++ b/libvisual/lv_time.h +@@ -101,7 +101,7 @@ int visual_timer_has_passed_by_values (VisTimer *timer, long sec, long usec); * * @return Nothing. */ @@ -50,7 +63,7 @@ diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_t { #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) __asm __volatile -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) } /* FIXME use uint64_t here, make sure type exists */ @@ -59,3 +72,6 @@ diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_t { uint32_t lo, hi; +-- +2.26.2 + diff --git a/libvisual-0.4.0-sw.patch b/libvisual-0.4.0-sw.patch index b65cefbfa3ba6f1114ad2d4e3ed4f0f9d4f78ff0..535380f77efff0e3af4ac8070121239d4e5d6a6e 100644 --- a/libvisual-0.4.0-sw.patch +++ b/libvisual-0.4.0-sw.patch @@ -1,19 +1,18 @@ -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 @@ +From c160e188dcd1bbce75f0385c1582ad1d385b8d03 Mon Sep 17 00:00:00 2001 +From: licihua +Date: Thu, 29 Dec 2022 11:39:30 +0800 +Subject: [PATCH 3/3] libvisual-0.4.0-sw.patch + +--- + configure | 10 ++++++++++ + configure.ac | 10 ++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/configure b/configure +index bca4f47..fab6100 100755 +--- a/configure ++++ b/configure +@@ -3985,6 +3985,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac lv_mips=no lv_alpha=no @@ -21,7 +20,7 @@ diff -Naur libvisual-0.4.0.org/configure libvisual-0.4.0.sw/configure lv_sparc=no lv_ix86=no lv_x86_64=no -@@ -2019,6 +2020,7 @@ +@@ -3993,6 +3994,7 @@ lv_powerpc=no case "$host_cpu" in mips) lv_mips=yes;; alpha) lv_alpha=yes;; @@ -29,15 +28,15 @@ diff -Naur libvisual-0.4.0.org/configure libvisual-0.4.0.sw/configure sparc) lv_sparc=yes;; i*86) lv_ix86=yes;; x86_64*) lv_x86_64=yes;; -@@ -27200,6 +27202,7 @@ +@@ -23091,6 +23093,7 @@ fi 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 @@ + lv_x86_64=$lv_x86_64 +@@ -24736,6 +24739,13 @@ _______EOF _______EOF fi @@ -51,10 +50,11 @@ diff -Naur libvisual-0.4.0.org/configure libvisual-0.4.0.sw/configure 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 @@ +diff --git a/configure.ac b/configure.ac +index 0253fdb..89fc4e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,7 @@ AC_CANONICAL_HOST lv_mips=no lv_alpha=no @@ -62,7 +62,7 @@ diff -Naur libvisual-0.4.0.org/configure.ac libvisual-0.4.0.sw/configure.ac lv_sparc=no lv_ix86=no lv_x86_64=no -@@ -34,6 +35,7 @@ +@@ -34,6 +35,7 @@ lv_powerpc=no case "$host_cpu" in mips) lv_mips=yes;; alpha) lv_alpha=yes;; @@ -70,7 +70,7 @@ diff -Naur libvisual-0.4.0.org/configure.ac libvisual-0.4.0.sw/configure.ac sparc) lv_sparc=yes;; i*86) lv_ix86=yes;; x86_64*) lv_x86_64=yes;; -@@ -562,6 +564,13 @@ +@@ -585,6 +587,13 @@ _______EOF _______EOF fi @@ -84,23 +84,14 @@ diff -Naur libvisual-0.4.0.org/configure.ac libvisual-0.4.0.sw/configure.ac if test x$lv_alpha = xyes ; then cat >>$outfile <<_______EOF -@@ -778,6 +787,7 @@ +@@ -801,6 +810,7 @@ echo >>$outfile 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";; + lv_x86_64=$lv_x86_64 +-- +2.26.2 + diff --git a/libvisual-0.4.0.tar.gz b/libvisual-0.4.0.tar.gz deleted file mode 100644 index 56cdbf8e828c042cddb0b117a2a8b32c71253b7d..0000000000000000000000000000000000000000 Binary files a/libvisual-0.4.0.tar.gz and /dev/null differ diff --git a/libvisual-0.4.1.tar.gz b/libvisual-0.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1d98da78b618fbce225cb2ef47db99856a97bdb1 Binary files /dev/null and b/libvisual-0.4.1.tar.gz differ diff --git a/libvisual.spec b/libvisual.spec index bf946a4e151c68b0f4f0a1ec7e940bb2822a6fb9..3dce4a0ca9dcaf8de9d213536d8d19d21c072011 100644 --- a/libvisual.spec +++ b/libvisual.spec @@ -1,6 +1,6 @@ Name: libvisual -Version: 0.4.0 -Release: 29 +Version: 0.4.1 +Release: 1 Epoch: 1 Summary: Audio Visualization Library @@ -10,10 +10,9 @@ 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 +BuildRequires: libtool gettext gcc-c++ xorg-x11-proto-devel doxygen SDL-devel %description Libvisual is a library that acts as a middle layer between applications @@ -63,6 +62,9 @@ make %{?_smp_mflags} %{_libdir}/pkgconfig/*.pc %changelog +* Thu Dec 2022 licihua - 1:0.4.1-1 +- upgrade to 0.4.1 + * Fri Dec 2022 zhangzhixin - 1:0.4.0-29 - Add sw64 arch patch