rpms/libvisual/devel libvisual-0.4.0-inlinedefineconflict.patch, NONE, 1.1 libvisual.spec, 1.20, 1.21

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/libvisual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1044

Modified Files:
	libvisual.spec 
Added Files:
	libvisual-0.4.0-inlinedefineconflict.patch 
Log Message:
defining inline causes problems trying to build against libvisual headers

libvisual-0.4.0-inlinedefineconflict.patch:

--- NEW FILE libvisual-0.4.0-inlinedefineconflict.patch ---
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;
 


Index: libvisual.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvisual/devel/libvisual.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libvisual.spec	25 Feb 2009 19:49:18 -0000	1.20
+++ libvisual.spec	7 Mar 2009 17:33:58 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           libvisual
 Version:        0.4.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Abstraction library for audio visualisation plugins
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 
 # 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
 
 
 %description
@@ -43,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .altivec-detection
+%patch1 -p1 -b .inlinedefineconflict
 
 %build
 %ifarch i386
@@ -84,6 +86,10 @@
 
 
 %changelog
+* Sat Mar 07 2009 Caolán McNamara <caolanm at redhat.com> - 0.4.0-8
+- defining inline causes problems trying to build against libvisual headers, 
+  e.g. libvisual-plugins
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild