rpms/libvisual
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt with c++11 abi fix to build libvisual-plugins [release 0.4.0-6mamba;Wed Sep 07 2022]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 06:04:26 +01:00
parent 62cf4525db
commit dfc8cada93
2 changed files with 73 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
libvisual-0.4.0-inlinedefineconflict.patch Normal file
View File

@ -0,0 +1,61 @@
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;

17
libvisual.spec
View File

@ -1,20 +1,20 @@
%define majversion %(echo %version | cut -d. -f 1-2)
Name: libvisual
Release: 5mamba
Release: 6mamba
Version: 0.4.0
Summary: An abstraction library that comes between applications and audio visualisation plugins
Group: System/Multimedia
Vendor: openmamba
Distribution: openmamba
Packager: Aleph0 <aleph0@openmamba.org>
URL: http://sourceforge.net/projects/libvisual/
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://sourceforge.net/projects/libvisual/
Source0: http://downloads.sourceforge.net/libvisual/libvisual-%{version}.tar.bz2
Patch0: libvisual-0.4.0-inlinedefineconflict.patch
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Libvisual is a library that comes between applications and audio visualisation plugins and provides every application that wants to draw visualisation a clean and easy to use API.
@ -33,6 +33,9 @@ This package contains static libraries and header files needed for development.
%prep
%setup -q
sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," config.sub
# libvisual's definition of "inline" causes issues when compiling with the
# new C++11 ABI (patch from Fedora)
%patch0 -p1 -b .inlinedefineconflict
%build
%configure
@ -57,13 +60,17 @@ sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," config.sub
%files devel
%defattr(-,root,root)
%dir %{_includedir}/%{name}-%{majversion}
%dir %{_includedir}/%{name}-%{majversion}/%{name}
%{_includedir}/%{name}-%{majversion}/%{name}/*.h
%{_libdir}/libvisual-*.la
%{_libdir}/libvisual-*.so
%{_libdir}/pkgconfig/%{name}-%{majversion}.pc
%doc ChangeLog NEWS README TODO
%changelog
* Wed Sep 07 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.0-6mamba
- rebuilt with c++11 abi fix to build libvisual-plugins
* Fri Dec 04 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.0-5mamba
- rebuilt with debug package and aarch64 build fix