From 12d73e671140869dc695fd134270357ed4c9e135d839e533ba5fe1a41e0a5029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 16:04:18 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libvisual revision 8107a8db5bc5f68feed6b74703a0ca17 --- .gitattributes | 23 + baselibs.conf | 1 + libvisual-0.4.0-2.1-nmu.diff | 21 + libvisual-0.4.0-compiler_warnings.diff | 493 +++++++++++++++++++++ libvisual-0.4.0-inlinedefineconflict.patch | 60 +++ libvisual-0.4.0-unref-static.diff | 20 + libvisual-0.4.0.diff | 62 +++ libvisual-0.4.0.tar.bz2 | 3 + libvisual.changes | 188 ++++++++ libvisual.spec | 119 +++++ libvisual.visual_cpu_get_altivec.patch | 21 + 11 files changed, 1011 insertions(+) create mode 100644 .gitattributes create mode 100644 baselibs.conf create mode 100644 libvisual-0.4.0-2.1-nmu.diff create mode 100644 libvisual-0.4.0-compiler_warnings.diff create mode 100644 libvisual-0.4.0-inlinedefineconflict.patch create mode 100644 libvisual-0.4.0-unref-static.diff create mode 100644 libvisual-0.4.0.diff create mode 100644 libvisual-0.4.0.tar.bz2 create mode 100644 libvisual.changes create mode 100644 libvisual.spec create mode 100644 libvisual.visual_cpu_get_altivec.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..d1b86b6 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libvisual-0_4-0 diff --git a/libvisual-0.4.0-2.1-nmu.diff b/libvisual-0.4.0-2.1-nmu.diff new file mode 100644 index 0000000..56fde6b --- /dev/null +++ b/libvisual-0.4.0-2.1-nmu.diff @@ -0,0 +1,21 @@ +diff -u libvisual-0.4.0/libvisual/lv_cpu.c libvisual-0.4.0/libvisual/lv_cpu.c +--- libvisual-0.4.0/libvisual/lv_cpu.c ++++ libvisual-0.4.0/libvisual/lv_cpu.c +@@ -76,7 +76,7 @@ + + /* The sigill handlers */ + #if defined(VISUAL_ARCH_X86) //x86 (linux katmai handler check thing) +-#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC) ++#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) + static void sigill_handler_sse( int signal, struct sigcontext sc ) + { + /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1" +@@ -109,7 +109,7 @@ + } + } + #endif +-#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE && X86_FXSR_MAGIC */ ++#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE */ + + #if defined(VISUAL_OS_WIN32) + LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep) diff --git a/libvisual-0.4.0-compiler_warnings.diff b/libvisual-0.4.0-compiler_warnings.diff new file mode 100644 index 0000000..a019048 --- /dev/null +++ b/libvisual-0.4.0-compiler_warnings.diff @@ -0,0 +1,493 @@ +--- libvisual/lv_audio.c ++++ libvisual/lv_audio.c +@@ -36,8 +36,10 @@ + static int audio_samplepool_channel_dtor (VisObject *object); + static int audio_sample_dtor (VisObject *object); + ++/* + static int audio_band_total (VisAudio *audio, int begin, int end); + static int audio_band_energy (VisAudio *audio, int band, int length); ++*/ + + /* Format transform functions */ + static int transform_format_buffer_from_float (VisBuffer *dest, VisBuffer *src, int size, int sign); +@@ -111,11 +113,10 @@ + return VISUAL_OK; + } + +- ++/* + static int audio_band_total (VisAudio *audio, int begin, int end) + { + int bpmtotal = 0; +- int i; + + // for (i = begin; i < end; i++) + // bpmtotal += audio->freq[2][i]; +@@ -129,7 +130,6 @@ + static int audio_band_energy (VisAudio *audio, int band, int length) + { + int energytotal = 0; +- int i; + + // for (i = 0; i < length; i++) + // energytotal += audio->bpmhistory[i][band]; +@@ -139,7 +139,7 @@ + else + return 0; + } +- ++*/ + /** + * @defgroup VisAudio VisAudio + * @{ +@@ -206,12 +206,15 @@ + */ + int visual_audio_analyze (VisAudio *audio) + { ++/* + float temp_out[256]; + float temp_audio[2][512]; ++*/ + short pcm[3][1024]; ++/* + double scale; + int i, j, y; +- ++*/ + visual_log_return_val_if_fail (audio != NULL, -VISUAL_ERROR_AUDIO_NULL); + + /* Load the pcm data */ +@@ -464,8 +467,8 @@ + int visual_audio_get_sample_mixed_category (VisAudio *audio, VisBuffer *buffer, char *category, int divide) + { + VisListEntry *le = NULL; +- VisAudioSamplePool *samplepool; +- VisAudioSamplePoolChannel *channel; ++ VisAudioSamplePool *samplepool = NULL; ++ VisAudioSamplePoolChannel *channel = NULL; + VisBuffer temp; + int first = TRUE; + +@@ -497,8 +500,8 @@ + int visual_audio_get_sample_mixed_all (VisAudio *audio, VisBuffer *buffer, int divide) + { + VisListEntry *le = NULL; +- VisAudioSamplePool *samplepool; +- VisAudioSamplePoolChannel *channel; ++ VisAudioSamplePool *samplepool = NULL; ++ VisAudioSamplePoolChannel *channel = NULL; + VisBuffer temp; + int first = TRUE; + +@@ -549,7 +552,6 @@ + int ret; + float *data; + int datasize; +- int i; + + visual_log_return_val_if_fail (audio != NULL, -VISUAL_ERROR_AUDIO_NULL); + visual_log_return_val_if_fail (buffer != NULL, -VISUAL_ERROR_BUFFER_NULL); +@@ -591,7 +593,6 @@ + int ret; + float *data; + int datasize; +- int i; + + visual_log_return_val_if_fail (buffer != NULL, -VISUAL_ERROR_BUFFER_NULL); + visual_log_return_val_if_fail (sample != NULL, -VISUAL_ERROR_BUFFER_NULL); +--- libvisual/lv_collection.c ++++ libvisual/lv_collection.c +@@ -27,7 +27,7 @@ + + #include "lv_common.h" + #include "lv_collection.h" +- ++/* + static int collection_iter_dtor (VisObject *object); + + static int collection_iter_dtor (VisObject *object) +@@ -45,7 +45,7 @@ + + return VISUAL_OK; + } +- ++*/ + + /** + * @defgroup VisCollection VisCollection +--- libvisual/lv_cpu.c ++++ libvisual/lv_cpu.c +@@ -312,7 +312,6 @@ + static int cpuid (unsigned int ax, unsigned int *p) + { + #if defined(VISUAL_ARCH_X86) +- uint32_t flags; + + __asm __volatile + ("movl %%ebx, %%esi\n\t" +@@ -341,12 +340,9 @@ + */ + void visual_cpu_initialize () + { +- uint32_t cpu_flags; + unsigned int regs[4]; + unsigned int regs2[4]; + +- int mib[2], ncpu; +- visual_size_t len; + + visual_mem_set (&__lv_cpu_caps, 0, sizeof (VisCPU)); + +--- libvisual/lv_fourier.c ++++ libvisual/lv_fourier.c +@@ -81,7 +81,6 @@ + static int dft_cache_destroyer (VisObject *object); + static DFTCacheEntry *dft_cache_get (VisDFT *dft); + +-static int log_scale_cache_destroy (VisObject *object); + static LogScaleCacheEntry *log_scale_cache_get (int size); + + static void perform_dft_brute_force (VisDFT *fourier, float *output, float *input); +@@ -476,8 +475,6 @@ + */ + int visual_dft_perform (VisDFT *dft, float *output, float *input) + { +- unsigned int i; +- + visual_log_return_val_if_fail (dft != NULL, -VISUAL_ERROR_FOURIER_NULL); + visual_log_return_val_if_fail (output != NULL, -VISUAL_ERROR_NULL); + visual_log_return_val_if_fail (input != NULL, -VISUAL_ERROR_NULL); +@@ -542,8 +539,6 @@ + + int visual_dft_log_scale_standard (float *output, float *input, int size) + { +- int i; +- + visual_log_return_val_if_fail (output != NULL, -VISUAL_ERROR_NULL); + visual_log_return_val_if_fail (input != NULL, -VISUAL_ERROR_NULL); + +--- libvisual/lv_hashmap.c ++++ libvisual/lv_hashmap.c +@@ -64,9 +64,7 @@ + + static int hashmap_destroy (VisCollection *collection) + { +- VisCollectionDestroyerFunc destroyer; + VisHashmap *hashmap = VISUAL_HASHMAP (collection); +- VisHashmapEntry *mentry; + int i; + + for (i = 0; i < hashmap->size; i++) +@@ -125,7 +123,6 @@ + { + VisCollectionIter *iter; + HashmapIterContext *context; +- VisHashmap *hashmap = VISUAL_HASHMAP (collection); + + context = visual_mem_new0 (HashmapIterContext, 1); + +@@ -200,7 +197,6 @@ + + static void hashmap_iter_next (VisCollectionIter *iter, VisCollection *collection, VisObject *itercontext) + { +- VisHashmap *hashmap = VISUAL_HASHMAP (collection); + HashmapIterContext *context = HASHMAP_ITERCONTEXT (itercontext); + + if (context->retrieved == FALSE) { +@@ -502,8 +498,6 @@ + + int visual_hashmap_set_table_size (VisHashmap *hashmap, int tablesize) + { +- int oldsize; +- + visual_log_return_val_if_fail (hashmap != NULL, -VISUAL_ERROR_HASHMAP_NULL); + + /* Table was not empty, rehash */ +--- libvisual/lv_libvisual.c ++++ libvisual/lv_libvisual.c +@@ -186,7 +186,7 @@ + int i; + + if (__lv_plugpaths == NULL) +- return VISUAL_OK; ++ return; + + for (i = 0; i < __lv_plugpath_cnt - 1; i++) + visual_mem_free (__lv_plugpaths[i]); +--- libvisual/lv_mem.c ++++ libvisual/lv_mem.c +@@ -41,22 +41,18 @@ + static void *mem_copy_mmx (void *dest, const void *src, visual_size_t n); + static void *mem_copy_mmx2 (void *dest, const void *src, visual_size_t n); + static void *mem_copy_3dnow (void *dest, const void *src, visual_size_t n); +-static void *mem_copy_altivec (void *dest, const void *src, visual_size_t n); + + static void *mem_set8_c (void *dest, int c, visual_size_t n); + static void *mem_set8_mmx (void *dest, int c, visual_size_t n); + static void *mem_set8_mmx2 (void *dest, int c, visual_size_t n); +-static void *mem_set8_altivec (void *dest, int c, visual_size_t n); + + static void *mem_set16_c (void *dest, int c, visual_size_t n); + static void *mem_set16_mmx (void *dest, int c, visual_size_t n); + static void *mem_set16_mmx2 (void *dest, int c, visual_size_t n); +-static void *mem_set16_altivec (void *dest, int c, visual_size_t n); + + static void *mem_set32_c (void *dest, int c, visual_size_t n); + static void *mem_set32_mmx (void *dest, int c, visual_size_t n); + static void *mem_set32_mmx2 (void *dest, int c, visual_size_t n); +-static void *mem_set32_altivec (void *dest, int c, visual_size_t n); + + /* Optimal performance functions set by visual_mem_initialize(). */ + VisMemCopyFunc visual_mem_copy = mem_copy_c; +@@ -373,11 +369,6 @@ + return dest; + } + +-static void *mem_copy_altivec (void *dest, const void *src, visual_size_t n) +-{ +- +-} +- + /* Memset functions, 1 byte memset */ + static void *mem_set8_c (void *dest, int c, visual_size_t n) + { +@@ -523,11 +514,6 @@ + return dest; + } + +-static void *mem_set8_altivec (void *dest, int c, visual_size_t n) +-{ +- +-} +- + /* Memset functions, 2 byte memset */ + static void *mem_set16_c (void *dest, int c, visual_size_t n) + { +@@ -667,11 +653,6 @@ + return dest; + } + +-static void *mem_set16_altivec (void *dest, int c, visual_size_t n) +-{ +- +-} +- + /* Memset functions, 4 byte memset */ + static void *mem_set32_c (void *dest, int c, visual_size_t n) + { +@@ -778,11 +759,6 @@ + return dest; + } + +-static void *mem_set32_altivec (void *dest, int c, visual_size_t n) +-{ +- +-} +- + /** + * @} + */ +--- libvisual/lv_morph.c ++++ libvisual/lv_morph.c +@@ -240,7 +240,6 @@ + */ + int visual_morph_get_supported_depth (VisMorph *morph) + { +- VisPluginData *plugin; + VisMorphPlugin *morphplugin; + + visual_log_return_val_if_fail (morph != NULL, -VISUAL_ERROR_MORPH_NULL); +@@ -256,7 +255,6 @@ + + VisVideoAttributeOptions *visual_morph_get_video_attribute_options (VisMorph *morph) + { +- VisPluginData *plugin; + VisMorphPlugin *morphplugin; + + visual_log_return_val_if_fail (morph != NULL, NULL); +--- libvisual/lv_plugin.c ++++ libvisual/lv_plugin.c +@@ -817,7 +817,6 @@ + VisPluginRef **ref; + VisPluginInfo *plug_info; + VisPluginInfo *dup_info; +- const char *plug_name; + VisPluginGetInfoFunc get_plugin_info; + int *plugin_version; + #if defined(VISUAL_OS_WIN32) +--- libvisual/lv_rectangle.c ++++ libvisual/lv_rectangle.c +@@ -46,7 +46,7 @@ + */ + VisRectangle *visual_rectangle_new (int x, int y, int width, int height) + { +- VisRectangle *rect; ++ VisRectangle *rect = NULL; + + /* Do the VisObject initialization */ + visual_object_initialize (VISUAL_OBJECT (rect), TRUE, NULL); +@@ -339,8 +339,6 @@ + */ + int visual_rectangle_denormalise_many_values (VisRectangle *rect, float *fxlist, float *fylist, int32_t *xlist, int32_t *ylist, int size) + { +- int i; +- + visual_log_return_val_if_fail (rect != NULL, -VISUAL_ERROR_RECTANGLE_NULL); + + visual_math_vectorized_floats_to_int32s_multiply (xlist, fxlist, size, rect->width); +--- libvisual/lv_ringbuffer.c ++++ libvisual/lv_ringbuffer.c +@@ -253,8 +253,6 @@ + VisListEntry *le = NULL; + VisRingBufferEntry *entry; + int curposition = 0; +- int curoffset = 0; +- int positioncorr = 0; + int startat = 0; + int buffercorr = 0; + +@@ -273,7 +271,7 @@ + le = NULL; + + while ((entry = visual_list_next (ringbuffer->entries, &le)) != NULL) { +- VisBuffer *tempbuf; ++ VisBuffer *tempbuf = NULL; + + lindex++; + +@@ -337,7 +335,6 @@ + { + VisListEntry *le = NULL; + VisRingBufferEntry *entry; +- int curposition = 0; + int curoffset = 0; + int startat = 0; + +--- libvisual/lv_thread.c ++++ libvisual/lv_thread.c +@@ -94,6 +94,7 @@ + static int mutex_unlock_posix (VisMutex *mutex); + + /* Windows32 implementation */ ++/* + static VisThread *thread_create_win32 (VisThreadFunc func, void *data, int joinable); + static int thread_free_win32 (VisThread *thread); + static void *thread_join_win32 (VisThread *thread); +@@ -106,7 +107,7 @@ + static int mutex_lock_win32 (VisMutex *mutex); + static int mutex_trylock_win32 (VisMutex *mutex); + static int mutex_unlock_win32 (VisMutex *mutex); +- ++*/ + /* GThread implementation */ + static VisThread *thread_create_gthread (VisThreadFunc func, void *data, int joinable); + static int thread_free_gthread (VisThread *thread); +@@ -581,6 +582,7 @@ + } + + /* Windows32 implementation */ ++/* + static VisThread *thread_create_win32 (VisThreadFunc func, void *data, int joinable) + { + VisThread *thread = NULL; +@@ -597,13 +599,13 @@ + + return NULL; + } +-/* ++/-* + printf("Waiting for thread to finish...\n"); + if (WaitForSingleObject(a_thread, INFINITE) != WAIT_OBJECT_0) { + perror("Thread join failed"); + exit(EXIT_FAILURE); + } +-*/ ++*-/ + // Retrieve the code returned by the thread. + // GetExitCodeThread(a_thread, &thread_result); + #endif +@@ -692,7 +694,7 @@ + + #endif + } +- ++*/ + /* GThread implementation */ + static VisThread *thread_create_gthread (VisThreadFunc func, void *data, int joinable) + { +--- libvisual/lv_ui.c ++++ libvisual/lv_ui.c +@@ -339,9 +339,6 @@ + */ + VisList *visual_ui_box_get_childs (VisUIBox *box) + { +- VisUIWidget *next; +- VisListEntry *le = NULL; +- + visual_log_return_val_if_fail (box != NULL, NULL); + + return &box->childs; +@@ -1066,7 +1063,6 @@ + */ + int visual_ui_choice_add_many (VisUIChoice *choice, VisParamEntry *paramchoices) + { +- VisUIChoiceEntry *centry; + int i = 0; + + visual_log_return_val_if_fail (choice != NULL, -VISUAL_ERROR_UI_CHOICE_NULL); +--- libvisual/lv_video.c ++++ libvisual/lv_video.c +@@ -1701,7 +1701,6 @@ + int visual_video_fill_color (VisVideo *video, VisColor *rcolor) + { + VisColor color; +- VisRectangle rect; + + visual_log_return_val_if_fail (video != NULL, -VISUAL_ERROR_VIDEO_NULL); + +@@ -2712,7 +2711,6 @@ + { + uint8_t *destbuf, *srcbuf; + int x, y; +- int i = 0; + int pitchdiff = dest->pitch - (dest->width * dest->bpp); + + destbuf = visual_video_get_pixels (dest); +@@ -3165,7 +3163,7 @@ + u = 0; + + for (x = dest->width - 1; x--; u += du) { +- uint8_t cul, cll, cur, clr, b; ++ uint8_t cul, cll, cur, clr; + uint32_t ul, ll, ur, lr; /* fixed point 16.16 [0,1[ */ + uint32_t b0; /* fixed point 16.16 [0,255[ */ + +@@ -3228,7 +3226,7 @@ + for (x = dest->width - 1; x--; u += du) { + _color16 cul, cll, cur, clr, b; + uint32_t ul, ll, ur, lr; /* fixed point 16.16 [0,1[ */ +- uint32_t b3, b2, b1, b0; /* fixed point 16.16 [0,255[ */ ++ uint32_t b2, b1, b0; /* fixed point 16.16 [0,255[ */ + + /* fracU = frac(u) = u & 0xffff */ + /* fixed point format convertion: fracU >>= 8) */ +@@ -3303,7 +3301,7 @@ + for (x = dest->width - 1; x--; u += du) { + _color24 cul, cll, cur, clr, b; + uint32_t ul, ll, ur, lr; /* fixed point 16.16 [0,1[ */ +- uint32_t b3, b2, b1, b0; /* fixed point 16.16 [0,255[ */ ++ uint32_t b2, b1, b0; /* fixed point 16.16 [0,255[ */ + + /* fracU = frac(u) = u & 0xffff */ + /* fixed point format convertion: fracU >>= 8) */ +--- libvisual/lv_video_simd.c ++++ libvisual/lv_video_simd.c +@@ -37,7 +37,6 @@ + int i, j; + uint8_t *destbuf = visual_video_get_pixels (dest); + uint8_t *srcbuf = visual_video_get_pixels (src); +- uint8_t alpha; + + for (i = 0; i < src->height; i++) { + for (j = 0; j < src->width; j++) { diff --git a/libvisual-0.4.0-inlinedefineconflict.patch b/libvisual-0.4.0-inlinedefineconflict.patch new file mode 100644 index 0000000..f6a6c08 --- /dev/null +++ b/libvisual-0.4.0-inlinedefineconflict.patch @@ -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; diff --git a/libvisual-0.4.0-unref-static.diff b/libvisual-0.4.0-unref-static.diff new file mode 100644 index 0000000..495c3e0 --- /dev/null +++ b/libvisual-0.4.0-unref-static.diff @@ -0,0 +1,20 @@ +--- libvisual/lv_object.c ++++ libvisual/lv_object.c +@@ -236,14 +236,12 @@ + { + visual_log_return_val_if_fail (object != NULL, -VISUAL_ERROR_OBJECT_NULL); + +- object->refcount--; ++ if (object->refcount > 0) ++ object->refcount--; + + /* No reference left, start dtoring of this VisObject */ +- if (object->refcount <= 0) { +- object->refcount = 0; +- ++ if (object->refcount == 0) + return visual_object_destroy (object); +- } + return VISUAL_OK; + } + diff --git a/libvisual-0.4.0.diff b/libvisual-0.4.0.diff new file mode 100644 index 0000000..51afbe7 --- /dev/null +++ b/libvisual-0.4.0.diff @@ -0,0 +1,62 @@ +--- libvisual/lv_audio.c ++++ libvisual/lv_audio.c +@@ -1105,7 +1105,7 @@ + { + float *sbuf = visual_buffer_get_data (src); + int entries = visual_buffer_get_size (dest) / size; +- int signedcorr; ++ int signedcorr = 0; + int i; + + signedcorr += byte_max_numeric (size) / 2; +--- libvisual/lv_buffer.c ++++ libvisual/lv_buffer.c +@@ -576,7 +576,7 @@ + */ + int visual_buffer_fill_with_pattern (VisBuffer *buffer, void *data, visual_size_t size) + { +- int offset; ++ int offset = 0; + + visual_log_return_val_if_fail (buffer != NULL, -VISUAL_ERROR_BUFFER_NULL); + visual_log_return_val_if_fail (data != NULL, -VISUAL_ERROR_NULL); +--- libvisual/lv_hashmap.c ++++ libvisual/lv_hashmap.c +@@ -46,7 +46,7 @@ + + + static int hashmap_destroy (VisCollection *collection); +-static int hashmap_chain_destroy (VisHashmap *hashmap, VisList *list); ++static void hashmap_chain_destroy (VisHashmap *hashmap, VisList *list); + static int hashmap_size (VisCollection *collection); + static VisCollectionIter *hashmap_iter (VisCollection *collection); + +@@ -81,7 +81,7 @@ + } + + /* We can't use collection dtor because we need to chain up (HashChainElem -> DataElem) */ +-static int hashmap_chain_destroy (VisHashmap *hashmap, VisList *list) ++static void hashmap_chain_destroy (VisHashmap *hashmap, VisList *list) + { + VisCollectionDestroyerFunc destroyer; + VisHashmapChainEntry *mentry; +--- libvisual/lv_libvisual.c ++++ libvisual/lv_libvisual.c +@@ -72,7 +72,7 @@ + + static int init_params (VisParamContainer *paramcontainer); + static VisUIWidget *make_userinterface (void); +-static int free_plugpaths (void); ++static void free_plugpaths (void); + + static int init_params (VisParamContainer *paramcontainer) + { +@@ -181,7 +181,7 @@ + return vbox; + } + +-static int free_plugpaths () ++static void free_plugpaths () + { + int i; + diff --git a/libvisual-0.4.0.tar.bz2 b/libvisual-0.4.0.tar.bz2 new file mode 100644 index 0000000..b8bb8d9 --- /dev/null +++ b/libvisual-0.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f38d3ce857edde5482aa4415b504bbcd4d4a688fd4de09ec2131ad08174279 +size 430496 diff --git a/libvisual.changes b/libvisual.changes new file mode 100644 index 0000000..b1fb1b9 --- /dev/null +++ b/libvisual.changes @@ -0,0 +1,188 @@ +------------------------------------------------------------------- +Mon Nov 6 08:58:49 UTC 2023 - Dominique Leuenberger + +- Fix build with RPM 4.19: unnumbered patches are no longer + supported. + +------------------------------------------------------------------- +Wed May 11 09:45:01 UTC 2022 - Jan Engelhardt + +- Remove old specfile constructs +- Remove --with-pic, this is only useful with --enable-static +- Make %install sh-compatible +- Remove .la files, I do not think we will need it +- Repair rpmlint error "libvisual.x86_64: E: + shlib-policy-name-error SONAME: libvisual-0.4.so.0, expected + package suffix: 0_4-0" + +------------------------------------------------------------------- +Sat Feb 2 18:52:30 UTC 2013 - coolo@suse.com + +- update license to new format + +------------------------------------------------------------------- +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 + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Tue Nov 22 10:20:46 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Fri Oct 21 16:25:23 CEST 2011 - mls@suse.de + +- do not use /usr/src/packages in specfile + +------------------------------------------------------------------- +Fri Jun 24 03:37:36 UTC 2011 - anixx@opensuse.org + +- added a patch from Debian to fix build + +------------------------------------------------------------------- +Mon Feb 1 11:57:05 UTC 2010 - jengelh@medozas.de + +- package baselibs.conf + +------------------------------------------------------------------- +Wed Jan 7 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- +Thu Nov 13 00:16:30 CET 2008 - crrodriguez@suse.de + +- use -fno-strict-aliasing to avoid breakages. + +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + +------------------------------------------------------------------- +Mon Jun 11 21:32:45 CEST 2007 - schwab@suse.de + +- Fix unref on const object. + +------------------------------------------------------------------- +Tue Nov 21 21:06:50 CET 2006 - olh@suse.de + +- disable altivec [#219960] + +------------------------------------------------------------------- +Tue Aug 29 12:35:03 CEST 2006 - mskibbe@suse.de + +- fix some compiler warnings +- fix bug 199443 - libvisual-0.4.0-2: local variable used before + set + +------------------------------------------------------------------- +Tue Jul 4 13:57:18 CEST 2006 - cthiel@suse.de + +- update to version 0.4.0 + * Real time timestamping support. + * Will unref plugins that don't match the ABI version. + * Added VisRectangle system. + * New BMP loader that supports all depths and RLE encoding. + * visual_mem_set(), visual_mem_set16(), visual_mem_set32() + Optimized memset functions. + * VisVideo new composite system. + * VisVideo sub regions. + * visual_video_zoom_*(). + * visual_video_mirror_*(). + * visual_video_rotate_*(). + * Removed obsolete visual_video_depth_transform_to_buffer(). + * Added VisCollection system. + * Added VisHashmap. + * Added VisCache. + * VisAudio rewrite. + * Added .license bit to VisPluginInfo for realtime license check. + * Removed .struct_size and .api_version from the VisPluginInfo structure, + and revamped the plugin version check system. Put + VISUAL_PLUGIN_API_VERSION_VALIDATOR somewhere in your plugin and it'll + work. + * Homedir installable plugins ~/.libvisual/actor transform morph input. + * Added VisOS. Realtime priority functions are hosted in this module. + * Added VisMath. All kind of math related functions have been added, most + note worthy are the _vectorized_. All of these are accelerated by + mmx/3dnow/sse instructions. + * VisFourier completely revamped. + +------------------------------------------------------------------- +Tue Feb 28 17:39:54 CET 2006 - hvogel@suse.de + +- include transform directorys for plugins [#154112] + +------------------------------------------------------------------- +Fri Feb 3 15:03:37 CET 2006 - ro@suse.de + +- Stack Protector only for > 10.0 + +------------------------------------------------------------------- +Wed Jan 25 21:37:47 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Jan 13 15:01:16 CET 2006 - hvogel@suse.de + +- Make use of Stack Protector + +------------------------------------------------------------------- +Mon Sep 26 21:51:15 CEST 2005 - mls@suse.de + +- make devel package require base package + +------------------------------------------------------------------- +Thu Jun 23 12:44:11 CEST 2005 - hvogel@suse.de + +- remove build directory from dependency_libs + +------------------------------------------------------------------- +Tue May 10 01:13:30 CEST 2005 - ro@suse.de + +- use mmx on x86 + +------------------------------------------------------------------- +Thu Feb 10 09:32:47 CET 2005 - adrian@suse.de + +- update to official version 0.2.0 + +------------------------------------------------------------------- +Tue Feb 8 18:53:50 CET 2005 - hvogel@suse.de + +- fix build on ppc + +------------------------------------------------------------------- +Wed Feb 2 21:20:28 CET 2005 - hvogel@suse.de + +- update to latest CVS (upcomming 0.2.0) + +------------------------------------------------------------------- +Mon Nov 22 17:11:45 CET 2004 - hvogel@suse.de + +- the directorys do not belong to the devel subpackage + +------------------------------------------------------------------- +Thu Nov 11 11:02:13 CET 2004 - hvogel@suse.de + +- include some directorys the libvisual plugins need + +------------------------------------------------------------------- +Thu Oct 28 18:08:36 CEST 2004 - adrian@suse.de + +- update to version 0.1.7 + +------------------------------------------------------------------- +Mon Oct 11 09:46:55 CEST 2004 - adrian@suse.de + +- initial package of version 0.1.6 + diff --git a/libvisual.spec b/libvisual.spec new file mode 100644 index 0000000..6647a98 --- /dev/null +++ b/libvisual.spec @@ -0,0 +1,119 @@ +# +# spec file for package libvisual +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: libvisual +Version: 0.4.0 +Release: 0 +%ifarch ppc64 +# bug437293 +Obsoletes: libvisual-64bit +%endif +Summary: Sound Visualization Library +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Productivity/Multimedia/Sound/Visualization +URL: http://localhost.nl/~synap/libvisual-wiki/index.php/Main_Page +Source: %name-%{version}.tar.bz2 +Source2: baselibs.conf +Patch0: %name-%{version}.diff +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 +BuildRequires: freeglut-devel +BuildRequires: gcc-c++ +BuildRequires: libdrm-devel +BuildRequires: libtool +BuildRequires: pkgconfig + +%description +Libvisual is a library that acts as a middle layer between applications +that need audio visualization and audio visualization plug-ins. + +%package -n libvisual-0_4-0 +Summary: Sound Visualization library +Group: System/Libraries + +%description -n libvisual-0_4-0 +Libvisual is a library that acts as a middle layer between applications +that need audio visualization and audio visualization plug-ins. + +%package devel +Summary: Headers for the libvisual sound visualization library +Group: Productivity/Multimedia/Sound/Visualization +Requires: glibc-devel +Requires: libvisual-0_4-0 = %{version}-%{release} +# bug437293 +%ifarch ppc64 +Obsoletes: libvisual-devel-64bit +%endif + +%description devel +Libvisual is a library that acts as a middle layer between applications +that want audio visualisation and audio visualisation plugins. + +This library is used by amaroK for example. + +%prep +%setup -q +%patch0 +%patch1 +%patch2 -p1 +%patch3 +%patch4 -p1 +%patch5 -p1 + +%build +autoreconf -fiv +%if %suse_version > 1000 +CFLAGS="%optflags -fstack-protector" +%endif +%ifarch %ix86 +CFLAGS="%optflags -mmmx" +%else +CFLAGS="%optflags" +%endif +export CFLAGS="$CFLAGS -fno-strict-aliasing" +%configure --disable-static +%make_build + +%install +%make_install +for i in morph input actor transform; do + mkdir -p %buildroot/%_libdir/%name/$i %buildroot/%_datadir/%name/$i +done +rm -v %buildroot/%_libdir/*.la +# *fixme* +rm -rf %buildroot/%_datadir/locale + +%post -n libvisual-0_4-0 -p /sbin/ldconfig +%postun -n libvisual-0_4-0 -p /sbin/ldconfig + +%files -n libvisual-0_4-0 +%_libdir/libvisual-0.4.so.* +%_libdir/libvisual +%_datadir/libvisual + +%files devel +%doc AUTHORS README ChangeLog NEWS TODO +%license COPYING +%_includedir/libvisual-0.4 +%_libdir/pkgconfig/libvisual-0.4.pc +%_libdir/libvisual-0.4.so + +%changelog diff --git a/libvisual.visual_cpu_get_altivec.patch b/libvisual.visual_cpu_get_altivec.patch new file mode 100644 index 0000000..bce5592 --- /dev/null +++ b/libvisual.visual_cpu_get_altivec.patch @@ -0,0 +1,21 @@ +better use glibc hwcap stuff instead of broken SIGILL traps. + +--- + libvisual/lv_cpu.c | 4 ---- + 1 file changed, 4 deletions(-) + +Index: libvisual-0.4.0/libvisual/lv_cpu.c +=================================================================== +--- libvisual-0.4.0.orig/libvisual/lv_cpu.c ++++ libvisual-0.4.0/libvisual/lv_cpu.c +@@ -441,10 +441,6 @@ void visual_cpu_initialize () + #endif + #endif /* VISUAL_ARCH_X86 */ + +-#if defined(VISUAL_ARCH_POWERPC) +- check_os_altivec_support (); +-#endif /* VISUAL_ARCH_POWERPC */ +- + /* Synchronizing enabled flags with has flags */ + __lv_cpu_caps.enabledTSC = __lv_cpu_caps.hasTSC; + __lv_cpu_caps.enabledMMX = __lv_cpu_caps.hasMMX;