Source: ebumeter Version: 0.4.0-3 Tags: patch User: helm...@debian.org Usertags: rebootstrap
ebumeter fails to cross build from source for two reasons: * The explicit build dependency on binutils (host architecture) conflicts with the implicity dependency from build-essential (build architecture). In theory, we would have to apply "toolchain dependency cross translation", but it is much easier to just drop the redundant dependency. * The upstream Makefile hardcodes g++, but it needs to be susbtitutable. The attached patch fixes both issues and makes ebumeter cross build successfully. Please consider applying it. Helmut
diff --minimal -Nru ebumeter-0.4.0/debian/changelog ebumeter-0.4.0/debian/changelog --- ebumeter-0.4.0/debian/changelog 2016-12-22 00:06:19.000000000 +0100 +++ ebumeter-0.4.0/debian/changelog 2017-08-28 19:08:03.000000000 +0200 @@ -1,3 +1,12 @@ +ebumeter (0.4.0-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Remove implicitly satisfied build dependency on binutils. + + Make g++ substitutable in source/Makefile. + + -- Helmut Grohne <hel...@subdivi.de> Mon, 28 Aug 2017 19:08:03 +0200 + ebumeter (0.4.0-3) unstable; urgency=medium * Sign tags. diff --minimal -Nru ebumeter-0.4.0/debian/control ebumeter-0.4.0/debian/control --- ebumeter-0.4.0/debian/control 2016-12-22 00:04:41.000000000 +0100 +++ ebumeter-0.4.0/debian/control 2017-08-28 19:08:01.000000000 +0200 @@ -5,7 +5,6 @@ Uploaders: JaromÃr MikeÅ¡ <mira.mi...@seznam.cz> Build-Depends: - binutils, debhelper (>= 10), libclthreads-dev (>= 2.4.0), libclxclient-dev (>= 3.9.0), diff --minimal -Nru ebumeter-0.4.0/debian/patches/01-makefile.patch ebumeter-0.4.0/debian/patches/01-makefile.patch --- ebumeter-0.4.0/debian/patches/01-makefile.patch 2016-06-14 19:21:15.000000000 +0200 +++ ebumeter-0.4.0/debian/patches/01-makefile.patch 2017-08-28 19:08:03.000000000 +0200 @@ -1,13 +1,14 @@ Description: Set prefix properly and fix install commands. Removed -march=native optimalization Set -O3 optimalization + Make g++ substitutable Author: JaromÃr MikeÅ¡ <mira.mi...@seznam.cz> Forwarded: no Index: ebumeter/source/Makefile =================================================================== --- ebumeter.orig/source/Makefile +++ ebumeter/source/Makefile @@ -18,16 +18,15 @@ # # -------------------------------------------------------------------------- @@ -28,7 +29,16 @@ LDFLAGS += -L$(PREFIX)/$(LIBDIR) -@@ -46,7 +45,7 @@ EBUMETER_O = ebumeter.o jclient.o mainwi +@@ -37,7 +36,7 @@ + EBUR128_O = ebur128.o ebu_r128_proc.o peak_proc.o audiofile.o dither.o + ebur128: LDLIBS += -lsndfile -lzita-resampler + ebur128: $(EBUR128_O) +- g++ $(LDFLAGS) -o $@ $(EBUR128_O) $(LDLIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(EBUR128_O) $(LDLIBS) + $(EBUR128_O): + -include $(EBUR128_O:%.o=%.d) + +@@ -46,10 +45,10 @@ png2img.o button.o guiclass.o ebumeter: CPPFLAGS += -I/usr/include/freetype2 ebumeter: CPPFLAGS += -DPREFIX=\"$(PREFIX)\" -DSHARED=\"$(SHARED)\" @@ -36,4 +46,8 @@ +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) +- g++ $(LDFLAGS) -o $@ $(EBUMETER_O) $(LDLIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(EBUMETER_O) $(LDLIBS) + $(EBUMETER_O): + -include $(EBUMETER_O:%.o=%.d) +
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers