Upgrading to 0.9.3. Adding patches from gentoo (thanks).

6 files changed, 67 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 16c31aa06725..00ea910d98b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,33 +2,35 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=meterbridge
-pkgver=0.9.2
-pkgrel=3
+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=('GPL')
+license=('GPL2')
 groups=('pro-audio')
-depends=('jack' 'sdl_image')
+makedepends=('mesa')
+depends=('jack' 'sdl_image' 'libglvnd')
 source=("http://plugin.org.uk/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'c99-inline-fix.patch')
-sha512sums=('dec68307430649f3281528b31f20f501df07c4c9841776bac9c532d16a309bc701d39a5f577dc55eccb0edebc514d2eeca45c057a81a5c6c57bd61faae7deff0'
-            '4e76dcb966daa5080ebf85274739e6ac0ef5baf15ef42d4c9d9918f2ed03ce4dae954323f1fc3081360f175d24692f4d8612d39b3def11a480ac10d466f31da6')
+        "${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}"
-
-  # gcc 4.x fix
-  sed -i "s/ buf_rect.*,//" src/main.h
-
-  # iec scale fix
-  # http://lists.linuxaudio.org/pipermail/linux-audio-dev/2012-June/032475.html
-  sed -i 's/ 5.0/ 2.5/' src/dpm_meters.c
-
-  # fix the changed evaluation of inline functions
-  patch -Np0 -i "${srcdir}/c99-inline-fix.patch"
-
-  autoreconf -vi
+  # 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() {
@@ -40,4 +42,5 @@ build() {
 package() {
   cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}/" install
+  install -vDm 644 {AUTHORS,ChangeLog} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
diff --git a/c99-inline-fix.patch b/c99-inline-fix.patch
deleted file mode 100644
index fa5ce250ca53..000000000000
--- a/c99-inline-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/linedraw.c	2002-10-10 12:06:06.000000000 +0200
-+++ src/linedraw.c.fix	2017-12-04 00:36:19.839664181 +0100
-@@ -9,6 +9,7 @@
- 	Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x;
- 	*bufp = col;
- }
-+void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col);
- 
- /* use Bresenham's alg. to draw a line between two integer coordinates */
- 
diff --git a/meterbridge-0.9.3-asneeded.patch b/meterbridge-0.9.3-asneeded.patch
new file mode 100644
index 000000000000..f7e7ba0d860b
--- /dev/null
+++ b/meterbridge-0.9.3-asneeded.patch
@@ -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
diff --git a/meterbridge-0.9.3-cflags.patch b/meterbridge-0.9.3-cflags.patch
new file mode 100644
index 000000000000..a79867ad8d9c
--- /dev/null
+++ b/meterbridge-0.9.3-cflags.patch
@@ -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
+ 
diff --git a/meterbridge-0.9.3-gcc41.patch b/meterbridge-0.9.3-gcc41.patch
new file mode 100644
index 000000000000..861385214a67
--- /dev/null
+++ b/meterbridge-0.9.3-gcc41.patch
@@ -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];
diff --git a/meterbridge-0.9.3-setrgba.patch b/meterbridge-0.9.3-setrgba.patch
new file mode 100644
index 000000000000..52f00b3a6c5a
--- /dev/null
+++ b/meterbridge-0.9.3-setrgba.patch
@@ -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;