[arch-commits] Commit in xbmc/repos (20 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue Jan 29 17:21:13 UTC 2013


    Date: Tuesday, January 29, 2013 @ 18:21:13
  Author: spupykin
Revision: 83330

archrelease: copy trunk to community-i686, community-x86_64

Added:
  xbmc/repos/community-i686/ChangeLog
    (from rev 83329, xbmc/trunk/ChangeLog)
  xbmc/repos/community-i686/PKGBUILD
    (from rev 83329, xbmc/trunk/PKGBUILD)
  xbmc/repos/community-i686/cdio.patch
    (from rev 83329, xbmc/trunk/cdio.patch)
  xbmc/repos/community-i686/xbmc.install
    (from rev 83329, xbmc/trunk/xbmc.install)
  xbmc/repos/community-i686/xbmc.service
    (from rev 83329, xbmc/trunk/xbmc.service)
  xbmc/repos/community-x86_64/ChangeLog
    (from rev 83329, xbmc/trunk/ChangeLog)
  xbmc/repos/community-x86_64/PKGBUILD
    (from rev 83329, xbmc/trunk/PKGBUILD)
  xbmc/repos/community-x86_64/cdio.patch
    (from rev 83329, xbmc/trunk/cdio.patch)
  xbmc/repos/community-x86_64/xbmc.install
    (from rev 83329, xbmc/trunk/xbmc.install)
  xbmc/repos/community-x86_64/xbmc.service
    (from rev 83329, xbmc/trunk/xbmc.service)
Deleted:
  xbmc/repos/community-i686/ChangeLog
  xbmc/repos/community-i686/PKGBUILD
  xbmc/repos/community-i686/cdio.patch
  xbmc/repos/community-i686/xbmc.install
  xbmc/repos/community-i686/xbmc.service
  xbmc/repos/community-x86_64/ChangeLog
  xbmc/repos/community-x86_64/PKGBUILD
  xbmc/repos/community-x86_64/cdio.patch
  xbmc/repos/community-x86_64/xbmc.install
  xbmc/repos/community-x86_64/xbmc.service

-------------------------------+
 community-i686/ChangeLog      |  138 +++++++++++-----------
 community-i686/PKGBUILD       |  241 ++++++++++++++++++++--------------------
 community-i686/cdio.patch     |   78 ++++++------
 community-i686/xbmc.install   |   32 ++---
 community-i686/xbmc.service   |   26 ++--
 community-x86_64/ChangeLog    |  138 +++++++++++-----------
 community-x86_64/PKGBUILD     |  241 ++++++++++++++++++++--------------------
 community-x86_64/cdio.patch   |   78 ++++++------
 community-x86_64/xbmc.install |   32 ++---
 community-x86_64/xbmc.service |   26 ++--
 10 files changed, 516 insertions(+), 514 deletions(-)

Deleted: community-i686/ChangeLog
===================================================================
--- community-i686/ChangeLog	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-i686/ChangeLog	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,69 +0,0 @@
-2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
-	* 9.11-15 :
-	Made it back compliant with FHS ( thx pierre for pointing that out )
-	namcap checked and modified to fit its needs as far as it was possible
-
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-10 :
-	Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-9 :
-	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
-	installed with Arch.
-	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
-	on systems using the nvidia driver.
-	
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-8 :
-	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
-	undefined '::realloc' anymore.
-	Remove Mac OS X specific files.
-	
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-7 :
-	Moved libcdio, pmount, smbclient and unrar to optdepends.
-	Removed unneeded dependency on sdl_gfx.
-	Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-6 :
-	Added libpng to dependency list.
-	Added gawk to dependency list.
-	Removed '--disable-mms' and '--enable-halmount' configure flags as they
-	are not mentioned as supported in the configure script.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-5 :
-	Added libmad to the dependency list.
-	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
-	and added tre instead.
-	Removed subversion from makedepends.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-4 :
-	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
-	fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-3 :
-	Added lirc to the optdepends array.
-	
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-2 :
-	Added install file which informs users that a display depth of at
-	least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-1 :
-	Initial package, based on previous work by Zeqadious.

Copied: xbmc/repos/community-i686/ChangeLog (from rev 83329, xbmc/trunk/ChangeLog)
===================================================================
--- community-i686/ChangeLog	                        (rev 0)
+++ community-i686/ChangeLog	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,69 @@
+2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
+	* 9.11-15 :
+	Made it back compliant with FHS ( thx pierre for pointing that out )
+	namcap checked and modified to fit its needs as far as it was possible
+
+2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-10 :
+	Try and fix some autoconf issues (thanks Gentoo ebuild).
+
+2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-9 :
+	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
+	installed with Arch.
+	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
+	on systems using the nvidia driver.
+	
+2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-8 :
+	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
+	undefined '::realloc' anymore.
+	Remove Mac OS X specific files.
+	
+2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-7 :
+	Moved libcdio, pmount, smbclient and unrar to optdepends.
+	Removed unneeded dependency on sdl_gfx.
+	Removed dependency on libpng as sdl_image depends on it.
+
+2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-6 :
+	Added libpng to dependency list.
+	Added gawk to dependency list.
+	Removed '--disable-mms' and '--enable-halmount' configure flags as they
+	are not mentioned as supported in the configure script.
+	
+2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-5 :
+	Added libmad to the dependency list.
+	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
+	and added tre instead.
+	Removed subversion from makedepends.
+	
+2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-4 :
+	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
+	fail any longer.
+
+2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-3 :
+	Added lirc to the optdepends array.
+	
+2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-2 :
+	Added install file which informs users that a display depth of at
+	least 24-bit is required.
+
+2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-1 :
+	Initial package, based on previous work by Zeqadious.

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-i686/PKGBUILD	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,120 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-
-_prefix=/usr
-
-pkgname=xbmc
-pkgver=11.0
-pkgrel=14
-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'
-	 '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')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
-	     'udisks' 'upower' 'bluez' 'mesa')
-optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-	    'vdpau-video: accelerated video playback for nvidia cards'
-	    'xvba-video: accelerated video playback for amd cards'
-	    'pulseaudio: pulseaudio support'
-	    'lirc: remote controller support'
-	    'udisks: automount external drives'
-	    'upower: used to trigger suspend functionality'
-	    'unrar: access compressed files without unpacking them'
-	    'xorg-xinit: autostart xbmc')
-install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service"
-	"cdio.patch")
-md5sums=('9e8a26ee25173c7268abea7f1d82d428'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5'
-         '49c0a7cbfca3666a24e8824950bd371b')
-
-build() {
-  cd "${srcdir}/xbmc-$pkgver"
-
-  # 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/cdio.patch
-
-  # Bootstrapping XBMC
-  ./bootstrap
-
-  # Configuring XBMC
-  export PYTHON_VERSION=2  # external python v2
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
-    --disable-debug \
-    --enable-optimizations \
-    --enable-gl \
-    --enable-sdl \
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-xvba \
-    --enable-joystick \
-    --enable-xrandr \
-    --enable-rsxs \
-    --enable-projectm \
-    --enable-x11 \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-nfs \
-    --enable-afpclient \
-    --enable-airplay \
-    --enable-airtunes \
-    --enable-ffmpeg-libvorbis \
-    --enable-dvdcss \
-    --disable-hal \
-    --enable-avahi \
-    --enable-webserver \
-    --enable-optical-drive \
-    --enable-libbluray \
-    --enable-texturepacker \
-    --enable-udev \
-    --enable-libusb \
-    --enable-libcec \
-    --enable-external-libraries \
-    --disable-external-ffmpeg
-  # Now (finally) build
-  make
-}
-
-package() {
-  cd "${srcdir}/xbmc-$pkgver"
-  # Running make install
-  make DESTDIR="${pkgdir}" install
-
-  # run feh with python2
-  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
-
-  # lsb_release fix
-  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
-  # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
-  # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  done
-
-  # systemd stuff
-  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-}
-# vim:set ts=2 sw=2 et:

Copied: xbmc/repos/community-i686/PKGBUILD (from rev 83329, xbmc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,121 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+
+_prefix=/usr
+
+pkgname=xbmc
+pkgver=12.0
+pkgrel=1
+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'
+	 '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'
+	 'tinyxml' 'taglib')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
+	     'udisks' 'upower' 'bluez' 'mesa' 'doxygen' 'swig' 'java-environment')
+optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
+	    'vdpau-video: accelerated video playback for nvidia cards'
+	    'xvba-video: accelerated video playback for amd cards'
+	    'pulseaudio: pulseaudio support'
+	    'lirc: remote controller support'
+	    'udisks: automount external drives'
+	    'upower: used to trigger suspend functionality'
+	    'unrar: access compressed files without unpacking them'
+	    'xorg-xinit: autostart xbmc')
+install="${pkgname}.install"
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+	"xbmc.service"
+	"cdio.patch")
+md5sums=('a79128b9d094a046947bfd9bb4550809'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5'
+         '49c0a7cbfca3666a24e8824950bd371b')
+
+build() {
+  cd "${srcdir}/xbmc-$pkgver"
+
+  # 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/cdio.patch
+
+  # Bootstrapping XBMC
+  ./bootstrap
+
+  # Configuring XBMC
+  export PYTHON_VERSION=2  # external python v2
+  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+    --disable-debug \
+    --enable-optimizations \
+    --enable-gl \
+    --enable-sdl \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-xvba \
+    --enable-joystick \
+    --enable-xrandr \
+    --enable-rsxs \
+    --enable-projectm \
+    --enable-x11 \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-nfs \
+    --enable-afpclient \
+    --enable-airplay \
+    --enable-airtunes \
+    --enable-ffmpeg-libvorbis \
+    --enable-dvdcss \
+    --disable-hal \
+    --enable-avahi \
+    --enable-webserver \
+    --enable-optical-drive \
+    --enable-libbluray \
+    --enable-texturepacker \
+    --enable-udev \
+    --enable-libusb \
+    --enable-libcec \
+    --enable-external-libraries \
+    --disable-external-ffmpeg
+  # Now (finally) build
+  make
+}
+
+package() {
+  cd "${srcdir}/xbmc-$pkgver"
+  # Running make install
+  make DESTDIR="${pkgdir}" install
+
+  # run feh with python2
+  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+
+  # lsb_release fix
+  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
+  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
+
+  # Tools
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+
+  # Licenses
+  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+  for licensef in LICENSE.GPL copying.txt; do
+    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+  done
+
+  # systemd stuff
+  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+}
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/cdio.patch
===================================================================
--- community-i686/cdio.patch	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-i686/cdio.patch	2013-01-29 17:21:13 UTC (rev 83330)
@@ -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)

Copied: xbmc/repos/community-i686/cdio.patch (from rev 83329, xbmc/trunk/cdio.patch)
===================================================================
--- community-i686/cdio.patch	                        (rev 0)
+++ community-i686/cdio.patch	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,39 @@
+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)

Deleted: community-i686/xbmc.install
===================================================================
--- community-i686/xbmc.install	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-i686/xbmc.install	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,16 +0,0 @@
-post_install() {
-  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  getent group xbmc > /dev/null || groupadd xbmc
-  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-  echo "You may want to remove xbmc user and group"
-}

Copied: xbmc/repos/community-i686/xbmc.install (from rev 83329, xbmc/trunk/xbmc.install)
===================================================================
--- community-i686/xbmc.install	                        (rev 0)
+++ community-i686/xbmc.install	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,16 @@
+post_install() {
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  getent group xbmc > /dev/null || groupadd xbmc
+  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+  echo "You may want to remove xbmc user and group"
+}

Deleted: community-i686/xbmc.service
===================================================================
--- community-i686/xbmc.service	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-i686/xbmc.service	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,13 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = remote-fs.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
-Restart = always
-
-[Install]
-WantedBy = multi-user.target

Copied: xbmc/repos/community-i686/xbmc.service (from rev 83329, xbmc/trunk/xbmc.service)
===================================================================
--- community-i686/xbmc.service	                        (rev 0)
+++ community-i686/xbmc.service	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target

Deleted: community-x86_64/ChangeLog
===================================================================
--- community-x86_64/ChangeLog	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-x86_64/ChangeLog	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,69 +0,0 @@
-2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
-	* 9.11-15 :
-	Made it back compliant with FHS ( thx pierre for pointing that out )
-	namcap checked and modified to fit its needs as far as it was possible
-
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-10 :
-	Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-9 :
-	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
-	installed with Arch.
-	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
-	on systems using the nvidia driver.
-	
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-8 :
-	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
-	undefined '::realloc' anymore.
-	Remove Mac OS X specific files.
-	
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-7 :
-	Moved libcdio, pmount, smbclient and unrar to optdepends.
-	Removed unneeded dependency on sdl_gfx.
-	Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-6 :
-	Added libpng to dependency list.
-	Added gawk to dependency list.
-	Removed '--disable-mms' and '--enable-halmount' configure flags as they
-	are not mentioned as supported in the configure script.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-5 :
-	Added libmad to the dependency list.
-	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
-	and added tre instead.
-	Removed subversion from makedepends.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-4 :
-	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
-	fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-3 :
-	Added lirc to the optdepends array.
-	
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-2 :
-	Added install file which informs users that a display depth of at
-	least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-1 :
-	Initial package, based on previous work by Zeqadious.

Copied: xbmc/repos/community-x86_64/ChangeLog (from rev 83329, xbmc/trunk/ChangeLog)
===================================================================
--- community-x86_64/ChangeLog	                        (rev 0)
+++ community-x86_64/ChangeLog	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,69 @@
+2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
+	* 9.11-15 :
+	Made it back compliant with FHS ( thx pierre for pointing that out )
+	namcap checked and modified to fit its needs as far as it was possible
+
+2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-10 :
+	Try and fix some autoconf issues (thanks Gentoo ebuild).
+
+2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-9 :
+	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
+	installed with Arch.
+	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
+	on systems using the nvidia driver.
+	
+2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-8 :
+	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
+	undefined '::realloc' anymore.
+	Remove Mac OS X specific files.
+	
+2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-7 :
+	Moved libcdio, pmount, smbclient and unrar to optdepends.
+	Removed unneeded dependency on sdl_gfx.
+	Removed dependency on libpng as sdl_image depends on it.
+
+2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-6 :
+	Added libpng to dependency list.
+	Added gawk to dependency list.
+	Removed '--disable-mms' and '--enable-halmount' configure flags as they
+	are not mentioned as supported in the configure script.
+	
+2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-5 :
+	Added libmad to the dependency list.
+	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
+	and added tre instead.
+	Removed subversion from makedepends.
+	
+2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-4 :
+	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
+	fail any longer.
+
+2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-3 :
+	Added lirc to the optdepends array.
+	
+2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-2 :
+	Added install file which informs users that a display depth of at
+	least 24-bit is required.
+
+2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
+
+	* 8.10-1 :
+	Initial package, based on previous work by Zeqadious.

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-x86_64/PKGBUILD	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,120 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-
-_prefix=/usr
-
-pkgname=xbmc
-pkgver=11.0
-pkgrel=14
-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'
-	 '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')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
-	     'udisks' 'upower' 'bluez' 'mesa')
-optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-	    'vdpau-video: accelerated video playback for nvidia cards'
-	    'xvba-video: accelerated video playback for amd cards'
-	    'pulseaudio: pulseaudio support'
-	    'lirc: remote controller support'
-	    'udisks: automount external drives'
-	    'upower: used to trigger suspend functionality'
-	    'unrar: access compressed files without unpacking them'
-	    'xorg-xinit: autostart xbmc')
-install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service"
-	"cdio.patch")
-md5sums=('9e8a26ee25173c7268abea7f1d82d428'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5'
-         '49c0a7cbfca3666a24e8824950bd371b')
-
-build() {
-  cd "${srcdir}/xbmc-$pkgver"
-
-  # 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/cdio.patch
-
-  # Bootstrapping XBMC
-  ./bootstrap
-
-  # Configuring XBMC
-  export PYTHON_VERSION=2  # external python v2
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
-    --disable-debug \
-    --enable-optimizations \
-    --enable-gl \
-    --enable-sdl \
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-xvba \
-    --enable-joystick \
-    --enable-xrandr \
-    --enable-rsxs \
-    --enable-projectm \
-    --enable-x11 \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-nfs \
-    --enable-afpclient \
-    --enable-airplay \
-    --enable-airtunes \
-    --enable-ffmpeg-libvorbis \
-    --enable-dvdcss \
-    --disable-hal \
-    --enable-avahi \
-    --enable-webserver \
-    --enable-optical-drive \
-    --enable-libbluray \
-    --enable-texturepacker \
-    --enable-udev \
-    --enable-libusb \
-    --enable-libcec \
-    --enable-external-libraries \
-    --disable-external-ffmpeg
-  # Now (finally) build
-  make
-}
-
-package() {
-  cd "${srcdir}/xbmc-$pkgver"
-  # Running make install
-  make DESTDIR="${pkgdir}" install
-
-  # run feh with python2
-  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
-
-  # lsb_release fix
-  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
-  # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
-  # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  done
-
-  # systemd stuff
-  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-}
-# vim:set ts=2 sw=2 et:

Copied: xbmc/repos/community-x86_64/PKGBUILD (from rev 83329, xbmc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,121 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+
+_prefix=/usr
+
+pkgname=xbmc
+pkgver=12.0
+pkgrel=1
+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'
+	 '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'
+	 'tinyxml' 'taglib')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
+	     'udisks' 'upower' 'bluez' 'mesa' 'doxygen' 'swig' 'java-environment')
+optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
+	    'vdpau-video: accelerated video playback for nvidia cards'
+	    'xvba-video: accelerated video playback for amd cards'
+	    'pulseaudio: pulseaudio support'
+	    'lirc: remote controller support'
+	    'udisks: automount external drives'
+	    'upower: used to trigger suspend functionality'
+	    'unrar: access compressed files without unpacking them'
+	    'xorg-xinit: autostart xbmc')
+install="${pkgname}.install"
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+	"xbmc.service"
+	"cdio.patch")
+md5sums=('a79128b9d094a046947bfd9bb4550809'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5'
+         '49c0a7cbfca3666a24e8824950bd371b')
+
+build() {
+  cd "${srcdir}/xbmc-$pkgver"
+
+  # 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/cdio.patch
+
+  # Bootstrapping XBMC
+  ./bootstrap
+
+  # Configuring XBMC
+  export PYTHON_VERSION=2  # external python v2
+  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+    --disable-debug \
+    --enable-optimizations \
+    --enable-gl \
+    --enable-sdl \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-xvba \
+    --enable-joystick \
+    --enable-xrandr \
+    --enable-rsxs \
+    --enable-projectm \
+    --enable-x11 \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-nfs \
+    --enable-afpclient \
+    --enable-airplay \
+    --enable-airtunes \
+    --enable-ffmpeg-libvorbis \
+    --enable-dvdcss \
+    --disable-hal \
+    --enable-avahi \
+    --enable-webserver \
+    --enable-optical-drive \
+    --enable-libbluray \
+    --enable-texturepacker \
+    --enable-udev \
+    --enable-libusb \
+    --enable-libcec \
+    --enable-external-libraries \
+    --disable-external-ffmpeg
+  # Now (finally) build
+  make
+}
+
+package() {
+  cd "${srcdir}/xbmc-$pkgver"
+  # Running make install
+  make DESTDIR="${pkgdir}" install
+
+  # run feh with python2
+  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+
+  # lsb_release fix
+  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
+  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
+
+  # Tools
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+
+  # Licenses
+  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+  for licensef in LICENSE.GPL copying.txt; do
+    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+  done
+
+  # systemd stuff
+  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+}
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/cdio.patch
===================================================================
--- community-x86_64/cdio.patch	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-x86_64/cdio.patch	2013-01-29 17:21:13 UTC (rev 83330)
@@ -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)

Copied: xbmc/repos/community-x86_64/cdio.patch (from rev 83329, xbmc/trunk/cdio.patch)
===================================================================
--- community-x86_64/cdio.patch	                        (rev 0)
+++ community-x86_64/cdio.patch	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,39 @@
+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)

Deleted: community-x86_64/xbmc.install
===================================================================
--- community-x86_64/xbmc.install	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-x86_64/xbmc.install	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,16 +0,0 @@
-post_install() {
-  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  getent group xbmc > /dev/null || groupadd xbmc
-  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-  echo "You may want to remove xbmc user and group"
-}

Copied: xbmc/repos/community-x86_64/xbmc.install (from rev 83329, xbmc/trunk/xbmc.install)
===================================================================
--- community-x86_64/xbmc.install	                        (rev 0)
+++ community-x86_64/xbmc.install	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,16 @@
+post_install() {
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  getent group xbmc > /dev/null || groupadd xbmc
+  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+  echo "You may want to remove xbmc user and group"
+}

Deleted: community-x86_64/xbmc.service
===================================================================
--- community-x86_64/xbmc.service	2013-01-29 17:20:18 UTC (rev 83329)
+++ community-x86_64/xbmc.service	2013-01-29 17:21:13 UTC (rev 83330)
@@ -1,13 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = remote-fs.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
-Restart = always
-
-[Install]
-WantedBy = multi-user.target

Copied: xbmc/repos/community-x86_64/xbmc.service (from rev 83329, xbmc/trunk/xbmc.service)
===================================================================
--- community-x86_64/xbmc.service	                        (rev 0)
+++ community-x86_64/xbmc.service	2013-01-29 17:21:13 UTC (rev 83330)
@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target




More information about the arch-commits mailing list