Updated to version 0.4.1.

2023-02-08 09:47:17 +01:00 · 2023-02-08 09:47:17 +01:00 · 01147874df
commit 01147874df
parent 4ede1dcaac
11 changed files with 22 additions and 414 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 libvisual-0.4.0.tar.gz
 /libvisual-0.5.0-7e4bc9a.tar.gz
+/libvisual-0.4.1.tar.bz2
--- a/libvisual-0.2.0-ifdef.patch
+++ b/libvisual-0.2.0-ifdef.patch
@ -1,11 +0,0 @@
--- libvisual-0.2.0/libvisual/lv_cpu.c.orig	2005-02-14 00:00:13.242204989 +0000
-+++ libvisual-0.2.0/libvisual/lv_cpu.c	2005-02-14 00:00:36.535144982 +0000
-@@ -423,7 +423,7 @@ void visual_cpu_initialize ()
- #endif
- #endif /* VISUAL_ARCH_X86 */
- 
-#if VISUAL_ARCH_POWERPC
-+#if defined(VISUAL_ARCH_POWERPC)
- 	check_os_altivec_support ();
- #endif /* VISUAL_ARCH_POWERPC */
- 
--- a/libvisual-0.4.0-better-altivec-detection.patch
+++ b/libvisual-0.4.0-better-altivec-detection.patch
@ -20,7 +20,7 @@
 
 #if defined(VISUAL_OS_WIN32)
 #include <windows.h>
-@@ -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;
--- a/libvisual-0.4.0-format-security.patch
+++ b/libvisual-0.4.0-format-security.patch
@ -1,17 +0,0 @@
-diff -up libvisual-0.4.0/libvisual/lv_plugin.c.format-security libvisual-0.4.0/libvisual/lv_plugin.c
--- libvisual-0.4.0/libvisual/lv_plugin.c.format-security	2014-06-11 15:38:36.786199952 -0400
-+++ libvisual-0.4.0/libvisual/lv_plugin.c	2014-06-11 15:38:45.990132144 -0400
-@@ -442,11 +442,11 @@ VisList *visual_plugin_registry_filter (
- 				
- 				visual_list_add (list, ref);
- 			} else if (ret != FALSE) {
-				visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
-+				visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
- 			}
- 		}
- 		else if (ret != FALSE) { /* FIXME XXX TODO, patch frmo duilio check how this works */
-			visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
-+			visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
- 		}
- 	}
- 
--- a/libvisual-0.4.0-inlinedefineconflict.patch
+++ b/libvisual-0.4.0-inlinedefineconflict.patch
@ -1,61 +0,0 @@
-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
-@@ -32,7 +32,7 @@
- static int cache_dtor (VisObject *object);
- static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
- 
-static inline void handle_request_reset (VisCache *cache, VisListEntry *le);
-+static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le);
- 
- static int cache_dtor (VisObject *object)
- {
-@@ -74,7 +74,7 @@
- }
- 
- 
-static inline void handle_request_reset (VisCache *cache, VisListEntry *le)
-+static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le)
- {
- 	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 @@
- 
- /* 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 __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 @@
-  *
-  * @return Nothing.
-  */
-static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
-+static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
- {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- 	__asm __volatile
-@@ -115,7 +115,7 @@
- }
- 
- /* FIXME use uint64_t here, make sure type exists */
-static inline unsigned long long visual_timer_tsc_get_returned ()
-+static lv_inline unsigned long long visual_timer_tsc_get_returned ()
- {
- 	uint32_t lo, hi;
- 
--- a/libvisual-0.4.0-respect-environment-ldflags.patch
+++ b/libvisual-0.4.0-respect-environment-ldflags.patch
@ -1,7 +1,7 @@
 diff -ruN libvisual-0.4.0/libvisual/Makefile.am libvisual-0.4.0.orig/libvisual/Makefile.am
 --- libvisual-0.4.0/libvisual/Makefile.am	2006-02-20 09:20:58.000000000 +0100
 +++ libvisual-0.4.0.orig/libvisual/Makefile.am	2021-09-23 11:00:27.137930658 +0200
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ AM_CFLAGS = -DPLUGPATH="\"$(LIBVISUAL_PLUGINS_BASE_DIR)\"" \
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libvisual \
 	   -I$(top_builddir) -I$(top_builddir)/libvisual
 
--- a/libvisual-0.5.0-better-altivec-detection.patch
+++ b/libvisual-0.5.0-better-altivec-detection.patch
@ -1,70 +0,0 @@
-diff -up libvisual/libvisual/lv_cpu.c.altivec-detection libvisual/libvisual/lv_cpu.c
--- libvisual/libvisual/lv_cpu.c.altivec-detection	2013-08-23 09:34:16.000000000 -0400
-+++ libvisual/libvisual/lv_cpu.c	2013-12-03 14:50:24.922718258 -0500
-@@ -59,8 +59,19 @@
- #endif
- 
- #if defined(VISUAL_OS_LINUX)
-+#if defined(VISUAL_ARCH_POWERPC)
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+
-+#include <linux/auxvec.h>
-+#include <asm/cputable.h>
-+#else /* VISUAL_ARCH_POWERPC */
- #include <signal.h>
- #endif
-+#endif
- 
- #if defined(VISUAL_OS_WIN32)
- #include <windows.h>
-@@ -170,6 +181,46 @@ static void check_os_altivec_support (vo
- 	if (err == 0)
- 		if (has_vu != 0)
- 			cpu_caps.hasAltiVec = 1;
-+#elif defined (VISUAL_OS_LINUX)
-+	static int available = -1;
-+	int new_avail = 0;
-+	char fname[64];
-+	unsigned long buf[64];
-+	ssize_t count;
-+	pid_t pid;
-+	int fd, i;
-+
-+	if (available != -1)
-+		return;
-+
-+	pid = getpid();
-+	snprintf(fname, sizeof(fname)-1, "/proc/%d/auxv", pid);
-+
-+	fd = open(fname, O_RDONLY);
-+	if (fd < 0)
-+		goto out;
-+more:
-+	count = read(fd, buf, sizeof(buf));
-+	if (count < 0)
-+		goto out_close;
-+
-+	for (i=0; i < (count / sizeof(unsigned long)); i += 2) {
-+		if (buf[i] == AT_HWCAP) {
-+			new_avail = !!(buf[i+1] & PPC_FEATURE_HAS_ALTIVEC);
-+			goto out_close;
-+		} else if (buf[i] == AT_NULL) {
-+			goto out_close;
-+		}
-+	}
-+
-+	if (count == sizeof(buf))
-+		goto more;
-+out_close:
-+	close(fd);
-+out:
-+	available = new_avail;
-+	if (available)
-+		cpu_caps.hasAltiVec = 1;
- #else /* !VISUAL_OS_DARWIN */
- 	/* no Darwin, do it the brute-force way */
- 	/* this is borrowed from the libmpeg2 library */
--- a/libvisual-c99.patch
+++ b/libvisual-c99.patch
@ -18,18 +18,6 @@ index 8de03ebad7d499bb..e7ef768d421aa7fa 100644
 #include "lv_plugin.h"
 #include "lv_actor.h"
 #include "lv_input.h"
-diff --git a/libvisual/lv_math.c b/libvisual/lv_math.c
-index cfae316d0abc8c0d..f55c11854051f145 100644
--- a/libvisual/lv_math.c
-+++ b/libvisual/lv_math.c
-@@ -29,6 +29,7 @@
- #include <math.h>
- 
- #include "lv_bits.h"
-+#include "lv_cpu.h"
- #include "lv_math.h"
- 
- /* This file is getting big and bloated because of the large chunks of simd code. When all is in place we'll take a serious
 diff --git a/libvisual/lv_transform.c b/libvisual/lv_transform.c
 index c763768c0fbb757a..58fe15fa57d2e783 100644
 --- a/libvisual/lv_transform.c
--- a/libvisual-configure-c99.patch
+++ b/libvisual-configure-c99.patch
@ -1,217 +0,0 @@
-Avoid implicit function declartions in the configure script, to
-improve compatibility with future compilers.
-
-The “check_me != 42” part is not generic and would have to be
-upstreamed, but upstream has switched to CMake and no longer uses
-this test, it seems.
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 14cd8f3560139cbb..ab8170ee0185c72a 100644
--- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1655,10 +1655,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -1672,7 +1668,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }]
- EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-diff --git a/configure b/configure
-index c4994911e224154f..3da8071a1c029507 100755
--- a/configure
-+++ b/configure
-@@ -3408,7 +3408,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-   '' \
-+   '#include <stdlib.h>' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -5060,8 +5060,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -9369,10 +9369,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -9386,7 +9382,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }
- EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -9467,10 +9463,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -9484,7 +9476,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }
- EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -13163,10 +13155,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -13180,7 +13168,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }
- EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -13261,10 +13249,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -13278,7 +13262,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }
- EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -18926,10 +18910,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -18943,7 +18923,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }
- EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -19024,10 +19004,6 @@ else
- #  endif
- #endif
- 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
- void fnord() { int i=42;}
- int main ()
- {
-@@ -19041,7 +19017,7 @@ int main ()
-       /* dlclose (self); */
-     }
- 
-    exit (status);
-+    return status;
- }
- EOF
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -20546,8 +20522,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -24621,7 +24597,7 @@ int main()
-    void *ret;
-    pthread_create (&t, $defattr, func, 0);
-    pthread_join (t, &ret);
-   exit (check_me != 42 || ret != &check_me);
-+   return check_me != 42 || ret != &check_me;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -24671,7 +24647,7 @@ int main()
-    void *ret;
-    pthread_create (&t, $defattr, func, 0);
-    pthread_join (t, &ret);
-   exit (check_me != 42 || ret != &check_me);
-+   return check_me != 42 || ret != &check_me;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-diff --git a/configure.ac b/configure.ac
-index 71d577304a2e5c6f..8cc30b4483a05a48 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -173,7 +173,7 @@ int main()
-    void *ret;
-    pthread_create (&t, $1, func, 0);
-    pthread_join (t, &ret);
-   exit (check_me != 42 || ret != &check_me);
-+   return check_me != 42 || ret != &check_me;
- }])
- 
- LIBS_NOT_FOUND_1="I can't find the libraries for the thread implementation
--- a/libvisual.spec
+++ b/libvisual.spec
@ -1,23 +1,24 @@
 %global smallversion 0.4

 Name:           libvisual
-Version:        0.4.0
-Release:        38%{?dist}
-Epoch:		1
+Version:        0.4.1
+Release:        1%{?dist}
+Epoch:          1
+
 Summary:        Abstraction library for audio visualisation plugins
-License:        LGPLv2+
-URL:            http://libvisual.sf.net
-Source0:        http://dl.sf.net/libvisual/libvisual-%{version}.tar.gz
+License:        LGPL-2.1-or-later
+URL:            https://libvisual.sf.net
+Source0:        https://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
+
+Patch0:         libvisual-0.4.0-better-altivec-detection.patch
+Patch1:         libvisual-0.4.0-respect-environment-ldflags.patch
+Patch2:         libvisual-c99.patch
+
+BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  make
+BuildRequires:  sdl12-compat-devel
 BuildRequires:  xorg-x11-proto-devel
-# https://bugzilla.redhat.com/show_bug.cgi?id=435771
-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-respect-environment-ldflags.patch
-Patch4:		libvisual-configure-c99.patch
-Patch5:		libvisual-c99.patch

 %description
 Libvisual is an abstraction library that comes between applications and
@ -43,18 +44,9 @@ audio visualisation plugins.
 This package contains the files needed to build an application with libvisual.

 %prep
-%setup -q
-%patch0 -p1 -b .altivec-detection
-%patch1 -p1 -b .inlinedefineconflict
-%patch2 -p1 -b .format-security
-%patch3 -p1 -b .ldflags
-%patch4 -p1
-%patch5 -p1
-# Prevent re-building the autotools scripts.
-touch -r aclocal.m4 configure*
+%autosetup -p1

 %build
-%global optflags %{optflags} -fno-strict-aliasing
 %configure
 %make_build

@ -115,6 +107,9 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'


 %changelog
+* Wed Feb 08 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1:0.4.1-1
+- Updated to version 0.4.1.
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4.0-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-f4e78547c79ea8a8ad111cf8b85011bb  libvisual-0.4.0.tar.gz
+SHA512 (libvisual-0.4.1.tar.bz2) = a1417a54d4f0566121db5d08770e7f41559ef7f3704d0da74f1dc316c6b7f16197d843a96382b4122d01251764ccb6ed240fd4e99abc7b0f440c9f43afa9506a