rpm/libvisual
SHA256
1
0
Fork 0
forked from pool/libvisual
Code Pull Requests Activity

Accepting request 128997 from KDE:KDE3

Browse Source 
- defining inline causes problems trying to build against 
  libvisual headers (forwarded request 128986 from k0da)

OBS-URL: https://build.opensuse.org/request/show/128997
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvisual?expand=0&rev=20
This commit is contained in:
Stephan Kulow 2012-07-30 18:34:36 +00:00 committed by Git OBS Bridge
commit 0b0a4c68cb
3 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
libvisual.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 26 11:11:11 UTC 2012 - dvaleev@suse.com
- defining inline causes problems trying to build against
libvisual headers
-------------------------------------------------------------------
Mon Feb 13 10:49:33 UTC 2012 - coolo@suse.com

2
libvisual.spec
View File

@ -41,6 +41,7 @@ Patch1: %name-%{version}-compiler_warnings.diff
Patch2: libvisual.visual_cpu_get_altivec.patch
Patch3: %name-%{version}-unref-static.diff
Patch4: libvisual-0.4.0-2.1-nmu.diff
Patch5: libvisual-0.4.0-inlinedefineconflict.patch
%description
Libvisual is a library that acts as a middle layer between applications
@ -87,6 +88,7 @@ Authors:
%patch2 -p1
%patch3
%patch4 -p1
%patch5 -p1
%build
autoreconf -fiv