svn commit: r425967 - in branches/2016Q4/multimedia/kodi: . files

[Carlos J. Puga Medina]

Author: cpm
Date: Sat Nov 12 16:58:53 2016
New Revision: 425967
URL: https://svnweb.freebsd.org/changeset/ports/425967

Log:
  MFH: r425964
  
  multimedia/kodi: Fix linking error on FreeBSD
  
  gmake[3]: Leaving directory '/usr/ports/multimedia/kodi/work/xbmc-f4dda26/xbmc/cores/dvdplayer/DVDInputStreams'
  CPP     xbmc/guilib/TextureManager.o
  CPP     xbmc/guilib/VisibleEffect.o
  CPP     xbmc/guilib/XBTF.o
  CPP     xbmc/guilib/XBTFReader.o
  CPP     xbmc/guilib/TextureGL.o
  CPP     xbmc/guilib/GUIFontTTFGL.o
  CPP     xbmc/guilib/GUITextureGL.o
  CPP     xbmc/guilib/MatrixGLES.o
  AR      xbmc/guilib/guilib.a
  gmake[3]: Leaving directory '/usr/ports/multimedia/kodi/work/xbmc-f4dda26/xbmc/guilib'
  LD      kodi.bin
  xbmc/guilib/guilib.a(DDSImage.o): In function `CDDSImage::Compress(unsigned int, unsigned int, unsigned int, unsigned char const*, double)':
  DDSImage.cpp:(.text+0x5b0): undefined reference to `squish::CompressImage(unsigned char const*, int, int, int, void*, int, float*)'
  DDSImage.cpp:(.text+0x5e2): undefined reference to `squish::ComputeMSE(unsigned char const*, int, int, int, unsigned char const*, int, double&, double&)'
  DDSImage.cpp:(.text+0x6ea): undefined reference to `squish::CompressImage(unsigned char const*, int, int, int, void*, int, float*)'
  DDSImage.cpp:(.text+0x718): undefined reference to `squish::ComputeMSE(unsigned char const*, int, int, int, unsigned char const*, int, double&, double&)'
  DDSImage.cpp:(.text+0x75f): undefined reference to `squish::CompressImage(unsigned char const*, int, int, int, void*, int, float*)'
  DDSImage.cpp:(.text+0x78d): undefined reference to `squish::ComputeMSE(unsigned char const*, int, int, int, unsigned char const*, int, double&, double&)'
  xbmc/guilib/guilib.a(DDSImage.o): In function `CDDSImage::Decompress(unsigned char*, unsigned int, unsigned int, unsigned int, unsigned char const*, unsigned int)':
  DDSImage.cpp:(.text+0x9a5): undefined reference to `squish::DecompressImage(unsigned char*, int, int, int, void const*, int)'
  c++: error: linker command failed with exit code 1 (use -v to see invocation)
  Makefile:486: recipe for target 'kodi.bin' failed
  gmake[2]: *** [kodi.bin] Error 1
  gmake[2]: Leaving directory '/usr/ports/multimedia/kodi/work/xbmc-f4dda26'
  ===> Compilation failed unexpectedly.
  Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to
  the maintainer.
  *** Error code 1
  
  Stop.
  make[1]: stopped in /usr/ports/multimedia/kodi
  *** Error code 1
  
  Stop.
  make: stopped in /usr/ports/multimedia/kodi
  
  PR:		204380
  Submitted by:	Tomasz Sowa <bugsfreebsd at ttmath.org>
  Reported by:	Andrew <andrew_terekhov at yahoo.com>
  Reviewed by:	feld, junovitch, koobs (mentors)
  Approved by:	Mickael Maillot (maintainer timeout, 9 months), feld, junovitch, koobs (mentors)
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2016Q4/multimedia/kodi/files/patch-Makefile.in
     - copied unchanged from r425964, head/multimedia/kodi/files/patch-Makefile.in
Modified:
  branches/2016Q4/multimedia/kodi/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/multimedia/kodi/Makefile
==============================================================================
--- branches/2016Q4/multimedia/kodi/Makefile	Sat Nov 12 16:28:08 2016	(r425966)
+++ branches/2016Q4/multimedia/kodi/Makefile	Sat Nov 12 16:58:53 2016	(r425967)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 DISTVERSION=	16.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot at gmail.com

Copied: branches/2016Q4/multimedia/kodi/files/patch-Makefile.in (from r425964, head/multimedia/kodi/files/patch-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/multimedia/kodi/files/patch-Makefile.in	Sat Nov 12 16:58:53 2016	(r425967, copy of r425964, head/multimedia/kodi/files/patch-Makefile.in)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2016-10-20 18:15:13 UTC
++++ Makefile.in
+@@ -434,7 +434,7 @@ endif
+ ifeq ($(findstring osx, at ARCH@), osx)
+ 	$(SILENT_LD) $(CXX) $(LDFLAGS) -o @APP_NAME_LC at .bin $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
+ else
+-	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC at .bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
++	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC at .bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic ./tools/depends/native/libsquish-native/squish-install/lib/libsquish.a
+ endif
+ 
+ @APP_NAME_LC at -xrandr: xbmc-xrandr.c