Hello community, here is the log from the commit of package libvisual for openSUSE:Factory checked in at 2012-07-30 20:34:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvisual (Old) and /work/SRC/openSUSE:Factory/.libvisual.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvisual", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libvisual/libvisual.changes 2012-02-21 12:38:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvisual.new/libvisual.changes 2012-07-30 20:34:38.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 26 11:11:11 UTC 2012 - dvaleev@suse.com + +- defining inline causes problems trying to build against + libvisual headers + +------------------------------------------------------------------- New: ---- libvisual-0.4.0-inlinedefineconflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvisual.spec ++++++ --- /var/tmp/diff_new_pack.hBXVqE/_old 2012-07-30 20:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hBXVqE/_new 2012-07-30 20:34:40.000000000 +0200 @@ -41,6 +41,7 @@ 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 @@ %patch2 -p1 %patch3 %patch4 -p1 +%patch5 -p1 %build autoreconf -fiv ++++++ 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; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org