From 661f963634b179aa46dd8a964f081404ffa65a4d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 18 Mar 2010 15:11:23 +0000 Subject: [PATCH] backport libcdio patch from trunk, makes DVD playback working, close #303030, upstream reference #8026 Package-Manager: portage-2.2_rc64/cvs/Linux x86_64 --- media-tv/xbmc/ChangeLog | 10 +- media-tv/xbmc/Manifest | 5 +- ...use-cdio-system-headers-on-non-win32.patch | 129 ++++++++++++++++++ ...bmc-9.11-r2.ebuild => xbmc-9.11-r3.ebuild} | 7 +- 4 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch rename media-tv/xbmc/{xbmc-9.11-r2.ebuild => xbmc-9.11-r3.ebuild} (94%) diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index a69209f3ea39..4de4f655fb92 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.47 2010/03/18 14:31:25 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.48 2010/03/18 15:11:23 lxnay Exp $ + +*xbmc-9.11-r3 (18 Mar 2010) + + 18 Mar 2010; Fabio Erculiani -xbmc-9.11-r2.ebuild, + +xbmc-9.11-r3.ebuild, + +files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch: + backport libcdio patch from trunk, makes DVD playback working, close + #303030, upstream reference #8026 *xbmc-9.11-r2 (18 Mar 2010) diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index 6f9f02460bc2..a304283e54a9 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -1,8 +1,9 @@ AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8 +AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87 -EBUILD xbmc-9.11-r2.ebuild 5102 RMD160 7258abe13ed375003c383b966c58f09a36c8fcfc SHA1 d71360ceab99231c23c76cc7190dbdbe0fff6908 SHA256 b779fd5b323599072ecc44256460148e21aaf484b28af749e7430100edd6145e +EBUILD xbmc-9.11-r3.ebuild 5013 RMD160 89e1cc0bab891479bba86cbd50424407af248b7d SHA1 789bd162e1c9c7bb8010b600faa61168b78a8a55 SHA256 56b0d824544e4cf4889b8e0207cc3d8be249e1f2d3bf9ddfd2fd4c82b089cc52 EBUILD xbmc-9.11.ebuild 4890 RMD160 2a8dd1a37a0d97a5d568b84170f27551923a1212 SHA1 06d01a46a475c3c32cf5df0cdcb89e5d94d84962 SHA256 1d3f9e1fb0877d4e113a5437e8f6fbfa3c413db61dbfe82e0e6b663696879737 EBUILD xbmc-9999.ebuild 4712 RMD160 b3083d6aeb490196ed880122a0d63b92bd0fb06a SHA1 751e011b55170bd05f472a32022b5def9510a498 SHA256 bde1ee6af8b40a1ae19b222ad2e12ae98c48c7aa900c688a9b66298661733c18 -MISC ChangeLog 7472 RMD160 256de459e976ef8da2a590788dd5b9d62e5fcfff SHA1 8096243e883dc6f2c3a0063e02e8e2a7b5b16105 SHA256 986ff07051944519cf49757f5eab67bcdb6846cd9a93645c6bde98cac8bf3c0d +MISC ChangeLog 7768 RMD160 17ee3792d631302a049392ec9795647330802e93 SHA1 58238e506212f789cf528f3e194961e325183234 SHA256 c71efa85807df16be6958fd5f90070ee97a7f2c86181ed01956373e1f0a4b7b5 MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae diff --git a/media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch b/media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch new file mode 100644 index 000000000000..345d91159b43 --- /dev/null +++ b/media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch @@ -0,0 +1,129 @@ +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index 9097519..9b6418d 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -236,7 +236,11 @@ + #endif + + #ifdef HAS_DVD_DRIVE ++#ifdef _WIN32 + #include "lib/libcdio/logging.h" ++#else ++#include ++#endif + #endif + + #ifdef HAS_HAL +diff --git a/xbmc/FileSystem/Makefile b/xbmc/FileSystem/Makefile +index 782d57a..1e524ed 100644 +--- a/xbmc/FileSystem/Makefile ++++ b/xbmc/FileSystem/Makefile +@@ -1,5 +1,4 @@ + INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +-INCLUDES+=-I../lib/libcdio/libcdio/include + + CXXFLAGS+=-D__STDC_FORMAT_MACROS \ + +diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp +index 00e5fdd..21a0b67 100644 +--- a/xbmc/FileSystem/cdioSupport.cpp ++++ b/xbmc/FileSystem/cdioSupport.cpp +@@ -26,7 +26,7 @@ + #include "cdioSupport.h" + #include "utils/SingleLock.h" + #include "utils/log.h" +-#ifndef _LINUX ++#ifdef _WIN32 + #include "lib/libcdio/logging.h" + #include "lib/libcdio/util.h" + #include "lib/libcdio/mmc.h" +diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp +index 6e1633f..58fbc50 100644 +--- a/xbmc/FileSystem/iso9660.cpp ++++ b/xbmc/FileSystem/iso9660.cpp +@@ -44,7 +44,7 @@ ISO9660 + #include "utils/CharsetConverter.h" + + #include "DetectDVDType.h" // for MODE2_DATA_SIZE etc. +-#ifdef _LINUX ++#ifndef _WIN32 + #include + #else + #include "lib/libcdio/bytesex.h" // for from_723 & from_733 +diff --git a/xbmc/Makefile b/xbmc/Makefile +index abfbdcb..f55381a 100644 +--- a/xbmc/Makefile ++++ b/xbmc/Makefile +@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \ + -Ilib/libUPnP/Neptune/Source/System/Posix \ + -Ilib/libUPnP/Neptune/Source/Core + +-INCLUDES+=-Ilib/libcdio/libcdio/include +- + SRCS=Application.cpp \ + CueDocument.cpp \ + GUISettings.cpp \ +diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp +index c8b37b2..e3e9c0b 100644 +--- a/xbmc/cdrip/CDDAReader.cpp ++++ b/xbmc/cdrip/CDDAReader.cpp +@@ -24,7 +24,11 @@ + #ifdef HAS_CDDA_RIPPER + + #include "CDDAReader.h" ++#ifdef _WIN32 + #include "lib/libcdio/cdio.h" ++#else ++#include ++#endif + #include "utils/log.h" + + #define SECTOR_COUNT 52 +diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp +index 20cded7..f2a077a 100644 +--- a/xbmc/cores/paplayer/AC3CDDACodec.cpp ++++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp +@@ -22,7 +22,11 @@ + #include "system.h" + #include "AC3CDDACodec.h" + #ifdef HAS_AC3_CDDA_CODEC ++#ifdef _WIN32 + #include "lib/libcdio/sector.h" ++#else ++#include ++#endif + + AC3CDDACodec::AC3CDDACodec() : AC3Codec() + { +diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp +index ca8f1be..42460dc 100644 +--- a/xbmc/cores/paplayer/CDDAcodec.cpp ++++ b/xbmc/cores/paplayer/CDDAcodec.cpp +@@ -20,7 +20,11 @@ + */ + + #include "CDDAcodec.h" ++#ifdef _WIN32 + #include "lib/libcdio/sector.h" ++#else ++#include ++#endif + + #define SECTOR_COUNT 55 // max. sectors that can be read at once + #define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW +diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp +index e64cc2e..9bc46c6 100644 +--- a/xbmc/cores/paplayer/DTSCDDACodec.cpp ++++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp +@@ -22,7 +22,11 @@ + #include "system.h" + #include "DTSCDDACodec.h" + #ifdef HAS_DTS_CODEC ++#ifdef _WIN32 + #include "lib/libcdio/sector.h" ++#else ++#include ++#endif + + DTSCDDACodec::DTSCDDACodec() : DTSCodec() + { diff --git a/media-tv/xbmc/xbmc-9.11-r2.ebuild b/media-tv/xbmc/xbmc-9.11-r3.ebuild similarity index 94% rename from media-tv/xbmc/xbmc-9.11-r2.ebuild rename to media-tv/xbmc/xbmc-9.11-r3.ebuild index 308bb61d1d30..34066d117a60 100644 --- a/media-tv/xbmc/xbmc-9.11-r2.ebuild +++ b/media-tv/xbmc/xbmc-9.11-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r2.ebuild,v 1.1 2010/03/18 14:31:25 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r3.ebuild,v 1.1 2010/03/18 15:11:23 lxnay Exp $ EAPI="2" @@ -109,6 +109,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/${P}-wavpack.patch epatch "${FILESDIR}"/${P}-jpeg-speedup.patch #300909 + epatch "${FILESDIR}"/${P}-use-cdio-system-headers-on-non-win32.patch #303030, upstream: #8026 # http://xbmc.org/trac/ticket/8218 sed -i \ -e 's: ftell64: dll_ftell64:' \ @@ -154,10 +155,6 @@ src_prepare() { # Tweak autotool timestamps to avoid regeneration find . -type f -print0 | xargs -0 touch -r configure - # Workaround upstream issue, see #303030 - find -type f -name "*.cpp" -exec sed -i "s:lib/libcdio:cdio:" "{}"; - find -type f -name "Makefile" -exec sed -i "s:lib/libcdio:cdio:" "{}"; - } src_configure() { -- 2.26.2