[arch-commits] Commit in meterbridge/repos/community-x86_64 (11 files)
David Runge
dvzrv at archlinux.org
Fri May 10 09:15:34 UTC 2019
Date: Friday, May 10, 2019 @ 09:15:34
Author: dvzrv
Revision: 464786
archrelease: copy trunk to community-x86_64
Added:
meterbridge/repos/community-x86_64/PKGBUILD
(from rev 464785, meterbridge/trunk/PKGBUILD)
meterbridge/repos/community-x86_64/meterbridge-0.9.3-asneeded.patch
(from rev 464785, meterbridge/trunk/meterbridge-0.9.3-asneeded.patch)
meterbridge/repos/community-x86_64/meterbridge-0.9.3-cflags.patch
(from rev 464785, meterbridge/trunk/meterbridge-0.9.3-cflags.patch)
meterbridge/repos/community-x86_64/meterbridge-0.9.3-gcc41.patch
(from rev 464785, meterbridge/trunk/meterbridge-0.9.3-gcc41.patch)
meterbridge/repos/community-x86_64/meterbridge-0.9.3-setrgba.patch
(from rev 464785, meterbridge/trunk/meterbridge-0.9.3-setrgba.patch)
meterbridge/repos/community-x86_64/meterbridge-0.9.3-xinitthreads.patch
(from rev 464785, meterbridge/trunk/meterbridge-0.9.3-xinitthreads.patch)
Deleted:
meterbridge/repos/community-x86_64/PKGBUILD
meterbridge/repos/community-x86_64/meterbridge-0.9.3-asneeded.patch
meterbridge/repos/community-x86_64/meterbridge-0.9.3-cflags.patch
meterbridge/repos/community-x86_64/meterbridge-0.9.3-gcc41.patch
meterbridge/repos/community-x86_64/meterbridge-0.9.3-setrgba.patch
--------------------------------------+
PKGBUILD | 97 +++++++++++++++++----------------
meterbridge-0.9.3-asneeded.patch | 20 +++---
meterbridge-0.9.3-cflags.patch | 22 +++----
meterbridge-0.9.3-gcc41.patch | 26 ++++----
meterbridge-0.9.3-setrgba.patch | 22 +++----
meterbridge-0.9.3-xinitthreads.patch | 30 ++++++++++
6 files changed, 126 insertions(+), 91 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-10 09:15:25 UTC (rev 464785)
+++ PKGBUILD 2019-05-10 09:15:34 UTC (rev 464786)
@@ -1,46 +0,0 @@
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: speps <speps at aur dot archlinux dot org>
-
-pkgname=meterbridge
-pkgver=0.9.3
-pkgrel=1
-pkgdesc="Collection of Audio meters for the JACK audio server"
-arch=('x86_64')
-url="http://plugin.org.uk/meterbridge/"
-license=('GPL2')
-groups=('pro-audio')
-makedepends=('mesa')
-depends=('jack' 'sdl_image' 'libglvnd')
-source=("http://plugin.org.uk/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "${pkgname}-${pkgver}-asneeded.patch"
- "${pkgname}-${pkgver}-cflags.patch"
- "${pkgname}-${pkgver}-gcc41.patch"
- "${pkgname}-${pkgver}-setrgba.patch")
-sha512sums=('19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a'
- 'b3877c523b8c4f666fe5435882e6603abe448e53485939048b3f0ae617cae8634218aba553afdc3f97e03406c1a5a924b9a487930dfe62256f9155a26d39cba7'
- '4a7fe804884feb05fe2af8f0c4cf83b89324ab10e1dad834e3ebcca403223b0c29b8050cbaac3652e64c18f4d1a7b800406431974187839483dbb07f85f9af87'
- 'df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e'
- '2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- # patches taken from gentoo ebuild:
- # https://packages.gentoo.org/packages/media-sound/meterbridge
- patch -Np1 -i "../${pkgname}-${pkgver}-asneeded.patch"
- patch -Np1 -i "../${pkgname}-${pkgver}-cflags.patch"
- patch -Np1 -i "../${pkgname}-${pkgver}-gcc41.patch"
- patch -Np1 -i "../${pkgname}-${pkgver}-setrgba.patch"
- autoreconf -vfi
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}/" install
- install -vDm 644 {AUTHORS,ChangeLog} -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
Copied: meterbridge/repos/community-x86_64/PKGBUILD (from rev 464785, meterbridge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-10 09:15:34 UTC (rev 464786)
@@ -0,0 +1,51 @@
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: speps <speps at aur dot archlinux dot org>
+
+pkgname=meterbridge
+pkgver=0.9.3
+pkgrel=2
+pkgdesc="Collection of Audio meters for the JACK audio server"
+arch=('x86_64')
+url="http://plugin.org.uk/meterbridge/"
+license=('GPL2')
+groups=('pro-audio')
+makedepends=('mesa')
+depends=('jack' 'sdl_image' 'libglvnd')
+source=("http://plugin.org.uk/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}-${pkgver}-asneeded.patch"
+ "${pkgname}-${pkgver}-cflags.patch"
+ "${pkgname}-${pkgver}-gcc41.patch"
+ "${pkgname}-${pkgver}-setrgba.patch"
+ "${pkgname}-${pkgver}-xinitthreads.patch")
+sha512sums=('19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a'
+ 'b3877c523b8c4f666fe5435882e6603abe448e53485939048b3f0ae617cae8634218aba553afdc3f97e03406c1a5a924b9a487930dfe62256f9155a26d39cba7'
+ '4a7fe804884feb05fe2af8f0c4cf83b89324ab10e1dad834e3ebcca403223b0c29b8050cbaac3652e64c18f4d1a7b800406431974187839483dbb07f85f9af87'
+ 'df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e'
+ '2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4'
+ 'c25f58c8390d0485a78242af991b6381cfddbe3dac9057bfcc909385b07bbbab6fe3953c0c9290926a3e5547422f7aed883b1d48c4acd25a0327b31189a967c8')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ # patches taken from gentoo ebuild:
+ # https://packages.gentoo.org/packages/media-sound/meterbridge
+ patch -Np1 -i "../${pkgname}-${pkgver}-asneeded.patch"
+ patch -Np1 -i "../${pkgname}-${pkgver}-cflags.patch"
+ patch -Np1 -i "../${pkgname}-${pkgver}-gcc41.patch"
+ patch -Np1 -i "../${pkgname}-${pkgver}-setrgba.patch"
+ # allow multiple meters:
+ # https://bugs.archlinux.org/task/61530
+ patch -Np1 -i "../${pkgname}-${pkgver}-xinitthreads.patch"
+ autoreconf -vfi
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ install -vDm 644 {AUTHORS,ChangeLog} -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
Deleted: meterbridge-0.9.3-asneeded.patch
===================================================================
--- meterbridge-0.9.3-asneeded.patch 2019-05-10 09:15:25 UTC (rev 464785)
+++ meterbridge-0.9.3-asneeded.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -1,10 +0,0 @@
-Index: meterbridge-0.9.3/src/Makefile.am
-===================================================================
---- meterbridge-0.9.3.orig/src/Makefile.am
-+++ meterbridge-0.9.3/src/Makefile.am
-@@ -6,4 +6,4 @@ bin_PROGRAMS = meterbridge
- EXTRA_DIST = *.h
-
- meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c gl_utils.c
--meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lGL -lSDL_image
-+meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lGL -lSDL_image
Copied: meterbridge/repos/community-x86_64/meterbridge-0.9.3-asneeded.patch (from rev 464785, meterbridge/trunk/meterbridge-0.9.3-asneeded.patch)
===================================================================
--- meterbridge-0.9.3-asneeded.patch (rev 0)
+++ meterbridge-0.9.3-asneeded.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -0,0 +1,10 @@
+Index: meterbridge-0.9.3/src/Makefile.am
+===================================================================
+--- meterbridge-0.9.3.orig/src/Makefile.am
++++ meterbridge-0.9.3/src/Makefile.am
+@@ -6,4 +6,4 @@ bin_PROGRAMS = meterbridge
+ EXTRA_DIST = *.h
+
+ meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c gl_utils.c
+-meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lGL -lSDL_image
++meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lGL -lSDL_image
Deleted: meterbridge-0.9.3-cflags.patch
===================================================================
--- meterbridge-0.9.3-cflags.patch 2019-05-10 09:15:25 UTC (rev 464785)
+++ meterbridge-0.9.3-cflags.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -1,11 +0,0 @@
-Index: meterbridge-0.9.3/src/Makefile.am
-===================================================================
---- meterbridge-0.9.3.orig/src/Makefile.am
-+++ meterbridge-0.9.3/src/Makefile.am
-@@ -1,5 +1,5 @@
- #CFLAGS = -Wall -O3 $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
--CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
-+AM_CFLAGS = -Wall $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
-
- bin_PROGRAMS = meterbridge
-
Copied: meterbridge/repos/community-x86_64/meterbridge-0.9.3-cflags.patch (from rev 464785, meterbridge/trunk/meterbridge-0.9.3-cflags.patch)
===================================================================
--- meterbridge-0.9.3-cflags.patch (rev 0)
+++ meterbridge-0.9.3-cflags.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -0,0 +1,11 @@
+Index: meterbridge-0.9.3/src/Makefile.am
+===================================================================
+--- meterbridge-0.9.3.orig/src/Makefile.am
++++ meterbridge-0.9.3/src/Makefile.am
+@@ -1,5 +1,5 @@
+ #CFLAGS = -Wall -O3 $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+-CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
++AM_CFLAGS = -Wall $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+
+ bin_PROGRAMS = meterbridge
+
Deleted: meterbridge-0.9.3-gcc41.patch
===================================================================
--- meterbridge-0.9.3-gcc41.patch 2019-05-10 09:15:25 UTC (rev 464785)
+++ meterbridge-0.9.3-gcc41.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -1,13 +0,0 @@
-Index: meterbridge-0.9.3/src/main.h
-===================================================================
---- meterbridge-0.9.3.orig/src/main.h
-+++ meterbridge-0.9.3/src/main.h
-@@ -10,7 +10,7 @@
-
- extern SDL_Surface *screen, *background_image;
- extern SDL_Surface *image, *meter, *meter_buf;
--extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
-+extern SDL_Rect win, dest[MAX_METERS];
-
- extern jack_port_t *input_ports[MAX_METERS];
- extern jack_port_t *output_ports[MAX_METERS];
Copied: meterbridge/repos/community-x86_64/meterbridge-0.9.3-gcc41.patch (from rev 464785, meterbridge/trunk/meterbridge-0.9.3-gcc41.patch)
===================================================================
--- meterbridge-0.9.3-gcc41.patch (rev 0)
+++ meterbridge-0.9.3-gcc41.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -0,0 +1,13 @@
+Index: meterbridge-0.9.3/src/main.h
+===================================================================
+--- meterbridge-0.9.3.orig/src/main.h
++++ meterbridge-0.9.3/src/main.h
+@@ -10,7 +10,7 @@
+
+ extern SDL_Surface *screen, *background_image;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
++extern SDL_Rect win, dest[MAX_METERS];
+
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];
Deleted: meterbridge-0.9.3-setrgba.patch
===================================================================
--- meterbridge-0.9.3-setrgba.patch 2019-05-10 09:15:25 UTC (rev 464785)
+++ meterbridge-0.9.3-setrgba.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -1,11 +0,0 @@
---- meterbridge-0.9.3/src/linedraw.c.orig 2016-07-25 21:07:06.992953036 -0500
-+++ meterbridge-0.9.3/src/linedraw.c 2016-07-25 21:07:24.640629427 -0500
-@@ -4,7 +4,7 @@
- /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA,
- * ordered ABGR (I think), probably wont work on bigendian systems */
-
--inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
-+void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
- {
- Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x;
- *bufp = col;
Copied: meterbridge/repos/community-x86_64/meterbridge-0.9.3-setrgba.patch (from rev 464785, meterbridge/trunk/meterbridge-0.9.3-setrgba.patch)
===================================================================
--- meterbridge-0.9.3-setrgba.patch (rev 0)
+++ meterbridge-0.9.3-setrgba.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -0,0 +1,11 @@
+--- meterbridge-0.9.3/src/linedraw.c.orig 2016-07-25 21:07:06.992953036 -0500
++++ meterbridge-0.9.3/src/linedraw.c 2016-07-25 21:07:24.640629427 -0500
+@@ -4,7 +4,7 @@
+ /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA,
+ * ordered ABGR (I think), probably wont work on bigendian systems */
+
+-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
+ {
+ Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x;
+ *bufp = col;
Copied: meterbridge/repos/community-x86_64/meterbridge-0.9.3-xinitthreads.patch (from rev 464785, meterbridge/trunk/meterbridge-0.9.3-xinitthreads.patch)
===================================================================
--- meterbridge-0.9.3-xinitthreads.patch (rev 0)
+++ meterbridge-0.9.3-xinitthreads.patch 2019-05-10 09:15:34 UTC (rev 464786)
@@ -0,0 +1,30 @@
+diff -Naur orig.meterbridge-0.9.3/configure.in meterbridge-0.9.3/configure.in
+--- orig.meterbridge-0.9.3/configure.in 2019-01-24 17:00:49.573488552 -0800
++++ meterbridge-0.9.3/configure.in 2019-01-24 17:01:49.105270619 -0800
+@@ -9,6 +9,7 @@
+ # Checks for libraries.
+ AC_CHECK_LIB([pthread], [pthread_self], , [AC_MSG_ERROR(You need libpthread installed)])
+ AC_CHECK_LIB([m], [sqrt], , [AC_MSG_ERROR(Can't find libm)])
++AC_CHECK_LIB([X11], [XInitThreads], , [AC_MSG_ERROR(You need Xlib instaled)])
+
+ # Checks for packages.
+ AM_PATH_SDL(1.2.0, , AC_MSG_ERROR([Requires SDL 1.2 or later]))
+diff -Naur orig.meterbridge-0.9.3/src/main.c meterbridge-0.9.3/src/main.c
+--- orig.meterbridge-0.9.3/src/main.c 2019-01-24 17:00:49.573488552 -0800
++++ meterbridge-0.9.3/src/main.c 2019-01-24 17:02:23.251050690 -0800
+@@ -10,6 +10,7 @@
+ #include <GL/gl.h>
+ #include <jack/jack.h>
+ #include <getopt.h>
++#include <X11/Xlib.h>
+
+ #include "config.h"
+ #include "main.h"
+@@ -68,6 +69,7 @@
+ meter_t meter_type = MET_PPM;
+ char window_name[256];
+ char *us_client_name = NULL;
++ XInitThreads();
+
+ num_meters = argc;
+ while ((opt = getopt(argc, argv, "t:r:c:n:g:h")) != -1) {
More information about the arch-commits
mailing list