And now the fribidi/readsector patches have been merged upstream.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 11 insertions, 146 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 08f2ea6bc2b7..75868e79ad67 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.6 2009/02/23 19:03:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.7 2009/02/24 07:18:36 vapier Exp $
+
+  24 Feb 2009; Mike Frysinger <vapier@gentoo.org> -files/xbmc-fribidi.patch,
+  -files/xbmc-readsector.patch, xbmc-9999.ebuild:
+  And now the fribidi/readsector patches have been merged upstream.
 
   23 Feb 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Upstream now allows SVN_REV to override svnversion.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 60438f087e67..9fdfa219f78f 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,15 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xbmc-fribidi.patch 1131 RMD160 bbadd725e5b11885201cffed2cc4f3cdeb04e4af SHA1 be4f94977dcabd02cc936199b573fad3db346930 SHA256 b6948f9fa236cd805dd2b92fa9861255598c6536de5278ce96c8005899336ea9
-AUX xbmc-readsector.patch 2697 RMD160 8fc7b7d5711b1b3a703ecf18920dfb4f75be9819 SHA1 db7925944f0d389037611df5af6593cba2c6ff4f SHA256 352e18bc1b4413e8f6df1dea2b88e0ee17115814fb92d7e4dbfba9820f0ee00c
-EBUILD xbmc-9999.ebuild 3685 RMD160 e24fd91d1a7aa3cc4789c359e0086aebecaad480 SHA1 f6f8a9d81b97cda567a28e10ae9179e5e228468e SHA256 c82b1896e15658fc76b331d6f1eb9416da9122e79fbc3bb50051b260e5532b2a
-MISC ChangeLog 1209 RMD160 2aab1522bede9f81ce4a328e49e8458fc88d6e9d SHA1 69afbd5d1b8119d68034b96cc8c4509174fe563a SHA256 c91c7e57ce81cb96f6f8cadea39e51409775d550761b59d0cafa1b0a92bb3253
+EBUILD xbmc-9999.ebuild 3598 RMD160 43474937a8178fa56115e2a515e59e8aded1e205 SHA1 5f7c0b732fd05818a613f666b302f9b99bf39e5f SHA256 f99f7fc8983a42c441e323af3c69b8049ba90218185a88568701b79d348548ea
+MISC ChangeLog 1405 RMD160 d4e916fc8bd368d9fbb97f9a72ee6dc19e339a6a SHA1 fb08b3579b690e30940799018035ee311048c7ab SHA256 7472b90d7fa4e4f3cdf4d81152c33140af23244bd82b33fa643dfb29a2feb254
 MISC metadata.xml 157 RMD160 a117cbaa8eca6ed6c13ba7d3cc7b6c27a67dd250 SHA1 4f8829c9a4a3ef73a376090fa9fd72c967097d50 SHA256 c4d85708ef3c9ffffe5ca42f32642b89f8a9475e00602e7986f7032027e292d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmjC+cACgkQn/5bYzqsSmF4OgCgpYwnIo3D08HEUagfO4GHMDoK
-IWIAnj+cXptlKgs9SEfgB4QnQCdJb9BI
-=GVHG
+iEYEARECAAYFAkmjn3gACgkQn/5bYzqsSmF0uACfW6kYOpftqBd/8AZSFUHncbK+
+GwQAn3uRhdjMkcWYAASYUzYL1FYGfZL+
+=6JNJ
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-fribidi.patch b/media-tv/xbmc/files/xbmc-fribidi.patch
deleted file mode 100644
index 1ae6903c072f..000000000000
--- a/media-tv/xbmc/files/xbmc-fribidi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://xbmc.org/trac/ticket/5283
-
---- xbmc/utils/ArabicShaping.cpp
-+++ xbmc/utils/ArabicShaping.cpp
-@@ -148,10 +148,10 @@
-   for (int i = 0; i < MAP_LENGTH; i++)

-   {

-     if (charsMap[i].code == c)

--      return FRIBIDI_TRUE;

-+      return true;

-   }

- 

--  return FRIBIDI_FALSE;

-+  return false;

- }

- 

- static CharRep GetCharRep(FriBidiChar c)

-@@ -186,9 +186,9 @@
-   for (i = 0; i < TRANS_CHARS_LENGTH; i++)

-   {

-     if (transChars[i] == c)

--      return FRIBIDI_TRUE;

-+      return true;

-   }

--  return FRIBIDI_FALSE;

-+  return false;

- }

- 

- FriBidiChar* shape_arabic(FriBidiChar * str, int len)

---- xbmc/utils/ArabicShaping.h
-+++ xbmc/utils/ArabicShaping.h
-@@ -30,7 +30,7 @@
- #include "lib/libfribidi/fribidi.h"

- #else

- #include <fribidi/fribidi.h>

--#include <fribidi/fribidi_char_sets.h>

-+#include <fribidi/fribidi-char-sets.h>

- #endif

- 

- /**

---- xbmc/utils/CharsetConverter.cpp
-+++ xbmc/utils/CharsetConverter.cpp
-@@ -30,7 +30,7 @@
- #else
- #include <iconv.h>
- #include <fribidi/fribidi.h>
--#include <fribidi/fribidi_char_sets.h>
-+#include <fribidi/fribidi-char-sets.h>
- #endif
- 
- #ifdef __APPLE__
diff --git a/media-tv/xbmc/files/xbmc-readsector.patch b/media-tv/xbmc/files/xbmc-readsector.patch
deleted file mode 100644
index ceca6cc9d3dd..000000000000
--- a/media-tv/xbmc/files/xbmc-readsector.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Enable support for XBMC to read data DVD discs
-http://xbmc.org/trac/ticket/5296
-
---- xbmc/xbmc/xbox/IoSupport.cpp
-+++ xbmc/xbmc/xbox/IoSupport.cpp
-@@ -40,6 +40,7 @@
- #include <linux/limits.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-+#include <unistd.h>
- #include <fcntl.h>
- #include <linux/cdrom.h>
- #endif
-@@ -445,37 +446,31 @@
-   if (hDevice->m_bCDROM)
-   {    
-     int fd = hDevice->fd;
--    int lba = (dwSector + CD_MSF_OFFSET) ;
--    int m,s,f;
--    union 
--    {
--      struct cdrom_msf msf;
--      char buffer[2356];
--    } arg;
- 
--    // convert sector offset to minute, second, frame format
--    // since that is what the 'ioctl' requires as input
--    f = lba % CD_FRAMES;
--    lba /= CD_FRAMES;
--    s = lba % CD_SECS;
--    lba /= CD_SECS;
--    m = lba;
-+    // seek to requested sector
-+    if (lseek(fd, dwSector * MODE1_DATA_SIZE, SEEK_SET) < 0)
-+    {
-+      CLog::Log(LOGERROR, "CD: ReadSector Request to read sector %d\n", (int)dwSector);
-+      CLog::Log(LOGERROR, "CD: ReadSector error: %s\n", strerror(errno));
-+      OutputDebugString("CD Read error\n");
-+      return (-1);
-+    }
- 
--    arg.msf.cdmsf_min0 = m;
--    arg.msf.cdmsf_sec0 = s;
--    arg.msf.cdmsf_frame0 = f;
--    
--    int ret = ioctl(fd, CDROMREADMODE1, &arg);
--    if (ret==0)
-+    // read data block of this sector
-+    while (read(fd, lpczBuffer, MODE1_DATA_SIZE) < 0)
-     {
--      memcpy(lpczBuffer, arg.buffer, 2048);
--      return 2048;
-+      // read was interrupted - try again
-+      if (errno == EINTR)
-+        continue;
-+
-+      // error reading sector
-+      CLog::Log(LOGERROR, "CD: ReadSector Request to read sector %d\n", (int)dwSector);
-+      CLog::Log(LOGERROR, "CD: ReadSector error: %s\n", strerror(errno));
-+      OutputDebugString("CD Read error\n");
-+      return (-1);
-     }
--    CLog::Log(LOGERROR, "CD: ReadSector Request to read sector %d\n", (int)dwSector);
--    CLog::Log(LOGERROR, "CD: ReadSector error: %s\n", strerror(errno));
--    CLog::Log(LOGERROR, "CD: ReadSector minute %d, second %d, frame %d\n", m, s, f);
--    OutputDebugString("CD Read error\n");
--    return -1;    
-+
-+    return MODE1_DATA_SIZE;
-   }
- #endif
-   LARGE_INTEGER Displacement;
---- xbmc/xbmc/xbox/IoSupport.h
-+++ xbmc/xbmc/xbox/IoSupport.h
-@@ -40,6 +40,8 @@
- #define DRIVE_CLOSED_MEDIA_PRESENT  4 // Will be send once when the drive just have closed
- #define DRIVE_NONE  5 // system doesn't have an optical drive
- 
-+#define MODE1_DATA_SIZE    2048 // Mode1 sector has 2048 bytes of data
-+
- #define MODE2_DATA_START   24   // Mode2 raw sector has 24 bytes before the data payload
- #define MODE2_DATA_SIZE    2324 // And has 2324 usable bytes
- #define RAW_SECTOR_SIZE    2352 // Raw sector size
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index e5611d1a3932..3e20fd6d8ed1 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.9 2009/02/23 20:49:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.10 2009/02/24 07:18:36 vapier Exp $
 
 # XXX: be nice to split out packages that come bundled and use the
 #      system libraries ...
@@ -87,9 +87,6 @@ src_unpack() {
 	done
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-readsector.patch
-	epatch "${FILESDIR}"/${PN}-fribidi.patch
-
 	# Fix XBMC's final version string showing as "exported"
 	# instead of the SVN revision number.  Also cleanup flags.
 	export SVN_REV=${ESVN_WC_REVISION:-exported}