[arch-commits] Commit in xbmc/trunk (PKGBUILD cdio.patch)

[Sergej Pupykin]

    Date: Monday, March 4, 2013 @ 16:53:19
  Author: spupykin
Revision: 85666

upgpkg: xbmc 12.0-2

upd

Modified:
  xbmc/trunk/PKGBUILD
Deleted:
  xbmc/trunk/cdio.patch

------------+
 PKGBUILD   |   17 ++++++++---------
 cdio.patch |   39 ---------------------------------------
 2 files changed, 8 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-04 15:17:23 UTC (rev 85665)
+++ PKGBUILD	2013-03-04 15:53:19 UTC (rev 85666)
@@ -9,13 +9,13 @@
 
 pkgname=xbmc
 pkgver=12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
 depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
-	 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
+	 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
 	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
 	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
 	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu'
@@ -34,10 +34,12 @@
 install="${pkgname}.install"
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"xbmc.service"
-	"cdio.patch")
+	"http://trac.xbmc.org/attachment/ticket/13903/0001-AE-Pulse-Audio-fix-crash-on-player-stop.patch"
+	"http://trac.xbmc.org/attachment/ticket/13902/0002-AE-Pulse-Audio-fix-buffer-underruns.patch")
 md5sums=('a79128b9d094a046947bfd9bb4550809'
          '76fae229ebc3bcfaab7e7f27e4fb51f5'
-         '49c0a7cbfca3666a24e8824950bd371b')
+         '28877c98b28d85e28c0e20ce36bf9ec7'
+         '3788667ba89318aace4e0901380d0a35')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
@@ -45,12 +47,9 @@
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
 
-#  sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \
-#	lib/libid3tag/libid3tag/configure.ac \
-#	lib/libdvd/libdvdcss/configure.ac
+  patch -p1 <$srcdir/0001-AE-Pulse-Audio-fix-crash-on-player-stop.patch
+  patch -p1 <$srcdir/0002-AE-Pulse-Audio-fix-buffer-underruns.patch
 
-#  patch -p1 <$srcdir/cdio.patch
-
   # Bootstrapping XBMC
   ./bootstrap
 

Deleted: cdio.patch
===================================================================
--- cdio.patch	2013-03-04 15:17:23 UTC (rev 85665)
+++ cdio.patch	2013-03-04 15:53:19 UTC (rev 85666)
@@ -1,39 +0,0 @@
-diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
---- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2012-03-22 02:07:50.000000000 +0400
-+++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2013-01-09 14:40:10.670040454 +0400
-@@ -27,6 +27,10 @@
- #include "storage/MediaManager.h"
- #include "utils/log.h"
- 
-+#define CDTEXT_TITLE CDTEXT_FIELD_TITLE
-+#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER
-+#define CDTEXT_GENRE CDTEXT_FIELD_GENRE
-+
- using namespace MUSIC_INFO;
- 
- #ifdef HAS_DVD_DRIVE
-diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp
---- xbmc-11.0/xbmc/storage/cdioSupport.cpp	2012-03-22 02:07:50.000000000 +0400
-+++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp	2013-01-09 14:51:40.276801092 +0400
-@@ -648,15 +648,18 @@
-   CSingleLock lock(*m_cdio);
- 
-   // Get the CD-Text , if any
--  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
-+  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio);
- 
-   if (pcdtext == NULL)
-     return ;
- 
-   // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe.
-   for (int i = 0; i < MAX_CDTEXT_FIELDS; i++)
--    if (pcdtext->field[i])
--      xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i];
-+  {
-+    char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum);
-+    if (data != NULL)
-+      xcdt[(cdtext_field_t)i] = data;
-+  }
- }
- 
- CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName)