[arch-commits] Commit in libvisual/repos/extra-x86_64 (4 files)
Allan McRae
allan at archlinux.org
Thu May 7 06:29:12 UTC 2020
Date: Thursday, May 7, 2020 @ 06:29:12
Author: allan
Revision: 382610
archrelease: copy trunk to extra-x86_64
Added:
libvisual/repos/extra-x86_64/PKGBUILD
(from rev 382609, libvisual/trunk/PKGBUILD)
libvisual/repos/extra-x86_64/libvisual-0.4.0-inlinedefineconflict.patch
(from rev 382609, libvisual/trunk/libvisual-0.4.0-inlinedefineconflict.patch)
Deleted:
libvisual/repos/extra-x86_64/PKGBUILD
libvisual/repos/extra-x86_64/libvisual-0.4.0-inlinedefineconflict.patch
--------------------------------------------+
PKGBUILD | 67 +++++++-------
libvisual-0.4.0-inlinedefineconflict.patch | 122 +++++++++++++--------------
2 files changed, 94 insertions(+), 95 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-07 06:28:47 UTC (rev 382609)
+++ PKGBUILD 2020-05-07 06:29:12 UTC (rev 382610)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libvisual
-pkgver=0.4.0
-pkgrel=7
-pkgdesc="Abstraction library that comes between applications and audio visualisation plugins"
-arch=('x86_64')
-url="https://sourceforge.net/projects/libvisual/"
-license=('LGPL')
-depends=('glibc')
-source=("https://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz"
- "libvisual-0.4.0-inlinedefineconflict.patch")
-sha256sums=('0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7'
- '5221aadfdd6ba752e9bf45d6f2b0133357f7e3e7cf286c1b36807cc2e0df5a0a')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # libvisual's definition of "inline" causes issues when compiling with the
- # new C++11 ABI (patch from Fedora)
- patch -Np1 -i ../libvisual-0.4.0-inlinedefineconflict.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: libvisual/repos/extra-x86_64/PKGBUILD (from rev 382609, libvisual/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-07 06:29:12 UTC (rev 382610)
@@ -0,0 +1,33 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libvisual
+pkgver=0.4.0
+pkgrel=8
+pkgdesc="Abstraction library that comes between applications and audio visualisation plugins"
+arch=('x86_64')
+url="https://sourceforge.net/projects/libvisual/"
+license=('LGPL')
+depends=('glibc')
+source=("https://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz"
+ "libvisual-0.4.0-inlinedefineconflict.patch")
+sha256sums=('0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7'
+ '5221aadfdd6ba752e9bf45d6f2b0133357f7e3e7cf286c1b36807cc2e0df5a0a')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # libvisual's definition of "inline" causes issues when compiling with the
+ # new C++11 ABI (patch from Fedora)
+ patch -Np1 -i ../libvisual-0.4.0-inlinedefineconflict.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: libvisual-0.4.0-inlinedefineconflict.patch
===================================================================
--- libvisual-0.4.0-inlinedefineconflict.patch 2020-05-07 06:28:47 UTC (rev 382609)
+++ libvisual-0.4.0-inlinedefineconflict.patch 2020-05-07 06:29:12 UTC (rev 382610)
@@ -1,61 +0,0 @@
-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;
-
Copied: libvisual/repos/extra-x86_64/libvisual-0.4.0-inlinedefineconflict.patch (from rev 382609, libvisual/trunk/libvisual-0.4.0-inlinedefineconflict.patch)
===================================================================
--- libvisual-0.4.0-inlinedefineconflict.patch (rev 0)
+++ libvisual-0.4.0-inlinedefineconflict.patch 2020-05-07 06:29:12 UTC (rev 382610)
@@ -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;
+
More information about the arch-commits
mailing list