Ensure libprojectM is linked on projectM extension. Still crashes tho with 2.1 more investigation needed. Force due to unsynced cvs.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 26 insertions, 21 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index e1d661d9997f..c1656d5dad6c 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.190 2013/07/05 17:19:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.191 2013/07/06 11:25:27 scarabeus Exp $
+
+  06 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/xbmc-12.0-system-projectm.patch, files/xbmc-13.0-system-projectm.patch:
+  Ensure libprojectM is linked on projectM extension. Still crashes tho with 2.1
+  more investigation needed. Force due to unsynced cvs.
 
   05 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/xbmc-11.0-libav-r1.patch, -xbmc-11.0-r1.ebuild, -xbmc-12.0.ebuild,
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index bf1d60e2cf20..e27796280a00 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -9,8 +9,8 @@ AUX xbmc-11.0-nfs-limits.patch 727 SHA256 0161fe96fc164517ba83dab4e48fb7863aebfe
 AUX xbmc-11.0-no-arm-flags.patch 542 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84 SHA512 7d40be4bdef2a2b1e53f8b96c489a87ec67975ae486fb44e619d66c1b5333ad33f896f64cca4e1c8050c3d92cd6537a9ca776e743c88fc2c8cabea1eae62b4b5 WHIRLPOOL 7c6666198b7d987028925e0f578d71796f6541995aa87964de3275f6a087610ef69d630ac349500a7c534de213b8fbff4cca6c25c3d0e6f1b1d8cd89f27d3d9d
 AUX xbmc-11.0-no-exec-stack.patch 807 SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78 SHA512 d0d4c2d4bb257c722ec40470fb6c8da59033009152598e69133b6184b25da36debf42f86859389c878a072603f3d583e28a52519e8dca47d9bdf7edd5f9e44c5 WHIRLPOOL d18dd387fe55b18be78fdad08b0a4319c2a5ccd161f1dfc0d5ab8015d88c5842780415c903a098a4683524658fc31c07e285e61fcff04ad6e4777c77e5691f38
 AUX xbmc-11.0-nomythtv.patch 6190 SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e SHA512 4a9ff4b4f5cb56c92932f05b5b812bee0fdce37ed9f568a6e0dc0cd62335e2131361a63d8026b64f9c7078fa9c4ef0e439b52234c722b1b854aeeed1cc2764c7 WHIRLPOOL ce457b509c6fd222ae6002420db7cc438e1352114f38790b623f04e6834eb5508d4609a1bf71628bfafde3bcef830e84b42448619c19227d5729d6d8a824a13c
-AUX xbmc-12.0-system-projectm.patch 3951 SHA256 4750781ecb5be94e3d23375e4bfb46a84d240083c70e03da034c328ec2cfc185 SHA512 a8ad1207f7f9f591af9bc2034ac56793c6a5b33406542adaef65fb5a1b89c233990c6e9f740a966a67c16bd389454c03c828ce9f97f8a07e23aac67d902775a7 WHIRLPOOL 21489d98ed7aad3519533142a89076697acf06fc565f2438e6a32b244b4b1908b9a9737b2cfa4f5dcf36369bbbe30af63b98acb99ae9e7460b69fbf6df18df1b
-AUX xbmc-13.0-system-projectm.patch 3951 SHA256 f27c7b0219f7054ba9489f78786c656c650a5dbec2c997915807f99b369c3d17 SHA512 f43e6f1b1b1fa39883097436e23c59e7afc2b3a14d87102bdaec2bae23fda100b5d4de9017596c4dd0dd257adff57c726df062cd40bf9d06bb313d251664839d WHIRLPOOL eab75bcd5fc0d6d56bfe0d5ff50cd55d000f0a63b143cbc457bcd8e940378ac28a1130bfe0db8a153dd9ca7486cafafed4b2fc2c7e6c1dbf0908e0336864d597
+AUX xbmc-12.0-system-projectm.patch 3991 SHA256 b94622aa90df0c81bd9ab88240d02e3df54a7ac81454968969c1855959fb6394 SHA512 d2174e6fb042952a34a0579b203e294f1616ea99e6be0c046bbe90f80df5c3bbbca389d9613ede82acb92c568397a43defed56c5578eb9095634a2afa9fd39a8 WHIRLPOOL 49befcb5a924f8f5db5d62a201c97901f77fd1cf501d7558b084f508f3b06a3fdc11427a49f60664cef699670e75b6eb8d5dbf155abcf0838ad4807ba038c8e8
+AUX xbmc-13.0-system-projectm.patch 3991 SHA256 9d80cc70c09c607848384e14e0ab20faced26eba6968493727c598045fce6e19 SHA512 f3639df669cd021d28bbf9ea55dbfcc304534d160afa78595263512982ce2fc8ac5168c57a9c3bd11cb731adcf34e5f63ed1c91824dcd98972fb71c3bd2ddbce WHIRLPOOL ced8f1f481a08f27d617c352c857884a1e45a709dd35d782bde961b8db337d06bc0962df9f0350403e4470ddccc64c4e9fc330dd46e10db785ba590c3097cda4
 AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
@@ -23,22 +23,22 @@ EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae
 EBUILD xbmc-12.1-r1.ebuild 7075 SHA256 34a0c48fca3eadf20e15fc8b83495c9b3c4ee3672125cf00cf2ec721e1d625b5 SHA512 4b5a51e09e97aac67985588d2fa44891f3d409bff554ce9e80c9083a2fbe1b564a8652fedd4c8553c427894e58e4b30bac33236b3d396cf49eb290ffcb26f627 WHIRLPOOL 6cef003efd1e1cecd1ffc6366c0f123ba5c8fb58b8f8f738678fbbc3fcfb7b76be22a6ef9e0289afb8d900f84770cf4d588147b3fda05423f15fc9f0e6ac226f
 EBUILD xbmc-12.2-r1.ebuild 7117 SHA256 2a38a7327a9b8fd2e04e363e38081cb6b4e7a82401d327d59d9c99797e5d44e3 SHA512 d4b2e0acbf15e396f3c2e7d297e02cb8baa314c1b01bc979b75ea9c90b463e59103103f753c6ee9c389308c5e92528ae5c88a2bb5c0d1396f64dc5337b0f61e8 WHIRLPOOL d5613b1eca2ede31b019d3a689c516dcc8055b90874185a5847603dc6379eef1d158e54ec1e3f08f89c5e59ee46ceb0ccd6d6155c597227b67080204414eb811
 EBUILD xbmc-9999.ebuild 8326 SHA256 714105239e8629d5a77ac52959e4a73173c170434ad3c439a3e7e9fc10a872aa SHA512 1343bc4507b1430ff03adce3fddaed1ed6716d6c61b9d674a36b6b62c08581c54a9a7724e18d0e5e18594462ca39fecbdb66da144f60460324688b890246ffdf WHIRLPOOL 1475c72a9eddd03865d4c0b0532ea1f8c628f77f74e08721060dfccd57d3bf17dccbcb970b41cfbfeb91cd8468c1b35bf9b4e655b7774d46b954ffc935888fb0
-MISC ChangeLog 31282 SHA256 5312e8f0ce78168d719b4d1edcb9ea7801bd4e2182fee39838fd26b0203d308e SHA512 34d1316c3e11e47df8d70854af5f1966648633843a0ad1bbdb8323a82862774386c005496ee6c09d748cf258593116ed37637e611c39802a45be54defc996398 WHIRLPOOL ce9c7050158013742458c3065d06798ce3b4a4fc54b4546d05b7de2061fd21dc84a0ae1baae10a4a6b3bb9bfc34ff77ad889028ced3bc2c92a528a941aa936ff
+MISC ChangeLog 31555 SHA256 73a0b8ccbee675f6b9f4fd43188d215fa92e1a23918417664dc9e3c6fd6be8df SHA512 bff9c2b85a01740b613ccf029a8d79971ce381070b53408146c4eeada05c0c7ddca5e79fe92c924a39573c35b70ca5f0a5096d146a03961f62ba56d2b39ca1a9 WHIRLPOOL 4df2e5ce840ca6a4d784da36c4a64f9747ae6dfae041dfa4fe3aeaa524a9dbd7f4ec387a1e324c67317d30144430e423b9bdb7c6377ebaa757561b7d6be3ce97
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR1wAnAAoJEOSiRoyO7jvoET0P/2t9GzUV9Uaz0PY7HeiAYeOM
-yu2xSx2pdZD9nKJRTFJUXEDWc/rGs2FSuzBEFrOJV2nYzE11EekJy49d6F7/mFe8
-5sX+njluhdJ8I6fdRfwLEioUV/1JkCvbrWRZqVSTxmDvvAS6Rvu3r3BVju39/gTl
-pNBv1SwzQd23hHKuEVO7vuLGRr6/nS6bIRtiBp3oLh+vh819Nrm39wTCfvExwjqH
-u5kTOj5/4lXf1ppkwyRFwH8zXmWq++chGctvQIsoHnmRyFxERdSVnmfbOdrgOG/s
-y5x5ON+DhrjwNcaqVvM9/wGipvpBs4XSYIyQ4SSvlaw+CQOl0rS/SeF3IFKPG4Me
-PHBlp9b48X2bLDT61lc4Xx9BqrB620XYZkSIETxn/cuqoWc6+i4VtSdy9/tJnm2L
-HY+mHigS0ES2NEm+rz+D9B+sSbWR0Y7JlSzb+CZ16Ki2QMLle2GMA6pwfn45IBM+
-abVeqYE83GCCaoaQBRPDtI6cChI7U+WOQSheiVnpNFf9FDvSba/UKpmARjtU9UP9
-WxcKqG+UTaaNrO+DWWPOJBzLSrfiDSVW1w62Ncl+egndSOeSJnIQr//j03i0LBVZ
-g8hvECT9X6Xn9N4MEZP+T0xM/pz1JCNIau5WM95B0bJ+AvUKtAWn03NDrfHCBhnr
-LcDdVvQlV+zFOidKDXri
-=NAqu
+iQIcBAEBCAAGBQJR1/6qAAoJEOSiRoyO7jvoIFYP/06dItlPykYhhV+6uKTN3rGk
+McWTZdtUNJVcpJVCcT04ykEJMkJTsJ9pfusw1z3a+Djt/3GnZUWbWgq+odmheFa7
+VWSE4J3yIipEWjO/xOQGNtdUQeLfRYndlf8ZIzgvPXxVhDj10gMeVrj/TGQk2XDW
+U3+YysFK9ES5rxGyF9X6yPzYAxXYfAYcMQoibcLROletGYS6eqLfV69vAmh1KNpb
+jpqUuhUntgvj/ShEPp3MbBMy/LjC4fjt9J+Ysvceoj0KKDtMkNGdqR5uz6JMP2X/
+oL8NT97hrUhPlvhjAnt02m/56Qv1IATa4XjFma+73npXfxy5ua5XTVCpMSwetS09
+IWtwEt/8ffIRBS14n4s391DQu4rRoLOaBOb5zxgwOzz9/bMpxMRVW1b6mRTzPdLu
+moGObDF+28711nzJQ3M5BK7u0nvFGuBh07KKwgVHuwJORUKGcuvhPsP+pr7jWE7a
+ndueJDOvXJs72Qioz2Fyu1WSeVOmXebm1ILKkGgNeIjhEUFqQ1XVyZ2IcCWcbs0C
+BFOX5HV7gBDJntet7eNF29ehfPrUl8/wp+6ZJAQ0IuI7mjCGdgpnTUnGi4SJvWYR
++lAkoZpLuKY19joQUBl6AWKFul9pk990tGO1DEc/VbVfL5JxeuAhW932J+qZcp9J
+I+IGxqMtFnA3r9CSe56a
+=zIGk
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
index 959071c2ae7f..0a42fcad9891 100644
--- a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
+++ b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
@@ -47,7 +47,7 @@ index 78104ad..296eb4d 100644
 +      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
 +    fi
 +    if test "$use_projectm" != "no"; then
-+      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS"
++      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS";AC_SUBST(PROJECTM_LIBS)
 +    fi
 +    DISABLE_INTERNAL_PROJECTM=1
 +  else
@@ -93,7 +93,7 @@ index 249338c..2c16306 100644
 -$(SLIB): $(OBJS) libprojectM/libprojectM.so
 -	$(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
 +$(SLIB): $(OBJS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -o $(SLIB)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o @PROJECTM_LIBS@ -o $(SLIB)
  	$(MAKE) $(PRESETS)
 -
 -libprojectM/libprojectM.so: 
diff --git a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
index ac7c2c180f5c..a404bbe7bfd1 100644
--- a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
+++ b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
@@ -46,7 +46,7 @@ index db1d012..3e11588 100644
 +      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
 +    fi
 +    if test "$use_projectm" != "no"; then
-+      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS"
++      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS";AC_SUBST(PROJECTM_LIBS)
 +    fi
 +    DISABLE_INTERNAL_PROJECTM=1
 +  else
@@ -92,7 +92,7 @@ index 249338c..2c16306 100644
 -$(SLIB): $(OBJS) libprojectM/libprojectM.so
 -	$(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
 +$(SLIB): $(OBJS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -o $(SLIB)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o @PROJECTM_LIBS@ -o $(SLIB)
  	$(MAKE) $(PRESETS)
 -
 -libprojectM/libprojectM.so: