[arch-commits] Commit in lib32-libvisual/repos/multilib-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Thu May 31 01:20:32 UTC 2018
Date: Thursday, May 31, 2018 @ 01:20:31
Author: felixonmars
Revision: 333703
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libvisual/repos/multilib-x86_64/PKGBUILD
(from rev 333702, lib32-libvisual/trunk/PKGBUILD)
lib32-libvisual/repos/multilib-x86_64/libvisual-0.4.0-inlinedefineconflict.patch
(from rev 333702, lib32-libvisual/trunk/libvisual-0.4.0-inlinedefineconflict.patch)
Deleted:
lib32-libvisual/repos/multilib-x86_64/PKGBUILD
lib32-libvisual/repos/multilib-x86_64/libvisual-0.4.0-inlinedefineconflict.patch
--------------------------------------------+
PKGBUILD | 86 +++++++++----------
libvisual-0.4.0-inlinedefineconflict.patch | 122 +++++++++++++--------------
2 files changed, 104 insertions(+), 104 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-31 01:20:02 UTC (rev 333702)
+++ PKGBUILD 2018-05-31 01:20:31 UTC (rev 333703)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
-# Contributor: Padfoot <padfoot at exemail dot com dot au>
-# Contributor: Maxime Gauduin <alucryd at gmail dot com>
-# Contributor: josephgbr <rafael.f.f1 at gmail dot com>
-
-pkgname=lib32-libvisual
-pkgver=0.4.0
-pkgrel=5
-pkgdesc="Abstraction library that comes between applications and audio visualisation plugins (32-bit)"
-arch=('x86_64')
-url='http://sourceforge.net/projects/libvisual/'
-license=('LGPL')
-depends=('lib32-glibc' "${pkgname#lib32-}")
-makedepends=('gcc-multilib')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname#lib32-}/${pkgname#lib32-}-${pkgver}.tar.gz"
- "libvisual-0.4.0-inlinedefineconflict.patch")
-sha512sums=('ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95'
- '13872adb2f99bd989b954499f80d2bd2646369d3fdb190a07e02cada1c42de7a7c36ca368b70f024484eb621f4320649a83107d4874a01f37ab2e10806dca89d')
-
-prepare(){
- cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export LDFLAGS='-m32'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
- # 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 "${srcdir}/${pkgname#lib32-}-${pkgver}"
- ./configure --prefix='/usr' --libdir='/usr/lib32'
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/"{include,share}
-}
Copied: lib32-libvisual/repos/multilib-x86_64/PKGBUILD (from rev 333702, lib32-libvisual/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-31 01:20:31 UTC (rev 333703)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
+# Contributor: Padfoot <padfoot at exemail dot com dot au>
+# Contributor: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: josephgbr <rafael.f.f1 at gmail dot com>
+
+pkgname=lib32-libvisual
+pkgver=0.4.0
+pkgrel=6
+pkgdesc="Abstraction library that comes between applications and audio visualisation plugins (32-bit)"
+arch=('x86_64')
+url='http://sourceforge.net/projects/libvisual/'
+license=('LGPL')
+depends=('lib32-glibc' "${pkgname#lib32-}")
+makedepends=('gcc-multilib')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname#lib32-}/${pkgname#lib32-}-${pkgver}.tar.gz"
+ "libvisual-0.4.0-inlinedefineconflict.patch")
+sha512sums=('ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95'
+ '13872adb2f99bd989b954499f80d2bd2646369d3fdb190a07e02cada1c42de7a7c36ca368b70f024484eb621f4320649a83107d4874a01f37ab2e10806dca89d')
+
+prepare(){
+ cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export LDFLAGS='-m32'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ # 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 "${srcdir}/${pkgname#lib32-}-${pkgver}"
+ ./configure --prefix='/usr' --libdir='/usr/lib32'
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname#lib32-}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}/usr/"{include,share}
+}
Deleted: libvisual-0.4.0-inlinedefineconflict.patch
===================================================================
--- libvisual-0.4.0-inlinedefineconflict.patch 2018-05-31 01:20:02 UTC (rev 333702)
+++ libvisual-0.4.0-inlinedefineconflict.patch 2018-05-31 01:20:31 UTC (rev 333703)
@@ -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: lib32-libvisual/repos/multilib-x86_64/libvisual-0.4.0-inlinedefineconflict.patch (from rev 333702, lib32-libvisual/trunk/libvisual-0.4.0-inlinedefineconflict.patch)
===================================================================
--- libvisual-0.4.0-inlinedefineconflict.patch (rev 0)
+++ libvisual-0.4.0-inlinedefineconflict.patch 2018-05-31 01:20:31 UTC (rev 333703)
@@ -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