[SCM] ebumeter/master: Refresh patch.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Jun 14 17:43:29 UTC 2016
The following commit has been merged in the master branch:
commit 4deb20ffeb67d5e84856172991565953b14a0835
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Jun 14 19:24:55 2016 +0200
Refresh patch.
diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 56e1a37..3c0de42 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -6,19 +6,20 @@ Forwarded: no
Index: ebumeter/source/Makefile
===================================================================
---- ebumeter.orig/source/Makefile 2012-09-27 10:09:33.519146981 +0200
-+++ ebumeter/source/Makefile 2012-09-27 10:38:23.923727590 +0200
-@@ -19,15 +19,15 @@
+--- ebumeter.orig/source/Makefile
++++ ebumeter/source/Makefile
+@@ -18,16 +18,15 @@
+ #
# --------------------------------------------------------------------------
-
+-
-PREFIX = /usr/local
+PREFIX = /usr
SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
LIBDIR = lib$(SUFFIX)
BINDIR = $(PREFIX)/bin
SHARED = $(PREFIX)/share/ebumeter
- VERSION = 0.2.0
+ VERSION = 0.4.0
CPPFLAGS += -DVERSION=\"$(VERSION)\"
-CXXFLAGS += -O2 -Wall -MMD -MP
-CXXFLAGS += -march=native
@@ -27,12 +28,12 @@ Index: ebumeter/source/Makefile
LDFLAGS += -L$(PREFIX)/$(LIBDIR)
-@@ -46,7 +46,7 @@
- button.o guiclass.o
+@@ -46,7 +45,7 @@ EBUMETER_O = ebumeter.o jclient.o mainwi
+ png2img.o button.o guiclass.o
ebumeter: CPPFLAGS += -I/usr/include/freetype2
ebumeter: CPPFLAGS += -DPREFIX=\"$(PREFIX)\" -DSHARED=\"$(SHARED)\"
-ebumeter: LDFLAGS += -L/usr/X11R6/$(LIBDIR)
-+ebumeter: LDFLAGS += -L/usr/X11R6/$(LIBDIR) -pthread
- ebumeter: LDLIBS += -lclthreads -lclxclient -lpthread -ljack -lpng -lXft -lpng -lX11 -lrt
++ebumeter: LDFLAGS += -L/usr/X11R6/$(LIBDIR) -pthread
+ ebumeter: LDLIBS += -lclthreads -lclxclient -lzita-resampler -lpthread -ljack -lpng -lXft -lpng -lX11 -lrt
ebumeter: $(EBUMETER_O)
g++ $(LDFLAGS) -o $@ $(EBUMETER_O) $(LDLIBS)
--
ebumeter packaging
More information about the pkg-multimedia-commits
mailing list