diff options
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-tv/xbmc/Manifest | 51 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-11.0-nomythtv.patch | 206 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-9999-nomythtv.patch | 221 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-11.0.ebuild | 4 |
5 files changed, 286 insertions, 203 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 1a97c003dad6..c9a1c62ed181 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.141 2012/07/02 22:13:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.142 2012/07/15 23:10:06 vapier Exp $ + + 15 Jul 2012; Mike Frysinger <vapier@gentoo.org> + +files/xbmc-11.0-nomythtv.patch, files/xbmc-9999-nomythtv.patch, + xbmc-11.0.ebuild: + Update mythtv patch to latest git #426376 by BT. 02 Jul 2012; Mike Frysinger <vapier@gentoo.org> files/xbmc-9999-no-arm-flags.patch: diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index f5cdacabb643..be43fa1c0945 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -1,32 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 RMD160 58baba2480df84e9cc5e768c3bc95f03077cc78f SHA1 255abd76ebf718f23b621e0c119b494af5a9f328 SHA256 84e2a842c81c1bc6a346c946301f38e47862051f4e3f56ffe468852542ba9b90 -AUX xbmc-11.0-ffmpeg.patch 1566 RMD160 f6b966309a67a1ab4fc6917a9310c15921ced5a4 SHA1 0a34899915ce61a28bfe869be75625cd1344da77 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f -AUX xbmc-11.0-libav.patch 3636 RMD160 2324951f7f04b22b7afd6b2e12b15ddba38a8cea SHA1 7ba00ad27670691aec13436bba6a77a488dd88af SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d -AUX xbmc-11.0-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84 -AUX xbmc-11.0-no-exec-stack.patch 807 RMD160 c42590cf3dd2fb3407e6dd518ba706ea8919d586 SHA1 c50207ff50cb1cedc97a7de1484a98fdebf51c5e SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78 -AUX xbmc-9999-no-arm-flags.patch 457 RMD160 ab47f717071c13cee29f815342d869d2cfdd14d9 SHA1 16e6d79a4fb08ab2ca0c30abc6fa01972bde5fe0 SHA256 db13f604ac5901e84dd96b65e9a1318956b60d73c7b5918e0040eb14321aab92 -AUX xbmc-9999-nomythtv.patch 6190 RMD160 829dff4b58098ee0935aed6fcda345e06abdb7b3 SHA1 d34afef9342b1d5781729433795cb23240fa5d6b SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e -DIST xbmc-11.0.tar.gz 63012044 RMD160 23cf4d7fa11d2996cc45c44ba5ca0022ff2acc1d SHA1 d836a0a1e8ed239a339ec7e0c19f893e29df741d SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 -EBUILD xbmc-11.0.ebuild 6264 RMD160 26ab681ea8a8ac1aefe4101b69dcf5da72d40d0b SHA1 3c5b43fe460ea717bfbb945b10cdaf959371989a SHA256 61e105ec501d39999a5194bba7c3b5dfdcf988a1fe31499c947bdf9a37136705 -EBUILD xbmc-9999.ebuild 5935 RMD160 5a096624f39abe8b3590bbd11c43c4f07a4cf0f1 SHA1 e87ded188a23123a17c976509cd008ab88517361 SHA256 b8b1b1f426669a0366dc0e4c285d14c021fd103bd6a4b0a35762711645f4cdfb -MISC ChangeLog 22629 RMD160 a450d5d4f9cd8f9f95c0337a3eace754d0c5154b SHA1 9b8eba1b65e12c22357ce7b93a6bd9abc9eabe8e SHA256 81b7b918493dc2be0930451531ebe941e0a0f73706650c51abb277cb546ec96e -MISC metadata.xml 1004 RMD160 f75e76041c2cbb1356ba9cb93b73cdbf48930632 SHA1 1ffacab45603382e48ef148c0aeb703a2303ab2c SHA256 e0fe06415e25d223ea299f1eecf4de6a8e8609d5ec038cc295f61002cd7d7a5e +AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 SHA256 84e2a842c81c1bc6a346c946301f38e47862051f4e3f56ffe468852542ba9b90 SHA512 c7bf34086e27c8789177665a862464018082404f3947a2b9f799a34cae15a01760bc67a148de6da20036c9e17ca047fbd32ed4237980af16605ee2d306c9f9a4 WHIRLPOOL 67cfa7538f59fc1a3cb664218de64b8518a66a97fdc4cd42f43f4882240f665f5be4e448df01df623b538899320f86b7f2d94989fbdb8667289fc8ebdb7f67c7 +AUX xbmc-11.0-ffmpeg.patch 1566 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f SHA512 c7ccba50e6f8fa8dd714ddf0cf1348c7311aefa9d9e971b0287757f75b51d8640d7e404940e12f7b53dbca3ce0bdc81c5b2913d6a73e2edd1ca7351b0a986fdb WHIRLPOOL 088d39196324112d2b133df19489427ca6e84fe7eaf410d9be5603601562019dd78427c4ff438814928c1e3db4c22d742824b6458ef15b79a46ea2c8b79f749d +AUX xbmc-11.0-libav.patch 3636 SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d SHA512 cb71c6601df413136eb80c61345d6123ed4c7c5b3c99346f32986cf177afe966ab56cee13b4aa8a91ed37150c73c6f2c891e7f7ba7c34935483e47b7fda525d4 WHIRLPOOL 3487e0d19c1fffba396b406e95f1a9ab85d2ae33c6ca3f88ab3e35ac170e670d0611529ede7a6568f96df73f2dd4b311f3ef5acfde75384166d2b9da0b17473a +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-9999-no-arm-flags.patch 457 SHA256 db13f604ac5901e84dd96b65e9a1318956b60d73c7b5918e0040eb14321aab92 SHA512 4aa8d5e82d22a8de6fa42be3fdeba71da1dee2722f8ae95b38e7b0c908dfea419db251254113fade0dcb9bd36a18b408d1ee2fd2de9fd339b4694da837ce3add WHIRLPOOL ac87f031a875a37c1a700607659060937a97df740f693a76cb55c28097adbf421622b7f4689ad2ac9ac4798d3e4a785da102cbd17bcfbdcf90a1f5c5b4afb00f +AUX xbmc-9999-nomythtv.patch 1884 SHA256 2f6731ab55743be4ccf014e9a2aa8f921684c2c32a759557d9a699d37c246f23 SHA512 8171f7765ccb64ca623237b72037f10893a095d16cf6edc16ab14dee1d21e2ac10b25b9a45dd79fb6e0445983b6d3d4fc0d4bacdf731181c32e785450852a64d WHIRLPOOL 49da6b51b90727b457212a0701d4c88a7d92ff702620c30e968b56a836e2af5f9e06c64ae804452d1756e5af989e33711e625c097cf49071d709657da3dee4e9 +DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 +EBUILD xbmc-11.0.ebuild 6264 SHA256 09fdd157fd65f206910b8e2b18536c77d5a738f4d9e78d81a4b965ed5ddb47b2 SHA512 f9c701fa4c17d80ddb5bc20a9b092d789cb0f3640cf6627412189f20b642d57b3ac516ea17286271c1f44d44c072b418e110b43bc715076bc9fe8bc4a933e964 WHIRLPOOL 3f23073b0a3281235e106fbd39a5322e4ac198290f556cf3ea72f498f396ca2d0b0a1f9d8230211b2ca9217740417c5b35b2428bd72ac63bec432b42141f6be9 +EBUILD xbmc-9999.ebuild 5935 SHA256 b8b1b1f426669a0366dc0e4c285d14c021fd103bd6a4b0a35762711645f4cdfb SHA512 a85b4577f437479c78a9aa7709910d169ad5d578dab75d9862be83d282a90ad6d1c867e135c2872207d08b65ce8b697ce9e313eb516ab99b0ba75768ba353d92 WHIRLPOOL 4f0da0baa58288694ac1c9b2e0de12ff7ed78f3dbf5f4606135676ce697e9f9fc7ebb8d473975fddc5b9207ce5961a374b9b6d2cfd9b2afbd2fde1ad27c77838 +MISC ChangeLog 22818 SHA256 6c181bc1a48f97d81a958bc753da7a9a81685605bc677abf9a3168ab954402f4 SHA512 dbcc7995373d612294cfbc8210f498bd8d92b834310036f654b9af3149a70638b0efaa108b010ab2015fa9a4783165293c569e412a7a75c060e36a2f1eff3242 WHIRLPOOL 4d5480639a2c25d7366051d1fdc0df09b7cdc115ef2bdbd27cd9db041aa57d06b0d6d9b56304a57ab541116bea8ab47b03598ffa9790e748363fe280bdff48e2 +MISC metadata.xml 1004 SHA256 e0fe06415e25d223ea299f1eecf4de6a8e8609d5ec038cc295f61002cd7d7a5e SHA512 f13daa4939dda43a19384a0295171430cdcff2dab90882a2d98c053c45da53732453108edbcdfa93f5a1af061acaa2b5bc973909aafb8359606951e8e70d21dc WHIRLPOOL b307c432b5e1d46e7462d25bd9d4b5ba705fe4c4fbd71701d7a7591daf21a1a152df44fb3bce9cc51703f28cb1a37105630bc9a070d5dd3cb7772585a0c6c517 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJP8h0qAAoJELEHsLL7fEFWMH8P/R2JBNgpuL+3R34megvwhfeg -jYo/WOuAdtCqPfCHyHwGrwhRrGquFjYMMGRijRS5jfV0mJ4hDP/Vu0+euq+9rGKT -HBU7sINDV1mRBxP517U1m1gIzisaLBg2L1o++gFl2EiqllOEH5wb71Qyyh6yDAst -p0b6EKg1ZvggHM81MlDClgMWo9qmjo8diGBU1P22shRwFfSzA3sJEVO7txvf1syg -fjJuzM1OC0GuFhovgYq97HDtdQxj5EqkcPu+1M4VY58/I6wa+6q+8MopAQ4hWWYP -emc3AIwU5pAcxRysMuQjIc2dqbByXR1PI2FKHQ90MeWYRSwEvRV0D4sV5qzdwcfh -0bmv36w9N929RhCBFT02gj4wnFxjuYdhplFbtzYItNPYSWhIupnXPSyk2qMgHpo/ -E/pIebxBVQQQ4nzFp67pSslA18uOjR81HpUc0ZbOh2rhxFx8ofhnAORhF9N+w+Ov -E5On61BS1rdp59hd0aHqt1xnLaRqCClKKJP8/UyG2Ga9Rp/kfBVRm2CQg8rEidGf -DiWwN7VB9JPhopctY541VnFisH3x7/IYZykw95/iz6VBSymwATdwRFq+OlRdJKXb -wuF5lI1TZ5zaCP6TgoANHfci+QXhBlRuw6jD77WA3Gtuq8PlzTdhU01RW/VUfcSc -qpNFjrSpaMDApz9/Vt1c -=4+HB +iQIcBAEBAgAGBQJQA03UAAoJELEHsLL7fEFWHnAQAMD7hsmoY6Tvlzj9rA7cbD8+ +c3uKoe7NpCPxId4LUvrGk5gofDyRoBv90osJELlCRx4Hft/eTj5HDtNkXwC5fCP+ +zQPDlirK71FRNMmfFHJ3bXrQyYFH77UTKNJMNsyBqqpC8QIs09TXrs7gFszkmy/0 +hcUdwIvMYjsLA8Pg6IJSERCklzIWsouMZINNO0daUukjPMbdjcswewsLwQzYA0k+ +3BDw3hQ6MLdEo+bNQLdsgTIMSsb4P+quegIjbcQ1dG2OVt7TEj/phxxWjHOG293d +6ffuNeyqB6yiEX9aM6B5IhuuDyxaVkf0ecFO3y/QXGIHqB2cHP7ajhdDONyQUo2H +qk7/NP3r7BLdA5iv18lKIZHYuNjlhl8VyJAoSBnW3ar3GS3L1DoXYn2/9+9hyKDp +/yRQYANT+Jux+MeTM5nQAX7tGl/jafWgK5t+C6KSjkrwMdDdSM/V9SVzD8QrD0YS +3QHaWs5sLDsGv9j//BC5hJwdRRHXhniviOwPdqrbo4a18cpkOSmVOihjC2CmXDtK +UHBO9aiEA8rI79h3N+xn1lLeWztI1+/YSFdVXYc0h22wzxmCpyfUd8zzHFV/7fWQ +3/5ShFL2iE+1VKIBislsZSNsMhkv9RdHTAqA6hkk3THIYrV2dVsmrf1yoI7z+UNd +wMPMeksXnPLuJHLTXXce +=/Xs1 -----END PGP SIGNATURE----- diff --git a/media-tv/xbmc/files/xbmc-11.0-nomythtv.patch b/media-tv/xbmc/files/xbmc-11.0-nomythtv.patch new file mode 100644 index 000000000000..09286dba0a87 --- /dev/null +++ b/media-tv/xbmc/files/xbmc-11.0-nomythtv.patch @@ -0,0 +1,206 @@ +http://trac.xbmc.org/ticket/11775 + +make mysql/mythtv support optional + +--- a/Makefile.in ++++ b/Makefile.in +@@ -127,13 +127,17 @@ endif + LIB_DIRS=\ + lib/cximage-6.0 \ + lib/libexif \ +- lib/cmyth \ + lib/libhdhomerun \ + lib/libid3tag \ + lib/libapetag \ + lib/cpluff \ + lib/xbmc-dll-symbols + ++ifeq (@BUILD_MYTHTV@,1) ++LIB_DIRS+=\ ++ lib/cmyth ++endif ++ + SS_DIRS= + ifeq (@USE_OPENGL@,1) + SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc +@@ -418,7 +422,10 @@ imagelib: dllloader + $(MAKE) -C lib/cximage-6.0 + + codecs: papcodecs dvdpcodecs +-libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so ++libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so ++ifeq (@BUILD_MYTHTV@,1) ++libs: cmyth ++endif + externals: codecs libs visualizations screensavers + + xcode_depends: \ +--- a/configure.in ++++ b/configure.in +@@ -68,6 +68,9 @@ goom_enabled="== GOOM enabled. ==" + goom_disabled="== GOOM disabled. ==" + pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" + pulse_disabled="== PulseAudio support manually disabled. ==" ++mysql_not_found="Could not find libmysqlclient. MySQL (and MythTV) support disabled. ==" ++mysql_disabled="== MySQL support disabled. ==" ++mythtv_disabled="== MythTV support disabled. ==" + dvdcss_enabled="== DVDCSS support enabled. ==" + dvdcss_disabled="== DVDCSS support disabled. ==" + hal_not_found="== Could not find hal. HAL support disabled. ==" +@@ -238,6 +241,18 @@ AC_ARG_ENABLE([ffmpeg_libvorbis], + [use_ffmpeg_libvorbis=$enableval], + [use_ffmpeg_libvorbis=no]) + ++AC_ARG_ENABLE([mysql], ++ [AS_HELP_STRING([--enable-mysql], ++ [enable MySQL support (default is auto)])], ++ [use_mysql=$enableval], ++ [use_mysql=auto]) ++ ++AC_ARG_ENABLE([mythtv], ++ [AS_HELP_STRING([--enable-mythtv], ++ [enable MythTV support (default is auto)])], ++ [use_mythtv=$enableval], ++ [use_mythtv=auto]) ++ + AC_ARG_ENABLE([dvdcss], + [AS_HELP_STRING([--enable-dvdcss], + [enable DVDCSS support (default is yes)])], +@@ -563,14 +578,31 @@ else + fi + + # platform common libraries +-AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no") +-if test $MYSQL_CONFIG = "yes"; then +- INCLUDES="$INCLUDES `mysql_config --include`" +- MYSQL_LIBS=`mysql_config --libs` +- LIBS="$LIBS $MYSQL_LIBS" +- AC_SUBST(MYSQL_LIBS) +-else +- AC_MSG_ERROR($missing_program) ++have_mysql=no ++if test "$use_mysql" != "no"; then ++ AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no") ++ if test $MYSQL_CONFIG = "yes"; then ++ INCLUDES="$INCLUDES `mysql_config --include`" ++ MYSQL_LIBS=`mysql_config --libs` ++ LIBS="$LIBS $MYSQL_LIBS" ++ AC_SUBST(MYSQL_LIBS) ++ AC_CHECK_LIB([mysqlclient], [main], have_mysql=yes) ++ fi ++fi ++if test "$have_mysql" = "yes"; then ++ BUILD_MYTHTV=1 ++ AC_DEFINE([BUILD_MYSQL], [1], [Define to 1 to build MySQL.]) ++ if test "$use_mysql" != "no"; then ++ AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]) ++ fi ++elif test "$use_mysql" = "yes" || test "$use_mythtv" = "yes"; then ++ AC_MSG_ERROR([$mysql_not_found]) ++else ++ BUILD_MYTHTV=0 ++ use_mysql=no ++ AC_MSG_NOTICE($mysql_disabled) ++ use_mythtv=no ++ AC_MSG_NOTICE($mythtv_disabled) + fi + AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library)) + AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library)) +@@ -594,7 +625,6 @@ AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) +-AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh])) + AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth])) +@@ -1319,6 +1349,18 @@ else + final_message="$final_message\n HAL Support:\tNo" + fi + ++if test "$use_mysql" = "yes"; then ++ final_message="$final_message\n MySQL:\tYes" ++else ++ final_message="$final_message\n MySQL:\tNo" ++fi ++ ++if test "$use_mythtv" = "yes"; then ++ final_message="$final_message\n MythTV:\tYes" ++else ++ final_message="$final_message\n MythTV:\tNo" ++fi ++ + # DVDCSS + if test "$use_dvdcss" = "yes"; then + AC_MSG_NOTICE($dvdcss_enabled) +@@ -1490,6 +1532,8 @@ AC_SUBST(USE_EXTERNAL_FFMPEG) + AC_SUBST(PYTHON_VERSION) + AC_SUBST(OUTPUT_FILES) + AC_SUBST(HAVE_XBMC_NONFREE) ++AC_SUBST(BUILD_MYSQL) ++AC_SUBST(BUILD_MYTHTV) + AC_SUBST(USE_ASAP_CODEC) + AC_SUBST(LIBCURL_BASENAME) + AC_SUBST(LIBFLAC_BASENAME) +--- a/xbmc/dbwrappers/Database.cpp ++++ b/xbmc/dbwrappers/Database.cpp +@@ -29,7 +29,9 @@ + #include "utils/AutoPtrHandle.h" + #include "utils/log.h" + #include "utils/URIUtils.h" ++#ifdef BUILD_MYSQL + #include "mysqldataset.h" ++#endif /* BUILD_MYSQL */ + #include "sqlitedataset.h" + + +@@ -266,6 +268,7 @@ + + m_sqlite = true; + ++#ifdef BUILD_MYSQL + if ( dbSettings.type.Equals("mysql") ) + { + // check we have all information before we cancel the fallback +@@ -276,7 +279,8 @@ + CLog::Log(LOGINFO, "Essential mysql database information is missing. Require at least host, user and pass defined."); + } + else ++#endif /* BUILD_MYSQL */ + { + dbSettings.type = "sqlite3"; + dbSettings.host = _P(g_settings.GetDatabaseFolder()); + dbSettings.name = GetBaseDBName(); +@@ -369,10 +373,12 @@ + { + m_pDB.reset( new SqliteDatabase() ) ; + } ++#ifdef BUILD_MYSQL + else if (dbSettings.type.Equals("mysql")) + { + m_pDB.reset( new MysqlDatabase() ) ; + } ++#endif /* BUILD_MYSQL */ + else + { + CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str()); +--- a/xbmc/dbwrappers/mysqldataset.cpp ++++ b/xbmc/dbwrappers/mysqldataset.cpp +@@ -23,9 +23,11 @@ + #include <string> + #include <set> + ++#include "system.h" // for GetLastError() ++#ifdef BUILD_MYSQL ++ + #include "mysqldataset.h" + #include "utils/log.h" +-#include "system.h" // for GetLastError() + #include "mysql/errmsg.h" + #ifdef _WIN32 + #pragma comment(lib, "mysqlclient.lib") +@@ -1562,3 +1564,4 @@ + + }//namespace + ++#endif /* BUILD_MYSQL */ diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch index 09286dba0a87..4e537a0434ff 100644 --- a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch +++ b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch @@ -1,206 +1,77 @@ http://trac.xbmc.org/ticket/11775 -make mysql/mythtv support optional +make mythtv support optional +diff --git a/Makefile.in b/Makefile.in +index 9ffae7e..17cc525 100755 --- a/Makefile.in +++ b/Makefile.in -@@ -127,13 +127,17 @@ endif - LIB_DIRS=\ - lib/cximage-6.0 \ - lib/libexif \ -- lib/cmyth \ - lib/libhdhomerun \ - lib/libid3tag \ - lib/libapetag \ +@@ -147,7 +147,7 @@ LIB_DIRS=\ lib/cpluff \ lib/xbmc-dll-symbols -+ifeq (@BUILD_MYTHTV@,1) -+LIB_DIRS+=\ -+ lib/cmyth -+endif -+ - SS_DIRS= - ifeq (@USE_OPENGL@,1) - SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc -@@ -418,7 +422,10 @@ imagelib: dllloader - $(MAKE) -C lib/cximage-6.0 +-ifeq (@USE_MYSQL@,1) ++ifeq (@USE_MYTHTV@,1) + LIB_DIRS += lib/cmyth + endif +@@ -322,7 +322,7 @@ imagelib: dllloader codecs: papcodecs dvdpcodecs --libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so -+libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so -+ifeq (@BUILD_MYTHTV@,1) -+libs: cmyth -+endif - externals: codecs libs visualizations screensavers - xcode_depends: \ + libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so +-ifeq (@USE_MYSQL@,1) ++ifeq (@USE_MYTHTV@,1) + libs += cmyth + endif + +diff --git a/configure.in b/configure.in +index d44825f..629d7b4 100755 --- a/configure.in +++ b/configure.in -@@ -68,6 +68,9 @@ goom_enabled="== GOOM enabled. ==" - goom_disabled="== GOOM disabled. ==" - pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" - pulse_disabled="== PulseAudio support manually disabled. ==" -+mysql_not_found="Could not find libmysqlclient. MySQL (and MythTV) support disabled. ==" -+mysql_disabled="== MySQL support disabled. ==" -+mythtv_disabled="== MythTV support disabled. ==" - dvdcss_enabled="== DVDCSS support enabled. ==" - dvdcss_disabled="== DVDCSS support disabled. ==" - hal_not_found="== Could not find hal. HAL support disabled. ==" -@@ -238,6 +241,18 @@ AC_ARG_ENABLE([ffmpeg_libvorbis], - [use_ffmpeg_libvorbis=$enableval], - [use_ffmpeg_libvorbis=no]) +@@ -387,6 +387,12 @@ AC_ARG_ENABLE([mysql], + [use_mysql=$enableval], + [use_mysql=yes]) -+AC_ARG_ENABLE([mysql], -+ [AS_HELP_STRING([--enable-mysql], -+ [enable MySQL support (default is auto)])], -+ [use_mysql=$enableval], -+ [use_mysql=auto]) -+ +AC_ARG_ENABLE([mythtv], -+ [AS_HELP_STRING([--enable-mythtv], -+ [enable MythTV support (default is auto)])], ++ [AS_HELP_STRING([--disable-mythtv], ++ [disable mythtv])], + [use_mythtv=$enableval], -+ [use_mythtv=auto]) ++ [use_mythtv=yes]) + - AC_ARG_ENABLE([dvdcss], - [AS_HELP_STRING([--enable-dvdcss], - [enable DVDCSS support (default is yes)])], -@@ -563,14 +578,31 @@ else - fi - - # platform common libraries --AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no") --if test $MYSQL_CONFIG = "yes"; then -- INCLUDES="$INCLUDES `mysql_config --include`" -- MYSQL_LIBS=`mysql_config --libs` -- LIBS="$LIBS $MYSQL_LIBS" -- AC_SUBST(MYSQL_LIBS) --else -- AC_MSG_ERROR($missing_program) -+have_mysql=no -+if test "$use_mysql" != "no"; then -+ AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no") -+ if test $MYSQL_CONFIG = "yes"; then -+ INCLUDES="$INCLUDES `mysql_config --include`" -+ MYSQL_LIBS=`mysql_config --libs` -+ LIBS="$LIBS $MYSQL_LIBS" -+ AC_SUBST(MYSQL_LIBS) -+ AC_CHECK_LIB([mysqlclient], [main], have_mysql=yes) -+ fi -+fi -+if test "$have_mysql" = "yes"; then -+ BUILD_MYTHTV=1 -+ AC_DEFINE([BUILD_MYSQL], [1], [Define to 1 to build MySQL.]) -+ if test "$use_mysql" != "no"; then -+ AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]) + AC_ARG_ENABLE([webserver], + [AS_HELP_STRING([--disable-webserver], + [disable webserver])], +@@ -748,6 +754,9 @@ if test "$use_mysql" = "yes"; then + else + AC_MSG_ERROR($missing_program) + fi ++ if test "$use_mythtv" = "yes"; then ++ AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"]) + fi -+elif test "$use_mysql" = "yes" || test "$use_mythtv" = "yes"; then -+ AC_MSG_ERROR([$mysql_not_found]) -+else -+ BUILD_MYTHTV=0 -+ use_mysql=no -+ AC_MSG_NOTICE($mysql_disabled) -+ use_mythtv=no -+ AC_MSG_NOTICE($mythtv_disabled) fi AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library)) AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library)) -@@ -594,7 +625,6 @@ AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) --AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh])) - AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth])) -@@ -1319,6 +1349,18 @@ else - final_message="$final_message\n HAL Support:\tNo" +@@ -1895,6 +1904,15 @@ else + final_message="$final_message\n MySQL:\tNo" + USE_MYSQL=0 fi - -+if test "$use_mysql" = "yes"; then -+ final_message="$final_message\n MySQL:\tYes" -+else -+ final_message="$final_message\n MySQL:\tNo" -+fi + +if test "$use_mythtv" = "yes"; then + final_message="$final_message\n MythTV:\tYes" ++ USE_MYTHTV=1 +else + final_message="$final_message\n MythTV:\tNo" ++ USE_MYTHTV=0 +fi + - # DVDCSS - if test "$use_dvdcss" = "yes"; then - AC_MSG_NOTICE($dvdcss_enabled) -@@ -1490,6 +1532,8 @@ AC_SUBST(USE_EXTERNAL_FFMPEG) - AC_SUBST(PYTHON_VERSION) - AC_SUBST(OUTPUT_FILES) - AC_SUBST(HAVE_XBMC_NONFREE) -+AC_SUBST(BUILD_MYSQL) -+AC_SUBST(BUILD_MYTHTV) - AC_SUBST(USE_ASAP_CODEC) - AC_SUBST(LIBCURL_BASENAME) - AC_SUBST(LIBFLAC_BASENAME) ---- a/xbmc/dbwrappers/Database.cpp -+++ b/xbmc/dbwrappers/Database.cpp -@@ -29,7 +29,9 @@ - #include "utils/AutoPtrHandle.h" - #include "utils/log.h" - #include "utils/URIUtils.h" -+#ifdef BUILD_MYSQL - #include "mysqldataset.h" -+#endif /* BUILD_MYSQL */ - #include "sqlitedataset.h" - - -@@ -266,6 +268,7 @@ - - m_sqlite = true; - -+#ifdef BUILD_MYSQL - if ( dbSettings.type.Equals("mysql") ) - { - // check we have all information before we cancel the fallback -@@ -276,7 +279,8 @@ - CLog::Log(LOGINFO, "Essential mysql database information is missing. Require at least host, user and pass defined."); - } - else -+#endif /* BUILD_MYSQL */ - { - dbSettings.type = "sqlite3"; - dbSettings.host = _P(g_settings.GetDatabaseFolder()); - dbSettings.name = GetBaseDBName(); -@@ -369,10 +373,12 @@ - { - m_pDB.reset( new SqliteDatabase() ) ; - } -+#ifdef BUILD_MYSQL - else if (dbSettings.type.Equals("mysql")) - { - m_pDB.reset( new MysqlDatabase() ) ; - } -+#endif /* BUILD_MYSQL */ - else - { - CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str()); ---- a/xbmc/dbwrappers/mysqldataset.cpp -+++ b/xbmc/dbwrappers/mysqldataset.cpp -@@ -23,9 +23,11 @@ - #include <string> - #include <set> - -+#include "system.h" // for GetLastError() -+#ifdef BUILD_MYSQL -+ - #include "mysqldataset.h" - #include "utils/log.h" --#include "system.h" // for GetLastError() - #include "mysql/errmsg.h" - #ifdef _WIN32 - #pragma comment(lib, "mysqlclient.lib") -@@ -1562,3 +1564,4 @@ + if test "$use_webserver" = "yes"; then + final_message="$final_message\n Webserver:\tYes" + USE_WEB_SERVER=1 +@@ -2123,6 +2141,7 @@ AC_SUBST(USE_LIBUDEV) + AC_SUBST(USE_LIBUSB) + AC_SUBST(USE_LIBCEC) + AC_SUBST(USE_MYSQL) ++AC_SUBST(USE_MYTHTV) + AC_SUBST(USE_WEB_SERVER) - }//namespace -+#endif /* BUILD_MYSQL */ diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild index 7d31cea74864..b06e297a484c 100644 --- a/media-tv/xbmc/xbmc-11.0.ebuild +++ b/media-tv/xbmc/xbmc-11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.12 2012/06/08 04:49:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.13 2012/07/15 23:10:05 vapier Exp $ EAPI="4" @@ -123,7 +123,7 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch + epatch "${FILESDIR}"/${PN}-11.0-nomythtv.patch epatch "${FILESDIR}"/${PN}-11.0-no-arm-flags.patch #400617 epatch "${FILESDIR}"/${PN}-11.0-no-exec-stack.patch epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215 |