diff options
| -rw-r--r-- | abs/extra-testing/community/xbmc-svn/PKGBUILD | 87 | ||||
| -rw-r--r-- | abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch | 13 |
2 files changed, 24 insertions, 76 deletions
diff --git a/abs/extra-testing/community/xbmc-svn/PKGBUILD b/abs/extra-testing/community/xbmc-svn/PKGBUILD index 45d6671..b6f15af 100644 --- a/abs/extra-testing/community/xbmc-svn/PKGBUILD +++ b/abs/extra-testing/community/xbmc-svn/PKGBUILD @@ -1,45 +1,41 @@ -# Contributors : Richard Atkinson atkinsonr-at-gmail -# Ralf Barth <archlinux dot org at haggy dot org> +# Contributors : Ralf Barth <archlinux dot org at haggy dot org> +# Richard Atkinson atkinsonr-at-gmail # # Original credits go to Edgar Hucek <gimli at dark-green dot com> # for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD pkgname=xbmc-svn -pkgver=21748 +pkgver=24428 pkgrel=1 -pkgdesc="XBMC Media Center from SVN (linuxport branch)" +pkgdesc="XBMC Media Center from SVN" provides=('xbmc') conflicts=('xbmc' 'xbmc-smoothvideo' 'xbmc-vdpau') arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'LGPL') depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' - 'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient' + 'hal' 'jasper' 'libgl' 'libmad' 'libmysqlclient' 'libjpeg' 'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' 'tre' 'unzip' 'libcdio' 'libsamplerate' 'python' 'avahi' 'libmad' 'a52dec' 'libdca' 'faad2' 'libmpeg2' 'libvorbis' 'libogg' 'libmms' - 'libmpcdec' 'flac' 'wavpack' 'xorg-utils') + 'libmpcdec' 'flac' 'wavpack' 'xorg-utils' 'smbclient') makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' 'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 'bison') optdepends=('lirc: remote controller support' 'pmount: mount removable devices as normal user' - 'smbclient: access windows shares' 'unrar: access compressed files without unpacking them') install=("${pkgname}.install") -source=('libcurl-not-in-lib64.patch' - 'Lircmap.xml') -noextract=('libcurl-not-in-lib64.patch' - 'Lircmap.xml') -md5sums=('c5e808703d0c9e392e1c2837fea1a5ef' - '3f93186f1ea4aad73011d00754c7265a') +source=() +noextract=() +md5sums=() +options=(makeflags) -options=(!makeflags) +_svnmod=XBMC +_prefix=/usr build() { - _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC - _svnmod=XBMC - _prefix=/usr + _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk cd ${srcdir}/ if [ -d $_svnmod/.svn ]; then @@ -50,65 +46,36 @@ build() { svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1 fi - # Apply patches - cd "$srcdir/$_svnmod" - - # Arch's libcurl lives in /usr/lib, not /usr/lib64 - fix the path: - msg "Patching with libcurl-not-in-lib64.patch" - patch -p0 < "$srcdir/libcurl-not-in-lib64.patch" || return 1 - - # Goom also needs a fixup due to newer autotools - cd "$srcdir/$_svnmod/xbmc/visualizations/Goom/goom2k4-0" - aclocal - libtoolize --copy --force - ./autogen.sh --enable-static --with-pic - - cd "$srcdir/$_svnmod" - # Configure XBMC # # Note on external-libs: # - We cannot use external python because Arch's python was built with # UCS2 unicode support, whereas xbmc expects UCS4 support - # - We cannot use external ffmpeg as we would loose VDPAU functionality - # because Arch's ffmpeg package does not support VDPAU - # - We don't want to rely on AUR packages, so we also don't use libass - # as long as it's in AUR + # - We cannot use Arch's libass because it's incompatible with XBMC's + # subtitle rendering + # - We cannot use external ffmpeg because we would loose VDPAU functionality + cd "$srcdir/$_svnmod" msg "Configuring XBMC" - make clean + ./bootstrap ./configure --prefix=${_prefix} \ - --enable-external-libmad \ --enable-external-liba52 \ --enable-external-libdts \ - --enable-external-libfaad \ --enable-external-libmpeg2 \ - --enable-external-libvorbis \ --enable-external-libogg \ - --enable-external-libmpcdec \ - --enable-external-libflac \ --enable-external-libwavpack \ --disable-external-libass \ - --disable-external-python \ --disable-external-ffmpeg \ - --disable-pulse \ + --disable-external-python \ --disable-debug || return 1 - # Fix false negative detections of realloc that happens some times - msg "Fixing false negative detections of realloc" - if grep -q 'HAVE_REALLOC 0' config.h; then - sed -e 's|#define HAVE_REALLOC 0|#define HAVE_REALLOC 1|' \ - -e 's|#define realloc rpl_realloc|/* #define realloc rpl_realloc */|' \ - -i config.h || return 1 - fi - - # XBMCTex will segfault on systems with nvidia installed if linked to OpenGL - msg "Fixing XBMCTex on systems using the nvidia driver blob" - sed -e 's/-lGLU -lGLEW -lGL//' \ - -i ${srcdir}/$_svnmod/tools/XBMCTex/Makefile - # Now (finally) build msg "Running make" make || return 1 +} + +package() { + + cd "$srcdir/$_svnmod" msg "Running make install" make prefix=${pkgdir}${_prefix} install || return 1 @@ -122,12 +89,6 @@ build() { install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.png \ ${pkgdir}${_prefix}/share/pixmaps/xbmc.png || return 1 - install -Dm755 ${srcdir}/$_svnmod/tools/XBMCTex/XBMCTex \ - ${pkgdir}${_prefix}/share/xbmc/tools/xbmctex || return 1 - - # Skins often use build.sh that looks for /usr/bin/XBMCTex - ln -s "${_prefix}/share/xbmc/tools/xbmctex" "$pkgdir/usr/bin/XBMCTex" - install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} for licensef in LICENSE.GPL README.linux copying.txt; do mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \ diff --git a/abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch b/abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch deleted file mode 100644 index 0bfbc4c..0000000 --- a/abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile.include.in -=================================================================== ---- Makefile.include.in (revision 21447) -+++ Makefile.include.in (working copy) -@@ -25,7 +25,7 @@ - - ifeq (linux,$(findstring linux, $(ARCH))) - ifeq ($(ARCH), x86_64-linux) -- DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib64/libcurl.so.4\"" -+ DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so.4\"" - else - DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so.4\"" - endif |