On Mon, Nov 10, 2014 at 12:21:01PM +0200, Peter Pentchev wrote: > package src:zaz > tags 768718 + confirmed patch > thanks > > On Sun, Nov 09, 2014 at 08:14:55AM +0100, Lucas Nussbaum wrote: > [snip] > > Usertags: qa-ftbfs-20141108 qa-ftbfs > > Justification: FTBFS in jessie on amd64 > [snip] > > > > > g++ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security > > > -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,defs -Wl,-as-needed > > > -Wl,--no-undefined -o zaz main.o audiobuffer.o mixer.o oggsample.o > > > scene.o settings.o wavesample.o streamingoggsample.o frame_events.o > > > ogvexport.o bezier.o textureloader.o player.o level.o ballpath.o game.o > > > editor.o mainmenu.o menu.o gameloop.o hiscores.o lineeditor.o tests.o > > > profile.o directorylister.o levelset.o splash.o -lSDL -lvorbisfile > > > -ltheoraenc -ltheoradec -logg -lftgl -lGL -lvorbisenc -lSDL_image > > > /usr/bin/ld: ogvexport.o: undefined reference to symbol > > > 'vorbis_bitrate_addblock' > > > //usr/lib/x86_64-linux-gnu/libvorbis.so.0: error adding symbols: DSO > > > missing from command line > > > collect2: error: ld returned 1 exit status > > Hi Miriam, > > Just as in #768741, what do you think about the attached small patch > that does the configure script's job by manually adding -lvorbis to > the zaz linker flags? Of course, the proper fix should be done upstream > in the configure script, but IMHO this minimal targeted fix should be > sufficient for the Jessie freeze. > > Once again, feel free to remove the changelog and control snippets and > commit it yourself, since zaz is your package. Of course, if you agree, > I could commit it to the pkg-games Subversion repo and put a package up > in the sponsoring queue. > > Again, Miriam, Lucas, thanks for all your work!
And wouldn't it have helped immensely if I'd also attached the patch... G'luck, Peter -- Peter Pentchev r...@ringlet.net r...@freebsd.org p.penc...@storpool.com PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
From 4c581caf934c3f3e6840b29ece4cd1db56e7b34f Mon Sep 17 00:00:00 2001 From: Peter Pentchev <openstack-...@storpool.com> Date: Mon, 10 Nov 2014 12:15:06 +0200 Subject: [PATCH] Add a minimal patch to link with libvorbis. A much better fix would be a configure script check for libvorbis, but I think that this should be suitable for the Jessie freeze. Closes: #768718 --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/patches/libvorbis.patch | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 debian/patches/libvorbis.patch diff --git a/debian/changelog b/debian/changelog index b535960..dadafd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zaz (1.0.0~dfsg1-3) UNRELEASED; urgency=medium + + * Team upload. + * Link with libvorbis, not just libvorbisenc. Closes: #768718 + + -- Peter Pentchev <r...@ringlet.net> Mon, 10 Nov 2014 12:04:13 +0200 + zaz (1.0.0~dfsg1-2) unstable; urgency=low [ Miriam Ruiz ] diff --git a/debian/control b/debian/control index 0c686df..a449d35 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: zaz Section: games Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> -Uploaders: Miriam Ruiz <mir...@debian.org> +Uploaders: Miriam Ruiz <mir...@debian.org>, Peter Pentchev <r...@ringlet.net> Build-Depends: autotools-dev, debhelper (>= 9), diff --git a/debian/patches/libvorbis.patch b/debian/patches/libvorbis.patch new file mode 100644 index 0000000..50707e5 --- /dev/null +++ b/debian/patches/libvorbis.patch @@ -0,0 +1,27 @@ +Description: Link with libvorbis, too. + This is fallout from the fact that other libraries in Debian, such as + libvorbisfile, no longer include their own dependencies in the pkg-config + output. Until now, zaz built just fine because -lvorbis was added by + other libraries; now it has to add it on its own. + . + This bug should really be fixed upstream by adding an explicit check for + libvorbis in configure.ac, something like + AC_CHECK_LIB([vorbis], [vorbis_bitrate_addblock]) + I do intend to do that in a future upload, but IMHO this minimal patch + ought to be suitable for the Jessie freeze. +Debian-Bug: https://bugs.debian.org/768718 +Author: Peter Pentchev <r...@ringlet.net> +Forwarded: not-yet +Last-Update: 2014-11-10 + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -273,7 +273,7 @@ + splash.cpp + + zaz_LDFLAGS = +-zaz_LDADD = $(ZAZ_LIBS) $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@ ++zaz_LDADD = $(ZAZ_LIBS) -lvorbis $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@ + all: all-am + + .SUFFIXES: diff --git a/debian/patches/series b/debian/patches/series index 376fa2e..7b09328 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ no_music.patch no_music_2.patch mismatched_delete.patch jumpy_keyboard.patch +libvorbis.patch -- 2.1.1
signature.asc
Description: Digital signature
